diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-08 17:09:06 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-08 17:09:06 +0000 |
| commit | 1811fe06ff7813d14857bf6a3d46be98c7e72f31 (patch) | |
| tree | b0684877c89e1cdb68e362f4fbbc66bc356f52aa /src | |
| parent | 8710df18225237dde2667da3386f5b6f0e68e128 (diff) | |
| download | hercules-1811fe06ff7813d14857bf6a3d46be98c7e72f31.tar.gz hercules-1811fe06ff7813d14857bf6a3d46be98c7e72f31.tar.bz2 hercules-1811fe06ff7813d14857bf6a3d46be98c7e72f31.tar.xz hercules-1811fe06ff7813d14857bf6a3d46be98c7e72f31.zip | |
Fixed @reloadskilldb, bugreport:4412 and in the flow of that mercenary db is now reloaded in @reloadmobdb (like homunculus db already does)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15027 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/mercenary.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index e87074883..0304788a8 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4213,6 +4213,7 @@ ACMD_FUNC(reloadmobdb) mob_reload(); read_petdb(); merc_reload(); + read_mercenarydb(); clif_displaymessage(fd, msg_txt(98)); // Monster database has been reloaded. return 0; @@ -4226,6 +4227,7 @@ ACMD_FUNC(reloadskilldb) nullpo_retr(-1, sd); skill_reload(); merc_skill_reload(); + read_mercenary_skilldb(); clif_displaymessage(fd, msg_txt(99)); // Skill database has been reloaded. return 0; diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 1cc689208..f040a3913 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -69,6 +69,12 @@ int mercenary_kills(struct mercenary_data *md); int mercenary_checkskill(struct mercenary_data *md, int skill_id); +/** + * atcommand.c required + **/ +int read_mercenarydb(void); +int read_mercenary_skilldb(void); + int do_init_mercenary(void); #endif /* _MERCENARY_H_ */ |