From 67c92bf1712eb9ba95aa3d10715b19f4a4cc970a Mon Sep 17 00:00:00 2001 From: Uleat Date: Wed, 18 May 2016 04:45:31 -0400 Subject: [PATCH] Changed client 'constants' files to 'limits' --- changelog.txt | 3 + common/CMakeLists.txt | 36 ++++++---- common/eq_limits.h | 12 ++-- ...mfields.h => deprecated_rof2_itemfields.h} | 0 ...emfields.h => deprecated_rof_itemfields.h} | 0 ...emfields.h => deprecated_sod_itemfields.h} | 0 ...emfields.h => deprecated_sof_itemfields.h} | 0 ...de_list.h => deprecated_sof_opcode_list.h} | 0 ...a.h => deprecated_titanium_itemfields_a.h} | 0 ...b.h => deprecated_titanium_itemfields_b.h} | 0 ...temfields.h => deprecated_uf_itemfields.h} | 0 common/patches/makepatch | 2 +- common/patches/rof2_limits.cpp | 18 +++++ .../{rof2_constants.h => rof2_limits.h} | 65 ++++++------------ common/patches/rof_limits.cpp | 18 +++++ .../patches/{rof_constants.h => rof_limits.h} | 65 ++++++------------ common/patches/sod_limits.cpp | 18 +++++ .../patches/{uf_constants.h => sod_limits.h} | 65 ++++++------------ common/patches/sof_limits.cpp | 18 +++++ .../patches/{sof_constants.h => sof_limits.h} | 68 ++++++------------- common/patches/template_constants.h | 20 ------ common/patches/template_limits.cpp | 18 +++++ common/patches/template_limits.h | 31 +++++++++ common/patches/titanium_limits.cpp | 18 +++++ ...titanium_constants.h => titanium_limits.h} | 65 ++++++------------ common/patches/uf_limits.cpp | 18 +++++ .../patches/{sod_constants.h => uf_limits.h} | 65 ++++++------------ 27 files changed, 317 insertions(+), 306 deletions(-) rename common/patches/{rof2_itemfields.h => deprecated_rof2_itemfields.h} (100%) rename common/patches/{rof_itemfields.h => deprecated_rof_itemfields.h} (100%) rename common/patches/{sod_itemfields.h => deprecated_sod_itemfields.h} (100%) rename common/patches/{sof_itemfields.h => deprecated_sof_itemfields.h} (100%) rename common/patches/{sof_opcode_list.h => deprecated_sof_opcode_list.h} (100%) rename common/patches/{titanium_itemfields_a.h => deprecated_titanium_itemfields_a.h} (100%) rename common/patches/{titanium_itemfields_b.h => deprecated_titanium_itemfields_b.h} (100%) rename common/patches/{uf_itemfields.h => deprecated_uf_itemfields.h} (100%) create mode 100644 common/patches/rof2_limits.cpp rename common/patches/{rof2_constants.h => rof2_limits.h} (77%) create mode 100644 common/patches/rof_limits.cpp rename common/patches/{rof_constants.h => rof_limits.h} (77%) create mode 100644 common/patches/sod_limits.cpp rename common/patches/{uf_constants.h => sod_limits.h} (79%) create mode 100644 common/patches/sof_limits.cpp rename common/patches/{sof_constants.h => sof_limits.h} (78%) delete mode 100644 common/patches/template_constants.h create mode 100644 common/patches/template_limits.cpp create mode 100644 common/patches/template_limits.h create mode 100644 common/patches/titanium_limits.cpp rename common/patches/{titanium_constants.h => titanium_limits.h} (79%) create mode 100644 common/patches/uf_limits.cpp rename common/patches/{sod_constants.h => uf_limits.h} (79%) diff --git a/changelog.txt b/changelog.txt index 971a49cb9..938c58927 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 05/18/2016 == +Uleat: Changed client 'constants' files to 'limits' + == 05/10/2016 == Uleat: Converted client translators' 'SerializeItem()' to recursive, single buffer methodology. Titanium SerializeItem() now adds a null term between parent items instead of the invoking function Uleat: Converted server 'BulkSendInventoryItems()' to use single buffer methodology diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 6c13aefbc..8c5ac6db7 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -74,11 +74,17 @@ SET(common_sources platform.cpp patches/patches.cpp patches/sod.cpp + patches/sod_limits.cpp patches/sof.cpp + patches/sof_limits.cpp patches/rof.cpp + patches/rof_limits.cpp patches/rof2.cpp + patches/rof2_limits.cpp patches/titanium.cpp + patches/titanium_limits.cpp patches/uf.cpp + patches/uf_limits.cpp SocketLib/Base64.cpp SocketLib/File.cpp SocketLib/HttpdCookies.cpp @@ -201,13 +207,13 @@ SET(common_headers zone_numbers.h patches/patches.h patches/sod.h - patches/sod_constants.h # patches/sod_itemfields.h + patches/sod_limits.h patches/sod_ops.h patches/sod_structs.h patches/sof.h - patches/sof_constants.h # patches/sof_itemfields.h + patches/sof_limits.h # patches/sof_opcode_list.h patches/sof_ops.h patches/sof_structs.h @@ -215,24 +221,24 @@ SET(common_headers patches/ss_define.h patches/ss_register.h patches/rof.h - patches/rof_constants.h # patches/rof_itemfields.h + patches/rof_limits.h patches/rof_ops.h patches/rof_structs.h patches/rof2.h - patches/rof2_constants.h # patches/rof2_itemfields.h + patches/rof2_limits.h patches/rof2_ops.h patches/rof2_structs.h patches/titanium.h - patches/titanium_constants.h # patches/titanium_itemfields_a.h # patches/titanium_itemfields_b.h + patches/titanium_limits.h patches/titanium_ops.h patches/titanium_structs.h patches/uf.h - patches/uf_constants.h # patches/uf_itemfields.h + patches/uf_limits.h patches/uf_ops.h patches/uf_structs.h SocketLib/Base64.h @@ -256,46 +262,52 @@ SOURCE_GROUP(Patches FILES patches/patches.h patches/sod.h # patches/sod_itemfields.h + patches/sod_limits.h patches/sod_ops.h - patches/sod_constants.h patches/sod_structs.h patches/sof.h # patches/sof_itemfields.h + patches/sof_limits.h # patches/sof_opcode_list.h patches/sof_ops.h - patches/sof_constants.h patches/sof_structs.h patches/ss_declare.h patches/ss_define.h patches/ss_register.h patches/rof.h # patches/rof_itemfields.h + patches/rof_limits.h patches/rof_ops.h - patches/rof_constants.h patches/rof_structs.h patches/rof2.h # patches/rof2_itemfields.h + patches/rof2_limits.h patches/rof2_ops.h - patches/rof2_constants.h patches/rof2_structs.h patches/titanium.h # patches/titanium_itemfields_a.h # patches/titanium_itemfields_b.h + patches/titanium_limits.h patches/titanium_ops.h - patches/titanium_constants.h patches/titanium_structs.h patches/uf.h # patches/uf_itemfields.h + patches/uf_limits.h patches/uf_ops.h - patches/uf_constants.h patches/uf_structs.h patches/patches.cpp patches/sod.cpp + patches/sod_limits.cpp patches/sof.cpp + patches/sof_limits.cpp patches/rof.cpp + patches/rof_limits.cpp patches/rof2.cpp + patches/rof2_limits.cpp patches/titanium.cpp + patches/titanium_limits.cpp patches/uf.cpp + patches/uf_limits.cpp ) SOURCE_GROUP(SocketLib FILES diff --git a/common/eq_limits.h b/common/eq_limits.h index 4c1db6252..eb9c983f0 100644 --- a/common/eq_limits.h +++ b/common/eq_limits.h @@ -23,12 +23,12 @@ #include "types.h" #include "eq_constants.h" #include "inventory_version.h" // inv2 watch -#include "../common/patches/titanium_constants.h" -#include "../common/patches/sof_constants.h" -#include "../common/patches/sod_constants.h" -#include "../common/patches/uf_constants.h" -#include "../common/patches/rof_constants.h" -#include "../common/patches/rof2_constants.h" +#include "../common/patches/titanium_limits.h" +#include "../common/patches/sof_limits.h" +#include "../common/patches/sod_limits.h" +#include "../common/patches/uf_limits.h" +#include "../common/patches/rof_limits.h" +#include "../common/patches/rof2_limits.h" // *** DO NOT CHANGE without a full understanding of the consequences..the server is set up to use these settings explicitly!! *** diff --git a/common/patches/rof2_itemfields.h b/common/patches/deprecated_rof2_itemfields.h similarity index 100% rename from common/patches/rof2_itemfields.h rename to common/patches/deprecated_rof2_itemfields.h diff --git a/common/patches/rof_itemfields.h b/common/patches/deprecated_rof_itemfields.h similarity index 100% rename from common/patches/rof_itemfields.h rename to common/patches/deprecated_rof_itemfields.h diff --git a/common/patches/sod_itemfields.h b/common/patches/deprecated_sod_itemfields.h similarity index 100% rename from common/patches/sod_itemfields.h rename to common/patches/deprecated_sod_itemfields.h diff --git a/common/patches/sof_itemfields.h b/common/patches/deprecated_sof_itemfields.h similarity index 100% rename from common/patches/sof_itemfields.h rename to common/patches/deprecated_sof_itemfields.h diff --git a/common/patches/sof_opcode_list.h b/common/patches/deprecated_sof_opcode_list.h similarity index 100% rename from common/patches/sof_opcode_list.h rename to common/patches/deprecated_sof_opcode_list.h diff --git a/common/patches/titanium_itemfields_a.h b/common/patches/deprecated_titanium_itemfields_a.h similarity index 100% rename from common/patches/titanium_itemfields_a.h rename to common/patches/deprecated_titanium_itemfields_a.h diff --git a/common/patches/titanium_itemfields_b.h b/common/patches/deprecated_titanium_itemfields_b.h similarity index 100% rename from common/patches/titanium_itemfields_b.h rename to common/patches/deprecated_titanium_itemfields_b.h diff --git a/common/patches/uf_itemfields.h b/common/patches/deprecated_uf_itemfields.h similarity index 100% rename from common/patches/uf_itemfields.h rename to common/patches/deprecated_uf_itemfields.h diff --git a/common/patches/makepatch b/common/patches/makepatch index e28b4bc2a..ef2271b29 100644 --- a/common/patches/makepatch +++ b/common/patches/makepatch @@ -5,7 +5,7 @@ if [ -z "$1" ]; then exit 1 fi -for ext in .cpp .h _ops.h _constants.h _structs.h +for ext in .cpp _limits.cpp .h _ops.h _limits.h _structs.h do cp template$ext $1$ext perl -pi -e "s/TEMPLATE/$1/g" $1$ext diff --git a/common/patches/rof2_limits.cpp b/common/patches/rof2_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/rof2_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/rof2_constants.h b/common/patches/rof2_limits.h similarity index 77% rename from common/patches/rof2_constants.h rename to common/patches/rof2_limits.h index e2886406b..b32d79d24 100644 --- a/common/patches/rof2_constants.h +++ b/common/patches/rof2_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ROF2_CONSTANTS_H_ -#define ROF2_CONSTANTS_H_ +#ifndef COMMON_ROF2_CONSTANTS_H +#define COMMON_ROF2_CONSTANTS_H #include "../types.h" -namespace RoF2 { + +namespace RoF2 +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -194,29 +194,6 @@ namespace RoF2 { static const bool COIN_HAS_WEIGHT = false; } -}; //end namespace RoF2 +}; /*RoF2*/ -#endif /*ROF2_CONSTANTS_H_*/ - -/* -RoF2 Notes: - ** Structure-based inventory ** -ok Possessions: ( 0, { 0 .. 33 }, -1, -1 ) (Corpse: { 23 .. 56 } [Offset 23]) -ok [Equipment: ( 0, { 0 .. 22 }, -1, -1 )] -ok [General: ( 0, { 23 .. 32 }, -1, -1 )] -ok [Cursor: ( 0, 33, -1, -1 )] - General Bags: ( 0, { 23 .. 32 }, { 0 .. (maxsize - 1) }, -1 ) - Cursor Bags: ( 0, 33, { 0 .. (maxsize - 1) }, -1 ) - - Bank: ( 1, { 0 .. 23 }, -1, -1 ) - Bank Bags: ( 1, { 0 .. 23 }, { 0 .. (maxsize - 1)}, -1 ) - - Shared Bank: ( 2, { 0 .. 1 }, -1, -1 ) - Shared Bank Bags: ( 2, { 0 .. 1 }, { 0 .. (maxsize - 1) }, -1 ) - - Trade: ( 3, { 0 .. 8 }, -1, -1 ) - (Trade Bags: 3031 - 3110 -- server values) - - World: ( 4, { 0 .. 10 }, -1, -1 ) - -*/ +#endif /*COMMON_ROF2_CONSTANTS_H*/ diff --git a/common/patches/rof_limits.cpp b/common/patches/rof_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/rof_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/rof_constants.h b/common/patches/rof_limits.h similarity index 77% rename from common/patches/rof_constants.h rename to common/patches/rof_limits.h index c75602da4..20f38b90c 100644 --- a/common/patches/rof_constants.h +++ b/common/patches/rof_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ROF_CONSTANTS_H_ -#define ROF_CONSTANTS_H_ +#ifndef COMMON_ROF_CONSTANTS_H +#define COMMON_ROF_CONSTANTS_H #include "../types.h" -namespace RoF { + +namespace RoF +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -193,29 +193,6 @@ namespace RoF { static const bool COIN_HAS_WEIGHT = false; } -}; //end namespace RoF +}; /*RoF*/ -#endif /*ROF_CONSTANTS_H_*/ - -/* -RoF Notes: - ** Structure-based inventory ** -ok Possessions: ( 0, { 0 .. 33 }, -1, -1 ) (Corpse: { 23 .. 56 } [Offset 23]) -ok [Equipment: ( 0, { 0 .. 22 }, -1, -1 )] -ok [General: ( 0, { 23 .. 32 }, -1, -1 )] -ok [Cursor: ( 0, 33, -1, -1 )] - General Bags: ( 0, { 23 .. 32 }, { 0 .. (maxsize - 1) }, -1 ) - Cursor Bags: ( 0, 33, { 0 .. (maxsize - 1) }, -1 ) - - Bank: ( 1, { 0 .. 23 }, -1, -1 ) - Bank Bags: ( 1, { 0 .. 23 }, { 0 .. (maxsize - 1)}, -1 ) - - Shared Bank: ( 2, { 0 .. 1 }, -1, -1 ) - Shared Bank Bags: ( 2, { 0 .. 1 }, { 0 .. (maxsize - 1) }, -1 ) - - Trade: ( 3, { 0 .. 8 }, -1, -1 ) - (Trade Bags: 3031 - 3110 -- server values) - - World: ( 4, { 0 .. 10 }, -1, -1 ) - -*/ +#endif /*COMMON_ROF_CONSTANTS_H*/ diff --git a/common/patches/sod_limits.cpp b/common/patches/sod_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/sod_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/uf_constants.h b/common/patches/sod_limits.h similarity index 79% rename from common/patches/uf_constants.h rename to common/patches/sod_limits.h index d254e66f6..83455d1e8 100644 --- a/common/patches/uf_constants.h +++ b/common/patches/sod_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef UF_CONSTANTS_H_ -#define UF_CONSTANTS_H_ +#ifndef COMMON_SOD_CONSTANTS_H +#define COMMON_SOD_CONSTANTS_H #include "../types.h" -namespace UF { + +namespace SoD +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -189,29 +189,6 @@ namespace UF { static const bool COIN_HAS_WEIGHT = false; } -}; //end namespace UF +}; /*SoD*/ -#endif /*UF_CONSTANTS_H_*/ - -/* -UF Notes: - ** Integer-based inventory ** -ok Possessions: 0 - 31 (Corpse: 23 - 54 [Offset 23]) -ok [Equipment: 0 - 22] -ok [General: 23 - 30] -ok [Cursor: 31] -ok General Bags: 262 - 341 -ok Cursor Bags: 342 - 351 - -ok Bank: 2000 - 2023 -ok Bank Bags: 2032 - 2271 - -ok Shared Bank: 2500 - 2501 -ok Shared Bank Bags: 2532 - 2551 - - Trade: 3000 - 3007 - (Trade Bags: 3031 - 3110 -- server values) - - World: 4000 - 4009 - -*/ +#endif /*COMMON_SOD_CONSTANTS_H*/ diff --git a/common/patches/sof_limits.cpp b/common/patches/sof_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/sof_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/sof_constants.h b/common/patches/sof_limits.h similarity index 78% rename from common/patches/sof_constants.h rename to common/patches/sof_limits.h index f556ac9d4..55e63db9b 100644 --- a/common/patches/sof_constants.h +++ b/common/patches/sof_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef SOF_CONSTANTS_H_ -#define SOF_CONSTANTS_H_ +#ifndef COMMON_SOF_CONSTANTS_H +#define COMMON_SOF_CONSTANTS_H #include "../types.h" -namespace SoF { + +namespace SoF +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -189,32 +189,6 @@ namespace SoF { static const bool COIN_HAS_WEIGHT = true; } -}; //end namespace SoF +}; /*SoF*/ -#endif /*SOF_CONSTANTS_H_*/ - -/* -SoF Notes: - ** Integer-based inventory ** -ok Possessions: 0 - 31 (Corpse: 23 - 54 [Offset 23]) -ok [Equipment: 0 - 22] -ok [General: 23 - 30] -ok [Cursor: 31] -ok General Bags: 262 - 341 -ok Cursor Bags: 342 - 351 - -ok Bank: 2000 - 2023 -ok Bank Bags: 2032 - 2271 - -ok Shared Bank: 2500 - 2501 -ok Shared Bank Bags: 2532 - 2551 - - Trade: 3000 - 3007 - (Trade Bags: 3031 - 3110 -- server values) - - World: 4000 - 4009 - -code file reviewed.. - ..SerializeItem() needs work - ..still needs timestamp redirect code -*/ +#endif /*COMMON_SOF_CONSTANTS_H*/ diff --git a/common/patches/template_constants.h b/common/patches/template_constants.h deleted file mode 100644 index f8dbc39e8..000000000 --- a/common/patches/template_constants.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef TEMPLATE_CONSTANTS_H_ -#define TEMPLATE_CONSTANTS_H_ - -namespace TEMPLATE { - - // put constants here and #include appropriately - -}; //end namespace TEMPLATE - -#endif /*TEMPLATE_CONSTANTS_H_*/ - - - - - - - - - - diff --git a/common/patches/template_limits.cpp b/common/patches/template_limits.cpp new file mode 100644 index 000000000..273e74a5c --- /dev/null +++ b/common/patches/template_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/template_limits.h b/common/patches/template_limits.h new file mode 100644 index 000000000..54690d3c1 --- /dev/null +++ b/common/patches/template_limits.h @@ -0,0 +1,31 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef COMMON_TEMPLATE_LIMITS_H +#define COMMON_TEMPLATE_LIMITS_H + + +namespace TEMPLATE +{ + + // put constants here and #include appropriately + +}; /* TEMPLATE */ + +#endif /*COMMON_TEMPLATE_LIMITS_H*/ diff --git a/common/patches/titanium_limits.cpp b/common/patches/titanium_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/titanium_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/titanium_constants.h b/common/patches/titanium_limits.h similarity index 79% rename from common/patches/titanium_constants.h rename to common/patches/titanium_limits.h index b0a7353fa..2eba35b70 100644 --- a/common/patches/titanium_constants.h +++ b/common/patches/titanium_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TITANIUM_CONSTANTS_H_ -#define TITANIUM_CONSTANTS_H_ +#ifndef COMMON_TITANIUM_CONSTANTS_H +#define COMMON_TITANIUM_CONSTANTS_H #include "../types.h" -namespace Titanium { + +namespace Titanium +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -188,29 +188,6 @@ namespace Titanium { static const bool COIN_HAS_WEIGHT = true; } -}; //end namespace Titanium +}; /*Titanium*/ -#endif /*TITANIUM_CONSTANTS_H_*/ - -/* -Titanium Notes: - ** Integer-based inventory ** -ok Possessions: 0 - 30 (Corpse: 22 - 52 [Offset 22]) -ok [Equipment: 0 - 21] -ok [General: 22 - 29] -ok [Cursor: 30] -ok General Bags: 251 - 330 -ok Cursor Bags: 331 - 340 - -ok Bank: 2000 - 2015 -ok Bank Bags: 2031 - 2190 - -ok Shared Bank: 2500 - 2501 -ok Shared Bank Bags: 2531 - 2550 - - Trade: 3000 - 3007 - (Trade Bags: 3031 - 3110 -- server values) - - World: 4000 - 4009 - -*/ +#endif /*COMMON_TITANIUM_CONSTANTS_H*/ diff --git a/common/patches/uf_limits.cpp b/common/patches/uf_limits.cpp new file mode 100644 index 000000000..3f4711d4d --- /dev/null +++ b/common/patches/uf_limits.cpp @@ -0,0 +1,18 @@ +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ diff --git a/common/patches/sod_constants.h b/common/patches/uf_limits.h similarity index 79% rename from common/patches/sod_constants.h rename to common/patches/uf_limits.h index 418525032..64880ee14 100644 --- a/common/patches/sod_constants.h +++ b/common/patches/uf_limits.h @@ -1,30 +1,30 @@ -/* -EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator + + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) -Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef SOD_CONSTANTS_H_ -#define SOD_CONSTANTS_H_ +#ifndef COMMON_UF_CONSTANTS_H +#define COMMON_UF_CONSTANTS_H #include "../types.h" -namespace SoD { + +namespace UF +{ namespace inventory { typedef enum : int16 { TypePossessions = 0, @@ -189,29 +189,6 @@ namespace SoD { static const bool COIN_HAS_WEIGHT = false; } -}; //end namespace SoD +}; /*UF*/ -#endif /*SOD_CONSTANTS_H_*/ - -/* -SoD Notes: - ** Integer-based inventory ** -ok Possessions: 0 - 31 (Corpse: 23 - 54 [Offset 23]) -ok [Equipment: 0 - 22] -ok [General: 23 - 30] -ok [Cursor: 31] -ok General Bags: 262 - 341 -ok Cursor Bags: 342 - 351 - -ok Bank: 2000 - 2023 -ok Bank Bags: 2032 - 2271 - -ok Shared Bank: 2500 - 2501 -ok Shared Bank Bags: 2532 - 2551 - - Trade: 3000 - 3007 - (Trade Bags: 3031 - 3110 -- server values) - - World: 4000 - 4009 - -*/ +#endif /*COMMON_UF_CONSTANTS_H*/