Pass through zone code to fix uninitialized pointer declarations

This commit is contained in:
Uleat
2017-03-23 04:35:36 -04:00
parent 8bdefa17b5
commit f77f996c3f
16 changed files with 114 additions and 114 deletions
+2 -2
View File
@@ -210,7 +210,7 @@ bool Client::Process() {
if (bardsong_timer.Check() && bardsong != 0) {
//NOTE: this is kinda a heavy-handed check to make sure the mob still exists before
//doing the next pulse on them...
Mob *song_target;
Mob *song_target = nullptr;
if(bardsong_target_id == GetID()) {
song_target = this;
} else {
@@ -838,7 +838,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
if (m_ClientVersionBit & EQEmu::versions::bit_RoFAndLater) { // RoF+ can send 200 items
numItemSlots = 200;
}
const EQEmu::ItemData *item;
const EQEmu::ItemData *item = nullptr;
std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
std::list<MerchantList>::const_iterator itr;
Mob* merch = entity_list.GetMobByNpcTypeID(npcid);