diff --git a/zone/client.cpp b/zone/client.cpp index 0d510f239..3c40d506c 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -241,7 +241,6 @@ Client::Client(EQStreamInterface *ieqs) : Mob( runmode = false; linkdead_timer.Disable(); zonesummon_id = 0; - zonesummon_instance_id = 0; zonesummon_ignorerestrictions = 0; bZoning = false; m_lock_save_position = false; diff --git a/zone/client.h b/zone/client.h index cd6b1d6e9..f54680728 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1980,7 +1980,6 @@ private: glm::vec4 m_ZoneSummonLocation; uint16 zonesummon_id; - uint8 zonesummon_instance_id; uint8 zonesummon_ignorerestrictions; ZoneMode zone_mode; diff --git a/zone/zoning.cpp b/zone/zoning.cpp index ef7256cc5..7b3f70962 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -94,7 +94,6 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { case GMHiddenSummon: case ZoneSolicited: //we told the client to zone somewhere, so we know where they are going. target_zone_id = zonesummon_id; - target_instance_id = zonesummon_instance_id; break; case GateToBindPoint: case ZoneToBindPoint: @@ -127,7 +126,6 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { // WildcardX 27 January 2008 if (zone_mode == EvacToSafeCoords && zonesummon_id) { target_zone_id = zonesummon_id; - target_instance_id = zonesummon_instance_id; } else { target_zone_id = zc->zoneID; } @@ -575,7 +573,6 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc zone_mode = ZoneUnsolicited; m_ZoneSummonLocation = glm::vec4(); zonesummon_id = 0; - zonesummon_instance_id = 0; zonesummon_ignorerestrictions = 0; // this simply resets the zone shutdown timer @@ -962,7 +959,6 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z // we hide the real zoneid we want to evac/succor to here zonesummon_id = zoneID; - zonesummon_instance_id = instance_id; outapp->priority = 6; FastQueuePacket(&outapp);