pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-04 00:02:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Client::zoning to Client::bZoning

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-01-17 21:23:22 -05:00
parent 462349ad84
commit aa1114c387
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/aggro.cpp
View File

@ -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 //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 //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->IsClient()) {
if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn() || mob->CastToClient()->zoning) if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn() || mob->CastToClient()->bZoning)
return false; return false;
} }

4
zone/client.cpp
View File

@ -215,7 +215,7 @@ Client::Client(EQStreamInterface* ieqs)
linkdead_timer.Disable(); linkdead_timer.Disable();
zonesummon_id = 0; zonesummon_id = 0;
zonesummon_ignorerestrictions = 0; zonesummon_ignorerestrictions = 0;
zoning = false; bZoning = false;
zone_mode = ZoneUnsolicited; zone_mode = ZoneUnsolicited;
casting_spell_id = 0; casting_spell_id = 0;
npcflag = false; npcflag = false;
@ -395,7 +395,7 @@ Client::~Client() {
GetTarget()->IsTargeted(-1); GetTarget()->IsTargeted(-1);
//if we are in a group and we are not zoning, force leave the group //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(); LeaveGroup();
UpdateWho(2); UpdateWho(2);

2
zone/client.h
View File

@ -1545,7 +1545,7 @@ private:
bool npcflag; bool npcflag;
uint8 npclevel; uint8 npclevel;
bool feigned; bool feigned;
bool zoning; bool bZoning;
bool tgb; bool tgb;
bool instalog; bool instalog;
int32 last_reported_mana; int32 last_reported_mana;

8
zone/client_process.cpp
View File

@ -655,17 +655,17 @@ bool Client::Process() {
{ {
//client logged out or errored out //client logged out or errored out
//ResetTrade(); //ResetTrade();
if (client_state != CLIENT_KICKED && !zoning && !instalog) { if (client_state != CLIENT_KICKED && !bZoning && !instalog) {
Save(); Save();
} }
client_state = CLIENT_LINKDEAD; client_state = CLIENT_LINKDEAD;
if (zoning || instalog || GetGM()) if (bZoning || instalog || GetGM())
{ {
Group *mygroup = GetGroup(); Group *mygroup = GetGroup();
if (mygroup) if (mygroup)
{ {
if (!zoning) if (!bZoning)
{ {
entity_list.MessageGroup(this, true, 15, "%s logged out.", GetName()); entity_list.MessageGroup(this, true, 15, "%s logged out.", GetName());
LeaveGroup(); LeaveGroup();
@ -684,7 +684,7 @@ bool Client::Process() {
Raid *myraid = entity_list.GetRaidByClient(this); Raid *myraid = entity_list.GetRaidByClient(this);
if (myraid) if (myraid)
{ {
if (!zoning) if (!bZoning)
{ {
//entity_list.MessageGroup(this,true,15,"%s logged out.",GetName()); //entity_list.MessageGroup(this,true,15,"%s logged out.",GetName());
myraid->MemberZoned(this); myraid->MemberZoned(this);

2
zone/zoning.cpp
View File

@ -42,7 +42,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
Bot::ProcessClientZoneChange(this); Bot::ProcessClientZoneChange(this);
#endif #endif
zoning = true; bZoning = true;
if (app->size != sizeof(ZoneChange_Struct)) { if (app->size != sizeof(ZoneChange_Struct)) {
Log(Logs::General, Logs::None, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct)); Log(Logs::General, Logs::None, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct));
return; return;