From 16642b7c4c0b2d7f4e8f533043d3894f1721e73f Mon Sep 17 00:00:00 2001 From: Uleat Date: Sat, 15 Oct 2016 22:14:03 -0400 Subject: [PATCH] Filename changes to facilitate future updates --- changelog.txt | 3 +++ common/CMakeLists.txt | 26 ++++++------------------- common/extprofile.h | 2 +- common/{item_base.cpp => item_data.cpp} | 2 +- common/{item_base.h => item_data.h} | 0 common/{item.cpp => item_instance.cpp} | 2 +- common/{item.h => item_instance.h} | 2 +- common/patches/rof.cpp | 2 +- common/patches/rof2.cpp | 2 +- common/patches/sod.cpp | 2 +- common/patches/sof.cpp | 2 +- common/patches/titanium.cpp | 2 +- common/patches/uf.cpp | 2 +- common/say_link.cpp | 4 ++-- common/shareddb.cpp | 2 +- shared_memory/items.cpp | 2 +- world/client.cpp | 2 +- world/worlddb.cpp | 2 +- zone/bonuses.cpp | 2 +- zone/client.h | 4 ++-- zone/npc.cpp | 4 ++-- zone/perl_questitem.cpp | 2 +- zone/spell_effects.cpp | 2 +- zone/spells.cpp | 2 +- zone/zonedb.cpp | 2 +- zone/zonedump.h | 2 +- 26 files changed, 35 insertions(+), 46 deletions(-) rename common/{item_base.cpp => item_data.cpp} (99%) rename common/{item_base.h => item_data.h} (100%) rename common/{item.cpp => item_instance.cpp} (99%) rename common/{item.h => item_instance.h} (99%) diff --git a/changelog.txt b/changelog.txt index 73be04468..c211d6066 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 10/15/2016 == +Uleat: Changed filenames to facilitate future inventory naming conventions + == 09/12/2016 == Akkadius: Massive overhaul of the update system and EQEmu Server management utility framework (known as eqemu_update.pl) now known as eqemu_server.pl diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 3ed2862ce..2138c5c9e 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -35,9 +35,10 @@ SET(common_sources faction.cpp guild_base.cpp guilds.cpp +# inventory_slot.cpp ipc_mutex.cpp - item.cpp - item_base.cpp + item_data.cpp + item_instance.cpp light_source.cpp md5.cpp memory_buffer.cpp @@ -155,10 +156,11 @@ SET(common_headers global_define.h guild_base.h guilds.h +# inventory_slot.h ipc_mutex.h - item.h - item_base.h + item_data.h item_fieldlist.h + item_instance.h languages.h light_source.h linked_list.h @@ -212,37 +214,29 @@ SET(common_headers zone_numbers.h patches/patches.h patches/sod.h -# patches/sod_itemfields.h patches/sod_limits.h patches/sod_ops.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_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_structs.h patches/rof2.h -# patches/rof2_itemfields.h patches/rof2_limits.h patches/rof2_ops.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_structs.h patches/uf.h -# patches/uf_itemfields.h patches/uf_limits.h patches/uf_ops.h patches/uf_structs.h @@ -266,37 +260,29 @@ SET(common_headers SOURCE_GROUP(Patches FILES patches/patches.h patches/sod.h -# patches/sod_itemfields.h patches/sod_limits.h patches/sod_ops.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_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_structs.h patches/rof2.h -# patches/rof2_itemfields.h patches/rof2_limits.h patches/rof2_ops.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_structs.h patches/uf.h -# patches/uf_itemfields.h patches/uf_limits.h patches/uf_ops.h patches/uf_structs.h diff --git a/common/extprofile.h b/common/extprofile.h index e53480631..72cc987b2 100644 --- a/common/extprofile.h +++ b/common/extprofile.h @@ -19,7 +19,7 @@ #define EXTENDED_PROFILE_H #include "eq_packet_structs.h" -#include "item.h" +#include "item_instance.h" #pragma pack(1) diff --git a/common/item_base.cpp b/common/item_data.cpp similarity index 99% rename from common/item_base.cpp rename to common/item_data.cpp index c2cef6918..fd40c2b7f 100644 --- a/common/item_base.cpp +++ b/common/item_data.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "item_base.h" +#include "item_data.h" #include "classes.h" #include "races.h" //#include "deity.h" diff --git a/common/item_base.h b/common/item_data.h similarity index 100% rename from common/item_base.h rename to common/item_data.h diff --git a/common/item.cpp b/common/item_instance.cpp similarity index 99% rename from common/item.cpp rename to common/item_instance.cpp index 61e7f926a..c8a75d0a7 100644 --- a/common/item.cpp +++ b/common/item_instance.cpp @@ -18,7 +18,7 @@ #include "classes.h" #include "global_define.h" -#include "item.h" +#include "item_instance.h" #include "races.h" #include "rulesys.h" #include "shareddb.h" diff --git a/common/item.h b/common/item_instance.h similarity index 99% rename from common/item.h rename to common/item_instance.h index f20b41fac..3ea3ba224 100644 --- a/common/item.h +++ b/common/item_instance.h @@ -29,7 +29,7 @@ class ItemParse; // Parses item packets class EvolveInfo; // Stores information about an evolving item family #include "../common/eq_constants.h" -#include "../common/item_base.h" +#include "../common/item_data.h" #include "../common/timer.h" #include "../common/bodytypes.h" #include "../common/deity.h" diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 8ab38905f..dba092bed 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "rof_structs.h" #include "../rulesys.h" diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index aedd7b592..609fdc123 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "rof2_structs.h" #include "../rulesys.h" diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index c1d573020..3b02cbbcb 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "sod_structs.h" #include "../rulesys.h" diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index bfad8d296..0d1afa000 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "sof_structs.h" #include "../rulesys.h" diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 72b492eeb..63feea81f 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -30,7 +30,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "titanium_structs.h" #include diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index ba5bf7622..0436f5af4 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" #include "../string_util.h" -#include "../item.h" +#include "../item_instance.h" #include "uf_structs.h" #include "../rulesys.h" diff --git a/common/say_link.cpp b/common/say_link.cpp index 3c9fe7c6e..2a4065403 100644 --- a/common/say_link.cpp +++ b/common/say_link.cpp @@ -21,8 +21,8 @@ #include "emu_constants.h" #include "string_util.h" -#include "item.h" -#include "item_base.h" +#include "item_instance.h" +#include "item_data.h" #include "../zone/zonedb.h" diff --git a/common/shareddb.cpp b/common/shareddb.cpp index fd89831c0..8e55269e7 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -29,7 +29,7 @@ #include "faction.h" #include "features.h" #include "ipc_mutex.h" -#include "item.h" +#include "item_instance.h" #include "loottable.h" #include "memory_mapped_file.h" #include "mysql.h" diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp index e4c938af2..b58382420 100644 --- a/shared_memory/items.cpp +++ b/shared_memory/items.cpp @@ -22,7 +22,7 @@ #include "../common/ipc_mutex.h" #include "../common/memory_mapped_file.h" #include "../common/eqemu_exception.h" -#include "../common/item_base.h" +#include "../common/item_data.h" void LoadItems(SharedDatabase *database, const std::string &prefix) { EQEmu::IPCMutex mutex("items"); diff --git a/world/client.cpp b/world/client.cpp index 8d036827c..ff3c0ce9a 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -25,7 +25,7 @@ #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" #include "../common/eq_stream_intf.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/races.h" #include "../common/classes.h" #include "../common/languages.h" diff --git a/world/worlddb.cpp b/world/worlddb.cpp index 8d65f7a78..def22adf4 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -20,7 +20,7 @@ //#include "../common/item.h" #include "../common/string_util.h" #include "../common/eq_packet_structs.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/rulesys.h" #include #include diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index 1a49aaf66..a898e02ec 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -17,7 +17,7 @@ */ #include "../common/classes.h" #include "../common/global_define.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" diff --git a/zone/client.h b/zone/client.h index da2188fc7..75ce82bf5 100644 --- a/zone/client.h +++ b/zone/client.h @@ -45,9 +45,9 @@ namespace EQEmu #include "../common/extprofile.h" #include "../common/races.h" #include "../common/seperator.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/guilds.h" -#include "../common/item_base.h" +#include "../common/item_data.h" #include "common.h" #include "merc.h" diff --git a/zone/npc.cpp b/zone/npc.cpp index ecc3bf101..d958ff598 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -26,8 +26,8 @@ #include "../common/string_util.h" #include "../common/emu_versions.h" #include "../common/features.h" -#include "../common/item.h" -#include "../common/item_base.h" +#include "../common/item_instance.h" +#include "../common/item_data.h" #include "../common/linked_list.h" #include "../common/servertalk.h" #include "../common/say_link.h" diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index fa186a9b5..053748e97 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -26,7 +26,7 @@ #undef seed #endif -#include "../common/item.h" +#include "../common/item_instance.h" #ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 8f66345d2..564a9756a 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -20,7 +20,7 @@ #include "../common/bodytypes.h" #include "../common/classes.h" #include "../common/global_define.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" diff --git a/zone/spells.cpp b/zone/spells.cpp index c818c8e90..a7e37048e 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -70,7 +70,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/classes.h" #include "../common/global_define.h" #include "../common/eqemu_logsys.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 7f86f5110..bf9452c4e 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -1,7 +1,7 @@ #include "../common/eqemu_logsys.h" #include "../common/extprofile.h" -#include "../common/item.h" +#include "../common/item_instance.h" #include "../common/rulesys.h" #include "../common/string_util.h" diff --git a/zone/zonedump.h b/zone/zonedump.h index 6782881fe..20412ed70 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -28,7 +28,7 @@ spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob, #define ZONEDUMP_H #include "../common/faction.h" #include "../common/eq_packet_structs.h" -#include "../common/item.h" +#include "../common/item_instance.h" #pragma pack(1)