Skip to content

Commit

Permalink
Fixed Bug #7493
Browse files Browse the repository at this point in the history
Special Thanks to quesoph
http://hercules.ws/board/tracker/issue-7493-compiling-with-cygwin/

Signed-off-by: shennetsind <ind@henn.et>
  • Loading branch information
shennetsind committed Jul 8, 2013
1 parent 19f0fcd commit 4f69a9e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/common/console.c
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/map/atcommand.c
Expand Up @@ -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 )
Expand Down
4 changes: 2 additions & 2 deletions src/map/map.c
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4f69a9e

Please sign in to comment.