summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-24 10:47:20 -0300
committershennetsind <ind@henn.et>2013-04-24 10:47:20 -0300
commit7ef89df2da4b688fabe6362f13c2f1583dcdf60f (patch)
tree668b661a1eb79cdd6fe6c387d8422e19c60a889b
parent9fbcd68feb07c638acd72192c3f3c9bc4fd52ad5 (diff)
parent9437541b47da33d4e6111d5f6e1edb89c1216d4d (diff)
downloadhercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.gz
hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.bz2
hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.xz
hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--README.md2
-rw-r--r--README.txt2
-rw-r--r--conf/groups.conf2
-rw-r--r--conf/messages.conf2
-rw-r--r--db/re/skill_cast_db.txt2
-rw-r--r--doc/atcommands.txt2
-rw-r--r--doc/md5_hashcheck.txt2
-rw-r--r--src/char/char.c6
-rw-r--r--src/common/mmo.h1
-rw-r--r--src/map/unit.c2
10 files changed, 12 insertions, 11 deletions
diff --git a/README.md b/README.md
index 5b7aac287..0070c6300 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ Examples:
[Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED.
[Notice]: Please edit your 'login' table to create a proper inter-server user/pa
ssword (gender 'S')
- [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo
+ [Notice]: and then edit your user/password in conf/map-server.conf (or conf/impo
rt/map_conf.txt)
Relax. This is just indicating that you're using the default username and password. To
diff --git a/README.txt b/README.txt
index 25ba050e9..81867a4b3 100644
--- a/README.txt
+++ b/README.txt
@@ -117,7 +117,7 @@ Examples:
[Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED.
[Notice]: Please edit your 'login' table to create a proper inter-server user/pa
ssword (gender 'S')
- [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo
+ [Notice]: and then edit your user/password in conf/map-server.conf (or conf/impo
rt/map_conf.txt)
Relax. This is just indicating that you're using the default username and password. To
diff --git a/conf/groups.conf b/conf/groups.conf
index 879361387..d3bd6a514 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -41,7 +41,7 @@ Command names must not be aliases.
<log_commands>
Boolean value. If true then all commands used by the group will be logged to
atcommandlog. If setting is omitted in a group definition, false is assumed.
-Requires 'log_commands' to be enabled in 'conf/log_athena.conf'.
+Requires 'log_commands' to be enabled in 'conf/logs.conf'.
<permissions>
A group of settings
diff --git a/conf/messages.conf b/conf/messages.conf
index 823a6eb65..79e33c885 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -833,7 +833,7 @@
// @reloadatcommand
1036: Error reading groups.conf, reload failed.
-1037: Error reading atcommand_athena.conf, reload failed.
+1037: Error reading atcommand.conf, reload failed.
// @mapinfo
1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 677d06f57..ef34d230a 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1681,7 +1681,7 @@
//-- KG_KYOMU
3024,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//-- KG_KAGEMUSYA
-3025,0,0,0,60000:90000:120000:15000:180000,0,0,-1
+3025,0,0,0,60000:90000:120000:150000:180000,0,0,-1
//-- OB_ZANGETSU
3026,0,0,0,60000:75000:90000:105000:120000,0,0,-1
//-- OB_OBOROGENSOU
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index fae920300..b31fe4cef 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -9,7 +9,7 @@
//============================================================
This file describes the usage of in-game commands and assumes that
-'conf/atcommand_athena.conf' has the following:
+'conf/atcommand.conf' has the following:
atcommand_symbol : "@"
charcommand_symbol: "#"
diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt
index 10760a695..12681f367 100644
--- a/doc/md5_hashcheck.txt
+++ b/doc/md5_hashcheck.txt
@@ -17,7 +17,7 @@ server types, so a client diff is required to ensure the hash is sent.
A link containing the required WeeDiffGen plugin can be found at:
http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/
-The settings for the hash check are located in conf\login_athena.conf:
+The settings for the hash check are located in conf\login.conf:
// Client MD5 hash check
// If turned on, the login server will check if the client's hash matches
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
diff --git a/src/common/mmo.h b/src/common/mmo.h
index c0842bac2..e19c8f94d 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -100,6 +100,7 @@
#define MAX_GUARDIANS 8 //Local max per castle. [Skotlex]
#define MAX_QUEST_DB 2400 //Max quests that the server will load
#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
+#define MAX_START_ITEMS 32 //Max number of items allowed to be given to a char whenever it's created. [mkbu95]
// for produce
#define MIN_ATTRIBUTE 0
diff --git a/src/map/unit.c b/src/map/unit.c
index 15421019b..952b1a20e 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -330,7 +330,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
&& wpd.path_len > 14 ) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
return 0;
#endif
- if( battle_config.max_walk_path < wpd.path_len )
+ if( (battle_config.max_walk_path < wpd.path_len) && (bl->type != BL_NPC) )
return 0;
if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 &&