diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 340493578..cc70f1a4c 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -253,7 +253,7 @@ bool Mob::CheckWillAggro(Mob *mob) { //sometimes if a client has some lag while zoning into a dangerous place while either invis or a GM //they will aggro mobs even though it's supposed to be impossible, to lets make sure we've finished connecting if (mob->IsClient()) { - if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn() || mob->CastToClient()->zoning) + if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn() || mob->CastToClient()->bZoning) return false; } diff --git a/zone/client.cpp b/zone/client.cpp index 319752e36..844188edb 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -215,7 +215,7 @@ Client::Client(EQStreamInterface* ieqs) linkdead_timer.Disable(); zonesummon_id = 0; zonesummon_ignorerestrictions = 0; - zoning = false; + bZoning = false; zone_mode = ZoneUnsolicited; casting_spell_id = 0; npcflag = false; @@ -395,7 +395,7 @@ Client::~Client() { GetTarget()->IsTargeted(-1); //if we are in a group and we are not zoning, force leave the group - if(isgrouped && !zoning && is_zone_loaded) + if(isgrouped && !bZoning && is_zone_loaded) LeaveGroup(); UpdateWho(2); diff --git a/zone/client.h b/zone/client.h index 77a76fc18..0c69bbadb 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1545,7 +1545,7 @@ private: bool npcflag; uint8 npclevel; bool feigned; - bool zoning; + bool bZoning; bool tgb; bool instalog; int32 last_reported_mana; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 804bc32ca..ef7469aae 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -655,17 +655,17 @@ bool Client::Process() { { //client logged out or errored out //ResetTrade(); - if (client_state != CLIENT_KICKED && !zoning && !instalog) { + if (client_state != CLIENT_KICKED && !bZoning && !instalog) { Save(); } client_state = CLIENT_LINKDEAD; - if (zoning || instalog || GetGM()) + if (bZoning || instalog || GetGM()) { Group *mygroup = GetGroup(); if (mygroup) { - if (!zoning) + if (!bZoning) { entity_list.MessageGroup(this, true, 15, "%s logged out.", GetName()); LeaveGroup(); @@ -684,7 +684,7 @@ bool Client::Process() { Raid *myraid = entity_list.GetRaidByClient(this); if (myraid) { - if (!zoning) + if (!bZoning) { //entity_list.MessageGroup(this,true,15,"%s logged out.",GetName()); myraid->MemberZoned(this); diff --git a/zone/zoning.cpp b/zone/zoning.cpp index c7be0a37e..ed92e3ca1 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -42,7 +42,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { Bot::ProcessClientZoneChange(this); #endif - zoning = true; + bZoning = true; if (app->size != sizeof(ZoneChange_Struct)) { Log(Logs::General, Logs::None, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct)); return;