pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-09 11:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated nullptr to be id 0 instead

Browse Source
This commit is contained in:
xjeris 2026-04-20 12:39:19 -04:00
parent 1a7737cce6
commit 3ec3884197
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ruletypes.h
View File

@ -255,7 +255,7 @@ RULE_BOOL(Mercs, AllowMercSuspendInCombat, true, "Allow merc suspend in combat")
RULE_BOOL(Mercs, MercsIgnoreLevelBasedHasteCaps, false, "Ignores hard coded level based haste caps.") RULE_BOOL(Mercs, MercsIgnoreLevelBasedHasteCaps, false, "Ignores hard coded level based haste caps.")
RULE_INT(Mercs, MercsHasteCap, 100, "Haste cap for non-v3(over haste) haste") RULE_INT(Mercs, MercsHasteCap, 100, "Haste cap for non-v3(over haste) haste")
RULE_INT(Mercs, MercsHastev3Cap, 25, "Haste cap for v3(over haste) haste") RULE_INT(Mercs, MercsHastev3Cap, 25, "Haste cap for v3(over haste) haste")
RULE_INT(Mercs, MaxMercSlots, 6, "Maximum number of mercenary slots per character (max 6)") RULE_INT(Mercs, MaxMercSlots, 6, "Maximum number of mercenary slots per character (max = MAXMERCS)")
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY(Guild) RULE_CATEGORY(Guild)

2
zone/client.cpp
View File

@ -7950,7 +7950,7 @@ void Client::SendMercPersonalInfo()
return; return;
} }
uint32 packetSize = sizeof(MercenaryDataUpdate_Struct) + (mercCount * sizeof(MercenaryData_Struct)); uint32 packetSize = sizeof(MercenaryDataUpdate_Struct);
auto outapp = new EQApplicationPacket(OP_MercenaryDataUpdate, packetSize); auto outapp = new EQApplicationPacket(OP_MercenaryDataUpdate, packetSize);
memset(outapp->pBuffer, 0, packetSize); memset(outapp->pBuffer, 0, packetSize);
auto mdus = (MercenaryDataUpdate_Struct *) outapp->pBuffer; auto mdus = (MercenaryDataUpdate_Struct *) outapp->pBuffer;

3
zone/client_packet.cpp
View File

@ -10689,7 +10689,8 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
Merc* current_merc = GetMerc(); Merc* current_merc = GetMerc();
if (current_merc) { if (current_merc) {
current_merc->Suspend(); current_merc->Suspend();
SetMerc(nullptr); current_merc->SetOwnerID(0);
SetMercID(0);
} }
// Select a free slot for the new hire // Select a free slot for the new hire