diff options
| author | shennetsind <ind@henn.et> | 2013-04-24 10:47:20 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-04-24 10:47:20 -0300 |
| commit | 7ef89df2da4b688fabe6362f13c2f1583dcdf60f (patch) | |
| tree | 668b661a1eb79cdd6fe6c387d8422e19c60a889b /src/char/char.c | |
| parent | 9fbcd68feb07c638acd72192c3f3c9bc4fd52ad5 (diff) | |
| parent | 9437541b47da33d4e6111d5f6e1edb89c1216d4d (diff) | |
| download | hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.gz hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.bz2 hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.xz hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char/char.c b/src/char/char.c index ae65caa56..be98af10e 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -125,7 +125,7 @@ int max_connect_user = -1; int gm_allow_group = -1; int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; int start_zeny = 0; -int start_items[64]; //32 starting items allowed [mkbu95] +int start_items[MAX_START_ITEMS*2]; int guild_exp_rate = 100; //Custom limits for the fame lists. [Skotlex] @@ -4790,7 +4790,7 @@ int char_config_read(const char* cfgName) i = 0; split = strtok(w2, ","); - while (split != NULL) { + while (split != NULL && i < MAX_START_ITEMS*2) { split2 = split; split = strtok(NULL, ","); start_items[i] = atoi(split2); @@ -4935,7 +4935,7 @@ int do_init(int argc, char **argv) if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); - ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n"); + ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n"); } inter_init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration |