summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 21:10:52 -0200
committershennetsind <ind@henn.et>2013-11-06 21:10:52 -0200
commitaaf34515fa9d32fae10c71b5b3f615857fd7e55e (patch)
treebec3964580ead4ed1d45f7bf51b418753004f16b /src/map/mercenary.c
parenteaf04b9a2f0b399027df251c5d19d58d74e24e6a (diff)
parent87d7348396af97428638723ae49ca2ff166e4acd (diff)
downloadhercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.gz
hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.bz2
hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.xz
hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 5ea10dc66..87e7d2f3c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -490,7 +490,10 @@ int read_mercenary_skilldb(void) {
return 0;
}
-void do_init_mercenary(void) {
+void do_init_mercenary(bool minimal) {
+ if (minimal)
+ return;
+
mercenary->read_db();
mercenary->read_skilldb();