From aa9464281141d0fe098285e0a32ca33d852c0552 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 17 Nov 2014 16:07:30 +0300 Subject: Move common interfaces initialisation into separate file. --- src/Makefile.am | 4 +++- src/common/interfaces.c | 29 +++++++++++++++++++++++++++++ src/common/interfaces.h | 9 +++++++++ src/login/init.c | 1 + src/map/init.c | 14 ++------------ 5 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 src/common/interfaces.c create mode 100644 src/common/interfaces.h diff --git a/src/Makefile.am b/src/Makefile.am index 6d5b292..59554ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,9 @@ MAP_SRC = map/dummy.c \ map/send.h \ map/session.c \ map/session.h \ - map/sessionext.h + map/sessionext.h \ + common/interfaces.c \ + common/interfaces.h SHARED_CFLAGS = -pipe -ffast-math -Wall -Wextra -Wno-sign-compare -DPCRE_SUPPORT SHARED_LDFLAGS = -avoid-version -Wl,--no-undefined diff --git a/src/common/interfaces.c b/src/common/interfaces.c new file mode 100644 index 0000000..40a71fb --- /dev/null +++ b/src/common/interfaces.c @@ -0,0 +1,29 @@ +// 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"); +} diff --git a/src/common/interfaces.h b/src/common/interfaces.h new file mode 100644 index 0000000..2215978 --- /dev/null +++ b/src/common/interfaces.h @@ -0,0 +1,9 @@ +// 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 b1682af..6eff178 100644 --- a/src/login/init.c +++ b/src/login/init.c @@ -30,6 +30,7 @@ HPExport void plugin_init (void) session = GET_SYMBOL("session"); sockt = GET_SYMBOL("sockt"); strlib = GET_SYMBOL("strlib"); + login = GET_SYMBOL("login"); addPacket(0x7530, 22, login_parse_version, hpParse_Login); diff --git a/src/map/init.c b/src/map/init.c index 7620757..52c5f58 100644 --- a/src/map/init.c +++ b/src/map/init.c @@ -10,8 +10,6 @@ #include "../../../common/mmo.h" #include "../../../common/socket.h" #include "../../../common/strlib.h" -#include "../../../common/sysinfo.h" -#include "../../../common/timer.h" #include "../../../map/chat.h" #include "../../../map/chrif.h" #include "../../../map/clif.h" @@ -35,6 +33,7 @@ #include "../../../map/trade.h" #include "../../../map/quest.h" +#include "common/interfaces.h" #include "map/dummy.h" #include "map/parse.h" #include "map/script.h" @@ -54,16 +53,7 @@ HPExport struct hplugin_info pinfo = HPExport void plugin_init (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"); + interfaces_init_common(); atcommand = GET_SYMBOL("atcommand"); battle = GET_SYMBOL("battle"); -- cgit v1.2.3-60-g2f50