summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-SVN.txt4
-rw-r--r--src/map/mob.c32
-rw-r--r--src/map/skill.c2
3 files changed, 19 insertions, 19 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 13d95a281..7d4f3d92a 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,7 +1,7 @@
Date Added
-
03/23
+ * Fixed some compile errors, sorry xP [celest]
* Corrected potion creation success chances, thanks to Avaj and DracoRPG
* Removed some unused potion creation code, thanks to DracoRPG
* Updated Joint Beat's effect, thanks to DracoRPG
@@ -29,7 +29,7 @@ Date Added
03/21
* 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]
03/20
diff --git a/src/map/mob.c b/src/map/mob.c
index 7a39af029..d4d0fd45d 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4350,21 +4350,6 @@ static int mob_readdb_race(void)
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
/*==========================================
* SQL reading
@@ -4526,8 +4511,23 @@ static int mob_read_sqldb(void)
}
return 0;
}
-
#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
*------------------------------------------
diff --git a/src/map/skill.c b/src/map/skill.c
index f40420dcf..d5bd61a4c 100644
--- a/src/map/skill.c
+++ b/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) {
make_per = pc_checkskill(sd,AM_LEARNINGPOTION)*100
+ 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
make_per += 2000 + pc_checkskill(sd,AM_POTIONPITCHER)*100;