summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-10 17:26:29 +0800
committerHaru <haru@dotalux.com>2015-12-13 16:22:16 +0100
commit138a866f20550914c1353baabbbc84fec82ddcac (patch)
tree25caab619b29354da31cb12c772be1924739f784
parentc1a26c8f136c6e474c0acbd7dd5d16d7651e0e3c (diff)
downloadhercules-138a866f20550914c1353baabbbc84fec82ddcac.tar.gz
hercules-138a866f20550914c1353baabbbc84fec82ddcac.tar.bz2
hercules-138a866f20550914c1353baabbbc84fec82ddcac.tar.xz
hercules-138a866f20550914c1353baabbbc84fec82ddcac.zip
Renaming 'start_point' to 'start_point_re'
-rw-r--r--conf/char-server.conf2
-rw-r--r--src/char/char.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/char-server.conf b/conf/char-server.conf
index 37631ddae..eb2b9a63d 100644
--- a/conf/char-server.conf
+++ b/conf/char-server.conf
@@ -95,7 +95,7 @@ autosave_time: 60
save_log: yes
// Start point, Map name followed by coordinates (x,y)
-start_point: iz_int,97,90
+start_point_re: iz_int,97,90
start_point_pre: new_1-1,53,111
// Starting items for new characters
diff --git a/src/char/char.c b/src/char/char.c
index 41b13b3db..d9626c500 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -5637,21 +5637,21 @@ int char_config_read(const char* cfgName)
} else if(strcmpi(w1, "gm_allow_group") == 0) {
gm_allow_group = atoi(w2);
} else if (strcmpi(w1, "autosave_time") == 0) {
- autosave_interval = atoi(w2)*1000;
+ autosave_interval = atoi(w2) * 1000;
if (autosave_interval <= 0)
autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
} else if (strcmpi(w1, "save_log") == 0) {
save_log = config_switch(w2);
}
#ifdef RENEWAL
- else if (strcmpi(w1, "start_point") == 0) {
+ else if (strcmpi(w1, "start_point_re") == 0) {
char map[MAP_NAME_LENGTH_EXT];
int x, y;
if (sscanf(w2, "%15[^,],%d,%d", map, &x, &y) < 3)
continue;
start_point.map = mapindex->name2id(map);
if (!start_point.map)
- ShowError("Specified start_point %s not found in map-index cache.\n", map);
+ ShowError("Specified start_point_re '%s' not found in map-index cache.\n", map);
start_point.x = x;
start_point.y = y;
}
@@ -5663,7 +5663,7 @@ int char_config_read(const char* cfgName)
continue;
start_point.map = mapindex->name2id(map);
if (!start_point.map)
- ShowError("Specified start_point_pre %s not found in map-index cache.\n", map);
+ ShowError("Specified start_point_pre '%s' not found in map-index cache.\n", map);
start_point.x = x;
start_point.y = y;
}
@@ -5674,7 +5674,7 @@ int char_config_read(const char* cfgName)
i = 0;
split = strtok(w2, ",");
- while (split != NULL && i < MAX_START_ITEMS*3) {
+ while (split != NULL && i < MAX_START_ITEMS * 3) {
char *split2 = split;
split = strtok(NULL, ",");
start_items[i] = atoi(split2);