summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-01 17:17:09 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-01 17:17:09 +0000
commit61248161ad0386b46d3f37ed4457366841501036 (patch)
tree2b7e762eeda38166316d2e7cc8018509831d9475 /src/char_sql
parent22746a0a0a9efe5fc7e84496f5780116c52f2abe (diff)
downloadhercules-61248161ad0386b46d3f37ed4457366841501036.tar.gz
hercules-61248161ad0386b46d3f37ed4457366841501036.tar.bz2
hercules-61248161ad0386b46d3f37ed4457366841501036.tar.xz
hercules-61248161ad0386b46d3f37ed4457366841501036.zip
- Fixed txt-converter compilation.
- Added my_global.h include to login converter - Removed sd->char_id since we can use sd->status.char_id instead. - Small speedup in STRECOVERY, and made it not unlock a mob's target. - Fixed GS_GROUNDDRIFT consuming ammo when it's time expires (so it was consuming 2 grenades instead of one). Also added a "explosion effect" when their time runs out. - gvg_dungeon mapflag won't set pvp related mapflags anymore, pc_dead will force pvp ranking gain/loss on gvg_dungeon maps now. - Now when coming out of hiding land-effects will trigger on the character. - Made the pc_setpos message when being placed on an unwalkable tile tell you which player triggered it. - Fixed land effects not taking effect inmediately on map-load when the invincible timer is disabled. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9374 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
-rw-r--r--src/char_sql/char.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 8fb53945d..36fb788de 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -4050,12 +4050,12 @@ int char_config_read(const char *cfgName) {
remove_control_chars((unsigned char *) w2);
if(strcmpi(w1,"timestamp_format")==0) {
strncpy(timestamp_format, w2, 20);
- } else if(strcmpi(w1,"stdout_with_ansisequence")==0){
- stdout_with_ansisequence = config_switch(w2);
} else if(strcmpi(w1,"console_silent")==0){
msg_silent = 0; //To always allow the next line to show up.
ShowInfo("Console Silent Setting: %d\n", atoi(w2));
msg_silent = atoi(w2);
+ } else if(strcmpi(w1,"stdout_with_ansisequence")==0){
+ stdout_with_ansisequence = config_switch(w2);
} else if (strcmpi(w1, "userid") == 0) {
strncpy(userid, w2, 24);
} else if (strcmpi(w1, "passwd") == 0) {