From ce092b3c79d7c624df4632535f65d7a663f6054e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 30 Nov 2014 23:27:06 +0300 Subject: char: add init default map. --- src/Makefile.am | 12 ++++++------ src/char/init.c | 4 +++- src/common/init.c | 38 ++++++++++++++++++++++++++++++++++++++ src/common/init.h | 10 ++++++++++ src/common/interfaces.c | 30 ------------------------------ src/common/interfaces.h | 9 --------- src/login/init.c | 2 +- src/map/init.c | 6 ++---- 8 files changed, 60 insertions(+), 51 deletions(-) create mode 100644 src/common/init.c create mode 100644 src/common/init.h delete mode 100644 src/common/interfaces.c delete mode 100644 src/common/interfaces.h diff --git a/src/Makefile.am b/src/Makefile.am index 29984a5..1208446 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ CHAR_SRC = char/char.c \ char/config.c \ char/config.h \ char/init.c \ - common/interfaces.c \ - common/interfaces.h \ + common/init.c \ + common/init.h \ common/ip.c \ common/ip.h @@ -17,8 +17,8 @@ LOGIN_SRC = login/config.c \ login/parse.h \ login/send.c \ login/send.h \ - common/interfaces.c \ - common/interfaces.h \ + common/init.c \ + common/init.h \ common/ip.c \ common/ip.h @@ -53,8 +53,8 @@ MAP_SRC = map/clif.c \ map/struct/sessionext.h \ map/utils/formatutils.c \ map/utils/formatutils.h \ - common/interfaces.c \ - common/interfaces.h + common/init.c \ + common/init.h SHARED_CFLAGS = -pipe -ffast-math -Wall -Wextra -Wno-sign-compare -DPCRE_SUPPORT SHARED_LDFLAGS = -avoid-version -Wl,--no-undefined diff --git a/src/char/init.c b/src/char/init.c index 639c19b..3dabdae 100644 --- a/src/char/init.c +++ b/src/char/init.c @@ -26,7 +26,7 @@ #include "../../../char/loginif.h" #include "../../../char/mapif.h" -#include "common/interfaces.h" +#include "common/init.h" #include "char/char.h" #include "char/config.h" @@ -65,6 +65,8 @@ HPExport void server_preinit (void) { interfaces_init_common(); + setDefaultMap(); + addCharInterConf("inter_server_ip", config_inter_server_ip); } diff --git a/src/common/init.c b/src/common/init.c new file mode 100644 index 0000000..38797dc --- /dev/null +++ b/src/common/init.c @@ -0,0 +1,38 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#include +#include +#include + +#include "../../../common/HPMi.h" +#include "../../../common/conf.h" +#include "../../../common/malloc.h" +#include "../../../common/mapindex.h" +#include "../../../common/mmo.h" +#include "../../../common/socket.h" +#include "../../../common/strlib.h" +#include "../../../common/sysinfo.h" +#include "../../../common/timer.h" + +void interfaces_init_common(void) +{ + iMalloc = GET_SYMBOL("iMalloc"); + strlib = GET_SYMBOL("strlib"); + session = GET_SYMBOL("session"); + sockt = GET_SYMBOL("sockt"); + sv = GET_SYMBOL("sv"); + StrBuf = GET_SYMBOL("StrBuf"); + SQL = GET_SYMBOL("SQL"); + timer = GET_SYMBOL("timer"); + libconfig = GET_SYMBOL("libconfig"); + sysinfo = GET_SYMBOL("sysinfo"); + DB = GET_SYMBOL("DB"); +} + +void setDefaultMap(void) +{ + mapindex->default_map = "000-1"; + mapindex->default_x = 80; + mapindex->default_y = 109; +} diff --git a/src/common/init.h b/src/common/init.h new file mode 100644 index 0000000..bd86f5b --- /dev/null +++ b/src/common/init.h @@ -0,0 +1,10 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#ifndef EVOL_COMMON_INTERFACES +#define EVOL_COMMON_INTERFACES + +void interfaces_init_common(void); +void setDefaultMap(void); + +#endif // EVOL_COMMON_INTERFACES diff --git a/src/common/interfaces.c b/src/common/interfaces.c deleted file mode 100644 index 37e8890..0000000 --- a/src/common/interfaces.c +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. -// Copyright (c) 2014 Evol developers - -#include -#include -#include - -#include "../../../common/HPMi.h" -#include "../../../common/conf.h" -#include "../../../common/malloc.h" -#include "../../../common/mmo.h" -#include "../../../common/socket.h" -#include "../../../common/strlib.h" -#include "../../../common/sysinfo.h" -#include "../../../common/timer.h" - -void interfaces_init_common(void) -{ - iMalloc = GET_SYMBOL("iMalloc"); - strlib = GET_SYMBOL("strlib"); - session = GET_SYMBOL("session"); - sockt = GET_SYMBOL("sockt"); - sv = GET_SYMBOL("sv"); - StrBuf = GET_SYMBOL("StrBuf"); - SQL = GET_SYMBOL("SQL"); - timer = GET_SYMBOL("timer"); - libconfig = GET_SYMBOL("libconfig"); - sysinfo = GET_SYMBOL("sysinfo"); - DB = GET_SYMBOL("DB"); -} diff --git a/src/common/interfaces.h b/src/common/interfaces.h deleted file mode 100644 index 2215978..0000000 --- a/src/common/interfaces.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. -// Copyright (c) 2014 Evol developers - -#ifndef EVOL_COMMON_INTERFACES -#define EVOL_COMMON_INTERFACES - -void interfaces_init_common(void); - -#endif // EVOL_COMMON_INTERFACES diff --git a/src/login/init.c b/src/login/init.c index c781588..33fda69 100644 --- a/src/login/init.c +++ b/src/login/init.c @@ -12,7 +12,7 @@ #include "../../../common/strlib.h" #include "../../../login/login.h" -#include "common/interfaces.h" +#include "common/init.h" #include "login/config.h" #include "login/parse.h" diff --git a/src/map/init.c b/src/map/init.c index c8f2ad3..b6142ca 100644 --- a/src/map/init.c +++ b/src/map/init.c @@ -33,7 +33,7 @@ #include "../../../map/trade.h" #include "../../../map/quest.h" -#include "common/interfaces.h" +#include "common/init.h" #include "map/clif.h" #include "map/lang.h" #include "map/npc.h" @@ -170,9 +170,7 @@ HPExport void server_preinit (void) mapit = GET_SYMBOL("mapit"); mapindex = GET_SYMBOL("mapindex"); - mapindex->default_map = "000-1"; - mapindex->default_x = 80; - mapindex->default_y = 109; + setDefaultMap(); addHookPre("quest->read_db", equest_read_db); } -- cgit v1.2.3-60-g2f50