Browse Source

Fixed some compile errors

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1273 54d463be-8e91-2dee-dedb-b68131a5f0ec
celest 20 years ago
parent
commit
f2da5abfe7
3 changed files with 19 additions and 19 deletions
  1. 2 2
      Changelog-SVN.txt
  2. 16 16
      src/map/mob.c
  3. 1 1
      src/map/skill.c

+ 2 - 2
Changelog-SVN.txt

@@ -1,7 +1,7 @@
 Date	Added
 Date	Added
 
 
-
 03/23
 03/23
+	* Fixed some compile errors, sorry xP [celest]
 	* Corrected potion creation success chances, thanks to Avaj and DracoRPG
 	* Corrected potion creation success chances, thanks to Avaj and DracoRPG
 	* Removed some unused potion creation code, thanks to DracoRPG
 	* Removed some unused potion creation code, thanks to DracoRPG
 	* Updated Joint Beat's effect, thanks to DracoRPG
 	* Updated Joint Beat's effect, thanks to DracoRPG
@@ -29,7 +29,7 @@ Date	Added
 
 
 03/21
 03/21
         * Moved /tool and /webserver to under /src and added 'make tools' and 'make
         * Moved /tool and /webserver to under /src and added 'make tools' and 'make
-          web-server' [celest]
+          webserver' [celest]
         * Removed ladmin compiling from 'make sql' [celest]
         * Removed ladmin compiling from 'make sql' [celest]
 
 
 03/20
 03/20

+ 16 - 16
src/map/mob.c

@@ -4350,21 +4350,6 @@ static int mob_readdb_race(void)
 	return 0;
 	return 0;
 }
 }
 
 
-void mob_reload(void)
-{
-#ifndef TXT_ONLY
-    if(db_use_sqldbs)
-        mob_read_sqldb();
-    else
-#endif /* TXT_ONLY */
-	mob_readdb();
-
-	mob_readdb_mobavail();
-	mob_read_randommonster();
-	mob_readskilldb();
-	mob_readdb_race();
-}
-
 #ifndef TXT_ONLY
 #ifndef TXT_ONLY
 /*==========================================
 /*==========================================
  * SQL reading
  * SQL reading
@@ -4526,8 +4511,23 @@ static int mob_read_sqldb(void)
 	}
 	}
 	return 0;
 	return 0;
 }
 }
-
 #endif /* not TXT_ONLY */
 #endif /* not TXT_ONLY */
+
+void mob_reload(void)
+{
+#ifndef TXT_ONLY
+    if(db_use_sqldbs)
+        mob_read_sqldb();
+    else
+#endif /* TXT_ONLY */
+	mob_readdb();
+
+	mob_readdb_mobavail();
+	mob_read_randommonster();
+	mob_readskilldb();
+	mob_readdb_race();
+}
+
 /*==========================================
 /*==========================================
  * Circumference initialization of mob
  * Circumference initialization of mob
  *------------------------------------------
  *------------------------------------------

+ 1 - 1
src/map/skill.c

@@ -8753,7 +8753,7 @@ int skill_produce_mix( struct map_session_data *sd,
 		if(skill_produce_db[idx].req_skill==AM_PHARMACY) {
 		if(skill_produce_db[idx].req_skill==AM_PHARMACY) {
 			make_per = pc_checkskill(sd,AM_LEARNINGPOTION)*100
 			make_per = pc_checkskill(sd,AM_LEARNINGPOTION)*100
 				+ pc_checkskill(sd,AM_PHARMACY)*300 + sd->status.job_level*20
 				+ pc_checkskill(sd,AM_PHARMACY)*300 + sd->status.job_level*20
-				+ sd->status.paramc[4]*10+sd->status.paramc[5]*10;
+				+ sd->paramc[4]*10+sd->paramc[5]*10;
 
 
 			if(nameid >= 501 && nameid <= 505) // Normal potions
 			if(nameid >= 501 && nameid <= 505) // Normal potions
 				make_per += 2000 + pc_checkskill(sd,AM_POTIONPITCHER)*100;
 				make_per += 2000 + pc_checkskill(sd,AM_POTIONPITCHER)*100;