diff options
| author | Ibrahem Hossam <hemagx2@gmail.com> | 2016-04-16 15:37:47 +0200 |
|---|---|---|
| committer | Ibrahem Hossam <hemagx2@gmail.com> | 2016-04-16 15:37:47 +0200 |
| commit | bbcb0406e5a430d1c85b3448f88a72f342530cf0 (patch) | |
| tree | cc2348d9a18ea4d7e462e0247aeb8d23a1808abf /src/map | |
| parent | c7410453a15110a12d9fffb06b70e9557fb9f73a (diff) | |
| parent | 8448e3f8cdcbf820e304a68c7507a0ed96d53544 (diff) | |
| download | hercules-bbcb0406e5a430d1c85b3448f88a72f342530cf0.tar.gz hercules-bbcb0406e5a430d1c85b3448f88a72f342530cf0.tar.bz2 hercules-bbcb0406e5a430d1c85b3448f88a72f342530cf0.tar.xz hercules-bbcb0406e5a430d1c85b3448f88a72f342530cf0.zip | |
Merge pull request #1255 from HerculesWS/login-clif_rewrite
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/Makefile.in | 21 | ||||
| -rw-r--r-- | src/map/packets_struct.h | 7 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in index b5a3d4461..ff582d2f9 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. @@ -53,6 +53,7 @@ MAP_H = atcommand.h battle.h battleground.h buyingstore.h channel.h chat.h \ mercenary.h mob.h npc.h packets.h packets_struct.h party.h path.h \ pc.h pc_groups.h pet.h quest.h script.h searchstore.h skill.h \ status.h storage.h trade.h unit.h vending.h +MAP_PH = HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) @@ -95,7 +96,7 @@ help: Makefile: Makefile.in @$(MAKE) -C ../.. src/map/Makefile -$(SYSINFO_INC): $(MAP_C) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) +$(SYSINFO_INC): $(MAP_C) $(MAP_PH) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " MAKE $@" @$(MAKE) -C ../.. sysinfo @@ -118,12 +119,6 @@ map-server: ../../map-server@EXEEXT@ @$(CC) @STATIC@ @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_OBJ) $(COMMON_D)/obj_sql/common_sql.a \ $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ -# map object files - -obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - # missing object files $(COMMON_D)/obj_all/common.a: @echo " MAKE $@" @@ -140,3 +135,11 @@ $(MT19937AR_OBJ): $(LIBCONFIG_OBJ): @echo " MAKE $@" @$(MAKE) -C $(LIBCONFIG_D) + +.SECONDEXPANSION: + +# map object files + +obj_sql/%.o: %.c $$(filter %.p.h, $(MAP_PH)) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql + @echo " CC $<" + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index e8f04c653..25b20cddf 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2016 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,11 @@ #include "common/cbasetypes.h" #include "common/mmo.h" +// Packet DB +#define MIN_PACKET_DB 0x0064 +#define MAX_PACKET_DB 0x0F00 +#define MAX_PACKET_POS 20 + /** * **/ |