diff options
| -rw-r--r-- | src/common/console.c | 5 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/common/console.c b/src/common/console.c index 4ae210e55..a9ea0386f 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -21,14 +21,15 @@ #include <stdio.h> #include <stdlib.h> -#ifndef WIN32 +#if !defined(WIN32) #include <unistd.h> + #include <sys/time.h> #else #include "../common/winapi.h" // Console close event handling #endif #ifdef CONSOLE_INPUT - #ifdef WIN32 + #if defined(WIN32) #include <conio.h> /* _kbhit() */ #endif #endif diff --git a/src/map/atcommand.c b/src/map/atcommand.c index e8165e4a3..950961b29 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7581,7 +7581,7 @@ return true;\ clif->message(sd->fd,msg_txt(1313)); // Type "@mapflag available" to list the available mapflags. return 1; } - for (i = 0; flag_name[i]; i++) flag_name[i] = (char)tolower(flag_name[i]); //lowercase + for (i = 0; flag_name[i]; i++) flag_name[i] = TOLOWER(flag_name[i]); //lowercase if ( strcmp( flag_name , "gvg" ) == 0 ) { if( flag && !map[sd->bl.m].flag.gvg ) diff --git a/src/map/map.c b/src/map/map.c index 3a2ca6c57..31600440d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5274,7 +5274,7 @@ void map_hp_symbols(void) { HPM->share(map,"map"); } -void load_defaults(void) { +void map_load_defaults(void) { atcommand_defaults(); battle_defaults(); battleground_defaults(); @@ -5408,7 +5408,7 @@ int do_init(int argc, char *argv[]) } memset(&index2mapid, -1, sizeof(index2mapid)); - load_defaults(); + map_load_defaults(); map_config_read(iMap->MAP_CONF_NAME); CREATE(map,struct map_data,iMap->map_num); iMap->map_num = 0; |