diff options
| -rw-r--r-- | src/char/char.c | 4 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/map.h | 4 | ||||
| -rw-r--r-- | src/plugins/Makefile | 2 | ||||
| -rw-r--r-- | src/plugins/pid.c | 9 |
7 files changed, 10 insertions, 15 deletions
diff --git a/src/char/char.c b/src/char/char.c index 66601f644..c4fc8dfda 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -62,7 +62,7 @@ uint16 login_port = 6900; char char_ip_str[128]; uint32 char_ip; char bind_ip_str[128]; -uint32 bind_ip; +uint32 bind_ip = INADDR_ANY; uint16 char_port = 6121; int char_maintenance; int char_new; @@ -4310,7 +4310,7 @@ int do_init(int argc, char **argv) set_defaultparse(parse_char); - char_fd = make_listen_bind(bind_ip?bind_ip:INADDR_ANY,char_port); + char_fd = make_listen_bind(bind_ip, char_port); add_timer_func_list(check_connect_login_server, "check_connect_login_server"); add_timer_func_list(send_users_tologin, "send_users_tologin"); diff --git a/src/char_sql/char.c b/src/char_sql/char.c index dcec47c42..6be0d3ece 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -4161,7 +4161,7 @@ int do_init(int argc, char **argv) //Read map indexes mapindex_init(); - start_point.map = mapindex_name2id("new_zone01.gat"); + start_point.map = mapindex_name2id("new_zone01"); char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]); char_lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME); diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a0827fcf6..f7a6813ae 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5245,7 +5245,7 @@ int atcommand_reloadstatusdb(const int fd, struct map_session_data* sd, const ch return 0; } /*========================================== - * @reloadpcdb - reloads exp.txt skill_tree.txt attr_fix.txt + * @reloadpcdb - reloads exp.txt skill_tree.txt attr_fix.txt statpoint.txt *------------------------------------------ */ int atcommand_reloadpcdb(const int fd, struct map_session_data* sd, const char* command, const char* message) diff --git a/src/map/battle.c b/src/map/battle.c index 358eb5746..59969422f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4080,7 +4080,7 @@ void battle_set_defaults() { battle_config.pc_luk_sc_def = 300; battle_config.mob_luk_sc_def = 300; battle_config.pc_max_sc_def = 100; - battle_config.mob_max_sc_def = 50; + battle_config.mob_max_sc_def = 100; battle_config.sg_miracle_skill_ratio=1; battle_config.sg_angel_skill_ratio=1; battle_config.sg_miracle_skill_duration=3600000; diff --git a/src/map/map.h b/src/map/map.h index 7ce91c4c5..89393627a 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -229,12 +229,12 @@ enum { ELE_MAX }; -enum { +enum auto_trigger_flag { ATF_SELF=0x01, ATF_TARGET=0x02, ATF_SHORT=0x04, ATF_LONG=0x08 -} auto_trigger_flag; +}; struct block_list { struct block_list *next,*prev; diff --git a/src/plugins/Makefile b/src/plugins/Makefile index f576995f6..bac69f70f 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -14,13 +14,11 @@ txt sql all: $(PLUGINS) %.$(PLUGINEXT): %.c $(CC) $(CFLAGS) -shared -o ../../plugins/$@ $< - @touch $@ sig.$(PLUGINEXT): sig.c $(CC) $(CFLAGS) -shared -o ../../plugins/$@ $< \ ../common/obj/showmsg.o ../common/obj/utils.o \ ../common/obj/minimalloc.o - @touch $@ gui.$(PLUGINEXT): ../../plugins/gui.conf upnp.$(PLUGINEXT): ../../plugins/upnp.conf diff --git a/src/plugins/pid.c b/src/plugins/pid.c index 2fdd2570c..48013e3eb 100644 --- a/src/plugins/pid.c +++ b/src/plugins/pid.c @@ -2,13 +2,10 @@ #include <stdio.h> #include <string.h> -#ifndef _WIN32 - #include <unistd.h> -#endif -#ifdef MINGW - #include <process.h> - #include <io.h> +#if !defined _WIN32 || defined MINGW + #include <unistd.h> // getpid(), unlink() #else + #include <windows.h> #define getpid GetCurrentProcessId #endif |