From ccdc9f2e437815fadba8f59870ab856a397cd18f Mon Sep 17 00:00:00 2001 From: KimLS Date: Sat, 4 Apr 2026 15:48:43 -0700 Subject: [PATCH] fix dumb compile errors from my hand merge --- common/emu_versions.h | 3 +- common/eq_limits.cpp | 9 +- common/patches/steam_latest.cpp | 354 +------------------------ common/patches/steam_latest.h | 36 +++ common/patches/steam_latest_limits.cpp | 265 ++++++++++++++++++ common/patches/steam_latest_limits.h | 3 +- zone/client_packet.cpp | 3 - 7 files changed, 311 insertions(+), 362 deletions(-) diff --git a/common/emu_versions.h b/common/emu_versions.h index 20dedc7ff..48fb5c7e5 100644 --- a/common/emu_versions.h +++ b/common/emu_versions.h @@ -79,7 +79,7 @@ namespace EQ UF, RoF, RoF2, - SteamLatest + SteamLatest, NPC, NPCMerchant, Merc, @@ -227,7 +227,6 @@ namespace EQ maskHoT = 0x0001FFFF, maskVoA = 0x0003FFFF, maskRoF = 0x0007FFFF, - maskCotF = 0x000FFFFF maskCotF = 0x000FFFFF, maskTDS = 0x001FFFFF, maskTBM = 0x003FFFFF, diff --git a/common/eq_limits.cpp b/common/eq_limits.cpp index 97822777e..71023db0f 100644 --- a/common/eq_limits.cpp +++ b/common/eq_limits.cpp @@ -117,7 +117,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers SteamLatest::constants::EXPANSION_BIT, SteamLatest::constants::EXPANSIONS_MASK, SteamLatest::constants::CHARACTER_CREATION_LIMIT, - SteamLatest::constants::SAY_LINK_BODY_SIZE + SteamLatest::constants::SAY_LINK_BODY_SIZE, + SteamLatest::constants::MAX_BAZAAR_TRADERS ) }; @@ -396,7 +397,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers RoF2::invtype::VIEW_MOD_PC_SIZE, RoF2::invtype::VIEW_MOD_BANK_SIZE, RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, RoF2::invtype::VIEW_MOD_LIMBO_SIZE, RoF2::invtype::ALT_STORAGE_SIZE, RoF2::invtype::ARCHIVED_SIZE, RoF2::invtype::MAIL_SIZE, RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE, RoF2::invtype::KRONO_SIZE, - RoF2::invtype::OTHER_SIZE + RoF2::invtype::GUILD_BANK_MAIN_SIZE, RoF2::invtype::GUILD_BANK_DEPOSIT_SIZE, RoF2::invtype::OTHER_SIZE ), RoF2::invslot::EQUIPMENT_BITMASK, @@ -802,7 +803,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers RoF2::invtype::VIEW_MOD_PC_SIZE, RoF2::invtype::VIEW_MOD_BANK_SIZE, RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, RoF2::invtype::VIEW_MOD_LIMBO_SIZE, RoF2::INULL, RoF2::INULL, RoF2::INULL, RoF2::INULL, RoF2::INULL, - RoF2::INULL + RoF2::INULL, RoF2::INULL, RoF2::INULL ), RoF2::INULL, @@ -1283,7 +1284,7 @@ static const EQ::spells::LookupEntry spells_static_lookup_entries[EQ::versions:: RoF2::spells::NPC_BUFFS, RoF2::spells::PET_BUFFS, RoF2::spells::MERC_BUFFS - ) + ), /*[ClientVersion::SteamLatest] =*/ EQ::spells::LookupEntry( SteamLatest::spells::SPELL_ID_MAX, diff --git a/common/patches/steam_latest.cpp b/common/patches/steam_latest.cpp index e6ebb4d99..f7e209051 100644 --- a/common/patches/steam_latest.cpp +++ b/common/patches/steam_latest.cpp @@ -70,7 +70,7 @@ namespace SteamLatest //create our opcode manager if we havent already if (opcodes == nullptr) { - std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name); + std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name); //load up the opcode manager. //TODO: figure out how to support shared memory with multiple patches... @@ -109,7 +109,7 @@ namespace SteamLatest //we need to go to every stream and replace it's manager. if (opcodes != nullptr) { - std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name); + std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name); if (!opcodes->ReloadOpcodes(opfile.c_str())) { LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name); return; @@ -5397,354 +5397,4 @@ namespace SteamLatest return index; // as long as we guard against bad slots server side, we should be fine } } /*SteamLatest*/ -iff --git a/common/patches/steam_latest.h b/common/patches/steam_latest.h -ew file mode 100644 -ndex 000000000..f378e9e05 --- /dev/null -++ b/common/patches/steam_latest.h -@ -0,0 +1,55 @@ -/* 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_LAURION_H -#define COMMON_LAURION_H - -#include "../struct_strategy.h" - -class EQStreamIdentifier; - -namespace SteamLatest -{ - - //these are the only public member of this namespace. - extern void Register(EQStreamIdentifier& into); - extern void Reload(); - - - - //you should not directly access anything below.. - //I just dont feel like making a seperate header for it. - - class Strategy : public StructStrategy { - public: - Strategy(); - - protected: - - virtual std::string Describe() const; - virtual const EQ::versions::ClientVersion ClientVersion() const; - - //magic macro to declare our opcode processors -#include "ss_declare.h" -#include "steam_latest_ops.h" - }; - -}; /*SteamLatest*/ - -#endif /*COMMON_LAURION_H*/ -iff --git a/common/patches/steam_latest_limits.cpp b/common/patches/steam_latest_limits.cpp -ew file mode 100644 -ndex 000000000..9716d083b --- /dev/null -++ b/common/patches/steam_latest_limits.cpp -@ -0,0 +1,284 @@ -/* 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 -*/ - -#include "steam_latest_limits.h" - -#include "../strings.h" - - -int16 SteamLatest::invtype::GetInvTypeSize(int16 inv_type) -{ - switch (inv_type) { - case invtype::typePossessions: - return invtype::POSSESSIONS_SIZE; - case invtype::typeBank: - return invtype::BANK_SIZE; - case invtype::typeSharedBank: - return invtype::SHARED_BANK_SIZE; - case invtype::typeTrade: - return invtype::TRADE_SIZE; - case invtype::typeWorld: - return invtype::WORLD_SIZE; - case invtype::typeLimbo: - return invtype::LIMBO_SIZE; - case invtype::typeTribute: - return invtype::TRIBUTE_SIZE; - case invtype::typeTrophyTribute: - return invtype::TROPHY_TRIBUTE_SIZE; - case invtype::typeGuildTribute: - return invtype::GUILD_TRIBUTE_SIZE; - case invtype::typeMerchant: - return invtype::MERCHANT_SIZE; - case invtype::typeDeleted: - return invtype::DELETED_SIZE; - case invtype::typeCorpse: - return invtype::CORPSE_SIZE; - case invtype::typeBazaar: - return invtype::BAZAAR_SIZE; - case invtype::typeInspect: - return invtype::INSPECT_SIZE; - case invtype::typeRealEstate: - return invtype::REAL_ESTATE_SIZE; - case invtype::typeViewMODPC: - return invtype::VIEW_MOD_PC_SIZE; - case invtype::typeViewMODBank: - return invtype::VIEW_MOD_BANK_SIZE; - case invtype::typeViewMODSharedBank: - return invtype::VIEW_MOD_SHARED_BANK_SIZE; - case invtype::typeViewMODLimbo: - return invtype::VIEW_MOD_LIMBO_SIZE; - case invtype::typeAltStorage: - return invtype::ALT_STORAGE_SIZE; - case invtype::typeArchived: - return invtype::ARCHIVED_SIZE; - case invtype::typeMail: - return invtype::MAIL_SIZE; - case invtype::typeGuildTrophyTribute: - return invtype::GUILD_TROPHY_TRIBUTE_SIZE; - case invtype::typeKrono: - return invtype::KRONO_SIZE; - case invtype::typeOther: - return invtype::OTHER_SIZE; - default: - return INULL; - } -} - -const char* SteamLatest::invtype::GetInvTypeName(int16 inv_type) -{ - switch (inv_type) { - case invtype::TYPE_INVALID: - return "Invalid Type"; - case invtype::typePossessions: - return "Possessions"; - case invtype::typeBank: - return "Bank"; - case invtype::typeSharedBank: - return "Shared Bank"; - case invtype::typeTrade: - return "Trade"; - case invtype::typeWorld: - return "World"; - case invtype::typeLimbo: - return "Limbo"; - case invtype::typeTribute: - return "Tribute"; - case invtype::typeTrophyTribute: - return "Trophy Tribute"; - case invtype::typeGuildTribute: - return "Guild Tribute"; - case invtype::typeMerchant: - return "Merchant"; - case invtype::typeDeleted: - return "Deleted"; - case invtype::typeCorpse: - return "Corpse"; - case invtype::typeBazaar: - return "Bazaar"; - case invtype::typeInspect: - return "Inspect"; - case invtype::typeRealEstate: - return "Real Estate"; - case invtype::typeViewMODPC: - return "View MOD PC"; - case invtype::typeViewMODBank: - return "View MOD Bank"; - case invtype::typeViewMODSharedBank: - return "View MOD Shared Bank"; - case invtype::typeViewMODLimbo: - return "View MOD Limbo"; - case invtype::typeAltStorage: - return "Alt Storage"; - case invtype::typeArchived: - return "Archived"; - case invtype::typeMail: - return "Mail"; - case invtype::typeGuildTrophyTribute: - return "Guild Trophy Tribute"; - case invtype::typeKrono: - return "Krono"; - case invtype::typeOther: - return "Other"; - default: - return "Unknown Type"; - } -} - -bool SteamLatest::invtype::IsInvTypePersistent(int16 inv_type) -{ - switch (inv_type) { - case invtype::typePossessions: - case invtype::typeBank: - case invtype::typeSharedBank: - case invtype::typeTrade: - case invtype::typeWorld: - case invtype::typeLimbo: - case invtype::typeTribute: - case invtype::typeTrophyTribute: - case invtype::typeGuildTribute: - return true; - default: - return false; - } -} - -const char* SteamLatest::invslot::GetInvPossessionsSlotName(int16 inv_slot) -{ - switch (inv_slot) { - case invslot::SLOT_INVALID: - return "Invalid Slot"; - case invslot::slotCharm: - return "Charm"; - case invslot::slotEar1: - return "Ear 1"; - case invslot::slotHead: - return "Head"; - case invslot::slotFace: - return "Face"; - case invslot::slotEar2: - return "Ear 2"; - case invslot::slotNeck: - return "Neck"; - case invslot::slotShoulders: - return "Shoulders"; - case invslot::slotArms: - return "Arms"; - case invslot::slotBack: - return "Back"; - case invslot::slotWrist1: - return "Wrist 1"; - case invslot::slotWrist2: - return "Wrist 2"; - case invslot::slotRange: - return "Range"; - case invslot::slotHands: - return "Hands"; - case invslot::slotPrimary: - return "Primary"; - case invslot::slotSecondary: - return "Secondary"; - case invslot::slotFinger1: - return "Finger 1"; - case invslot::slotFinger2: - return "Finger 2"; - case invslot::slotChest: - return "Chest"; - case invslot::slotLegs: - return "Legs"; - case invslot::slotFeet: - return "Feet"; - case invslot::slotWaist: - return "Waist"; - case invslot::slotPowerSource: - return "Power Source"; - case invslot::slotAmmo: - return "Ammo"; - case invslot::slotGeneral1: - return "General 1"; - case invslot::slotGeneral2: - return "General 2"; - case invslot::slotGeneral3: - return "General 3"; - case invslot::slotGeneral4: - return "General 4"; - case invslot::slotGeneral5: - return "General 5"; - case invslot::slotGeneral6: - return "General 6"; - case invslot::slotGeneral7: - return "General 7"; - case invslot::slotGeneral8: - return "General 8"; - case invslot::slotGeneral9: - return "General 9"; - case invslot::slotGeneral10: - return "General 10"; - case invslot::slotCursor: - return "Cursor"; - default: - return "Unknown Slot"; - } -} - -const char* SteamLatest::invslot::GetInvSlotName(int16 inv_type, int16 inv_slot) -{ - if (inv_type == invtype::typePossessions) - return invslot::GetInvPossessionsSlotName(inv_slot); - - int16 type_size = invtype::GetInvTypeSize(inv_type); - - if (!type_size || inv_slot == invslot::SLOT_INVALID) - return "Invalid Slot"; - - if ((inv_slot + 1) >= type_size) - return "Unknown Slot"; - - static std::string ret_str; - ret_str = StringFormat("Slot %i", (inv_slot + 1)); - - return ret_str.c_str(); -} - -const char* SteamLatest::invbag::GetInvBagIndexName(int16 bag_index) -{ - if (bag_index == invbag::SLOT_INVALID) - return "Invalid Bag"; - - if (bag_index >= invbag::SLOT_COUNT) - return "Unknown Bag"; - - static std::string ret_str; - ret_str = StringFormat("Bag %i", (bag_index + 1)); - - return ret_str.c_str(); -} - -const char* SteamLatest::invaug::GetInvAugIndexName(int16 aug_index) -{ - if (aug_index == invaug::SOCKET_INVALID) - return "Invalid Augment"; - - if (aug_index >= invaug::SOCKET_COUNT) - return "Unknown Augment"; - - static std::string ret_str; - ret_str = StringFormat("Augment %i", (aug_index + 1)); - - return ret_str.c_str(); -} \ No newline at end of file diff --git a/common/patches/steam_latest.h b/common/patches/steam_latest.h index e69de29bb..90fec6bdb 100644 --- a/common/patches/steam_latest.h +++ b/common/patches/steam_latest.h @@ -0,0 +1,36 @@ +#ifndef COMMON_LAURION_H +#define COMMON_LAURION_H + +#include "../struct_strategy.h" + +class EQStreamIdentifier; + +namespace SteamLatest +{ + + //these are the only public member of this namespace. + extern void Register(EQStreamIdentifier& into); + extern void Reload(); + + + + //you should not directly access anything below.. + //I just dont feel like making a seperate header for it. + + class Strategy : public StructStrategy { + public: + Strategy(); + + protected: + + virtual std::string Describe() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; + + //magic macro to declare our opcode processors +#include "ss_declare.h" +#include "steam_latest_ops.h" + }; + +}; /*SteamLatest*/ + +#endif /*COMMON_LAURION_H*/ diff --git a/common/patches/steam_latest_limits.cpp b/common/patches/steam_latest_limits.cpp index e69de29bb..042aa5558 100644 --- a/common/patches/steam_latest_limits.cpp +++ b/common/patches/steam_latest_limits.cpp @@ -0,0 +1,265 @@ +#include "steam_latest_limits.h" + +#include "../strings.h" + + +int16 SteamLatest::invtype::GetInvTypeSize(int16 inv_type) +{ + switch (inv_type) { + case invtype::typePossessions: + return invtype::POSSESSIONS_SIZE; + case invtype::typeBank: + return invtype::BANK_SIZE; + case invtype::typeSharedBank: + return invtype::SHARED_BANK_SIZE; + case invtype::typeTrade: + return invtype::TRADE_SIZE; + case invtype::typeWorld: + return invtype::WORLD_SIZE; + case invtype::typeLimbo: + return invtype::LIMBO_SIZE; + case invtype::typeTribute: + return invtype::TRIBUTE_SIZE; + case invtype::typeTrophyTribute: + return invtype::TROPHY_TRIBUTE_SIZE; + case invtype::typeGuildTribute: + return invtype::GUILD_TRIBUTE_SIZE; + case invtype::typeMerchant: + return invtype::MERCHANT_SIZE; + case invtype::typeDeleted: + return invtype::DELETED_SIZE; + case invtype::typeCorpse: + return invtype::CORPSE_SIZE; + case invtype::typeBazaar: + return invtype::BAZAAR_SIZE; + case invtype::typeInspect: + return invtype::INSPECT_SIZE; + case invtype::typeRealEstate: + return invtype::REAL_ESTATE_SIZE; + case invtype::typeViewMODPC: + return invtype::VIEW_MOD_PC_SIZE; + case invtype::typeViewMODBank: + return invtype::VIEW_MOD_BANK_SIZE; + case invtype::typeViewMODSharedBank: + return invtype::VIEW_MOD_SHARED_BANK_SIZE; + case invtype::typeViewMODLimbo: + return invtype::VIEW_MOD_LIMBO_SIZE; + case invtype::typeAltStorage: + return invtype::ALT_STORAGE_SIZE; + case invtype::typeArchived: + return invtype::ARCHIVED_SIZE; + case invtype::typeMail: + return invtype::MAIL_SIZE; + case invtype::typeGuildTrophyTribute: + return invtype::GUILD_TROPHY_TRIBUTE_SIZE; + case invtype::typeKrono: + return invtype::KRONO_SIZE; + case invtype::typeOther: + return invtype::OTHER_SIZE; + default: + return INULL; + } +} + +const char* SteamLatest::invtype::GetInvTypeName(int16 inv_type) +{ + switch (inv_type) { + case invtype::TYPE_INVALID: + return "Invalid Type"; + case invtype::typePossessions: + return "Possessions"; + case invtype::typeBank: + return "Bank"; + case invtype::typeSharedBank: + return "Shared Bank"; + case invtype::typeTrade: + return "Trade"; + case invtype::typeWorld: + return "World"; + case invtype::typeLimbo: + return "Limbo"; + case invtype::typeTribute: + return "Tribute"; + case invtype::typeTrophyTribute: + return "Trophy Tribute"; + case invtype::typeGuildTribute: + return "Guild Tribute"; + case invtype::typeMerchant: + return "Merchant"; + case invtype::typeDeleted: + return "Deleted"; + case invtype::typeCorpse: + return "Corpse"; + case invtype::typeBazaar: + return "Bazaar"; + case invtype::typeInspect: + return "Inspect"; + case invtype::typeRealEstate: + return "Real Estate"; + case invtype::typeViewMODPC: + return "View MOD PC"; + case invtype::typeViewMODBank: + return "View MOD Bank"; + case invtype::typeViewMODSharedBank: + return "View MOD Shared Bank"; + case invtype::typeViewMODLimbo: + return "View MOD Limbo"; + case invtype::typeAltStorage: + return "Alt Storage"; + case invtype::typeArchived: + return "Archived"; + case invtype::typeMail: + return "Mail"; + case invtype::typeGuildTrophyTribute: + return "Guild Trophy Tribute"; + case invtype::typeKrono: + return "Krono"; + case invtype::typeOther: + return "Other"; + default: + return "Unknown Type"; + } +} + +bool SteamLatest::invtype::IsInvTypePersistent(int16 inv_type) +{ + switch (inv_type) { + case invtype::typePossessions: + case invtype::typeBank: + case invtype::typeSharedBank: + case invtype::typeTrade: + case invtype::typeWorld: + case invtype::typeLimbo: + case invtype::typeTribute: + case invtype::typeTrophyTribute: + case invtype::typeGuildTribute: + return true; + default: + return false; + } +} + +const char* SteamLatest::invslot::GetInvPossessionsSlotName(int16 inv_slot) +{ + switch (inv_slot) { + case invslot::SLOT_INVALID: + return "Invalid Slot"; + case invslot::slotCharm: + return "Charm"; + case invslot::slotEar1: + return "Ear 1"; + case invslot::slotHead: + return "Head"; + case invslot::slotFace: + return "Face"; + case invslot::slotEar2: + return "Ear 2"; + case invslot::slotNeck: + return "Neck"; + case invslot::slotShoulders: + return "Shoulders"; + case invslot::slotArms: + return "Arms"; + case invslot::slotBack: + return "Back"; + case invslot::slotWrist1: + return "Wrist 1"; + case invslot::slotWrist2: + return "Wrist 2"; + case invslot::slotRange: + return "Range"; + case invslot::slotHands: + return "Hands"; + case invslot::slotPrimary: + return "Primary"; + case invslot::slotSecondary: + return "Secondary"; + case invslot::slotFinger1: + return "Finger 1"; + case invslot::slotFinger2: + return "Finger 2"; + case invslot::slotChest: + return "Chest"; + case invslot::slotLegs: + return "Legs"; + case invslot::slotFeet: + return "Feet"; + case invslot::slotWaist: + return "Waist"; + case invslot::slotPowerSource: + return "Power Source"; + case invslot::slotAmmo: + return "Ammo"; + case invslot::slotGeneral1: + return "General 1"; + case invslot::slotGeneral2: + return "General 2"; + case invslot::slotGeneral3: + return "General 3"; + case invslot::slotGeneral4: + return "General 4"; + case invslot::slotGeneral5: + return "General 5"; + case invslot::slotGeneral6: + return "General 6"; + case invslot::slotGeneral7: + return "General 7"; + case invslot::slotGeneral8: + return "General 8"; + case invslot::slotGeneral9: + return "General 9"; + case invslot::slotGeneral10: + return "General 10"; + case invslot::slotCursor: + return "Cursor"; + default: + return "Unknown Slot"; + } +} + +const char* SteamLatest::invslot::GetInvSlotName(int16 inv_type, int16 inv_slot) +{ + if (inv_type == invtype::typePossessions) + return invslot::GetInvPossessionsSlotName(inv_slot); + + int16 type_size = invtype::GetInvTypeSize(inv_type); + + if (!type_size || inv_slot == invslot::SLOT_INVALID) + return "Invalid Slot"; + + if ((inv_slot + 1) >= type_size) + return "Unknown Slot"; + + static std::string ret_str; + ret_str = StringFormat("Slot %i", (inv_slot + 1)); + + return ret_str.c_str(); +} + +const char* SteamLatest::invbag::GetInvBagIndexName(int16 bag_index) +{ + if (bag_index == invbag::SLOT_INVALID) + return "Invalid Bag"; + + if (bag_index >= invbag::SLOT_COUNT) + return "Unknown Bag"; + + static std::string ret_str; + ret_str = StringFormat("Bag %i", (bag_index + 1)); + + return ret_str.c_str(); +} + +const char* SteamLatest::invaug::GetInvAugIndexName(int16 aug_index) +{ + if (aug_index == invaug::SOCKET_INVALID) + return "Invalid Augment"; + + if (aug_index >= invaug::SOCKET_COUNT) + return "Unknown Augment"; + + static std::string ret_str; + ret_str = StringFormat("Augment %i", (aug_index + 1)); + + return ret_str.c_str(); +} diff --git a/common/patches/steam_latest_limits.h b/common/patches/steam_latest_limits.h index eb2a2dd62..e980880d4 100644 --- a/common/patches/steam_latest_limits.h +++ b/common/patches/steam_latest_limits.h @@ -277,6 +277,7 @@ namespace SteamLatest const size_t SAY_LINK_BODY_SIZE = 56; const uint32 MAX_GUILD_ID = 50000; + const uint32 MAX_BAZAAR_TRADERS = 600; } /*constants*/ @@ -333,4 +334,4 @@ namespace SteamLatest }; /* SteamLatest */ -#endif /*COMMON_LAURION_LIMITS_H*/ \ No newline at end of file +#endif /*COMMON_LAURION_LIMITS_H*/ diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 59fe844f0..13a3a4840 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1238,9 +1238,6 @@ void Client::Handle_Connect_OP_WorldObjectsSent(const EQApplicationPacket *app) void Client::Handle_Connect_OP_ZoneComplete(const EQApplicationPacket *app) { - auto outapp = new EQApplicationPacket(OP_0x0347, 0); - QueuePacket(outapp); - safe_delete(outapp); return; }