diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-01-10 00:07:04 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-01-10 00:07:04 -0300 |
| commit | cf5dae27bd6227877e72cb68f4e360be2bc28094 (patch) | |
| tree | 89b7370124171eaa434fd69518a2791c32f42c30 /src | |
| parent | c87e652672523fd3e37e67f015924e837eecc4df (diff) | |
| parent | c687d2d1b2ad48b5b15899f34b73a41ae73f674c (diff) | |
| download | evol-hercules-cf5dae27bd6227877e72cb68f4e360be2bc28094.tar.gz evol-hercules-cf5dae27bd6227877e72cb68f4e360be2bc28094.tar.bz2 evol-hercules-cf5dae27bd6227877e72cb68f4e360be2bc28094.tar.xz evol-hercules-cf5dae27bd6227877e72cb68f4e360be2bc28094.zip | |
Merge branch 'master' into tmw2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/echar/init.c | 3 | ||||
| -rw-r--r-- | src/ecommon/init.c | 6 | ||||
| -rw-r--r-- | src/elogin/init.c | 3 | ||||
| -rw-r--r-- | src/emap/init.c | 3 |
5 files changed, 16 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8c9a8d5..cf864f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -138,6 +138,7 @@ MAP_SRC = emap/atcommand.c \ SHARED_CFLAGS = ${CFLAGS} -O3 -pipe -ffast-math -std=c11 -Wall -Wextra -Wno-sign-compare -Wno-unused -fno-omit-frame-pointer \ -DPCRE_SUPPORT -I../../.. -I../../../../3rdparty \ + -DHERCULES_CORE_HPMI_SKIP \ -DPACKETVER=20170517 \ -DevolPacketOffset=0x100 SHARED_LDFLAGS = -lm -avoid-version -Wl,--no-undefined diff --git a/src/echar/init.c b/src/echar/init.c index d42542c..e273b58 100644 --- a/src/echar/init.c +++ b/src/echar/init.c @@ -39,6 +39,9 @@ #include "echar/config.h" #include "plugins/HPMHooking.h" + +HPExport struct HPMHooking_interface HPMHooking_s; + #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ HPExport struct hplugin_info pinfo = diff --git a/src/ecommon/init.c b/src/ecommon/init.c index 69d4f4f..664522c 100644 --- a/src/ecommon/init.c +++ b/src/ecommon/init.c @@ -8,6 +8,11 @@ #include <string.h> #include "common/HPMi.h" + +HPExport struct HPMi_interface HPMi_s; +HPExport struct HPMi_interface *HPMi; +HPExport void *(*import_symbol) (char *name, unsigned int pID); + #include "common/conf.h" #include "common/memmgr.h" #include "common/mapindex.h" @@ -54,4 +59,5 @@ void common_online(void) checkVar(MAX_EVOL_SKILLS, 62); checkVar(EVOL_FIRST_SKILL, 20000); checkVar(MAX_SKILL_TREE, 110); + checkVar(BASE_GUILD_SIZE, 100); } diff --git a/src/elogin/init.c b/src/elogin/init.c index 52a95bf..88f322c 100644 --- a/src/elogin/init.c +++ b/src/elogin/init.c @@ -25,6 +25,9 @@ #include "elogin/parse.h" #include "plugins/HPMHooking.h" + +HPExport struct HPMHooking_interface HPMHooking_s; + #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ HPExport struct hplugin_info pinfo = diff --git a/src/emap/init.c b/src/emap/init.c index 8838aab..c59185b 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -80,6 +80,9 @@ #include "emap/data/skilld.h" #include "plugins/HPMHooking.h" + +HPExport struct HPMHooking_interface HPMHooking_s; + #include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ extern int langScriptId; |