From 954b0c5106d187f064f51c13686dd378237236af Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 29 Jun 2020 00:55:53 -0500 Subject: [PATCH] Post merge fixes --- zone/questmgr.cpp | 8 ++++---- zone/zoning.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 01dab8a43..afd621790 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -417,7 +417,7 @@ void QuestManager::ZoneGroup(const char *zone_name) { ztz->response = 0; ztz->current_zone_id = zone->GetZoneID(); ztz->current_instance_id = zone->GetInstanceID(); - ztz->requested_zone_id = database.GetZoneID(zone_name); + ztz->requested_zone_id = ZoneID(zone_name); ztz->admin = initiator->Admin(); strcpy(ztz->name, initiator->GetName()); ztz->guild_id = initiator->GuildID(); @@ -434,7 +434,7 @@ void QuestManager::ZoneGroup(const char *zone_name) { ztz->response = 0; ztz->current_zone_id = zone->GetZoneID(); ztz->current_instance_id = zone->GetInstanceID(); - ztz->requested_zone_id = database.GetZoneID(zone_name); + ztz->requested_zone_id = ZoneID(zone_name); ztz->admin = group_member->Admin(); strcpy(ztz->name, group_member->GetName()); ztz->guild_id = group_member->GuildID(); @@ -456,7 +456,7 @@ void QuestManager::ZoneRaid(const char *zone_name) { ztz->response = 0; ztz->current_zone_id = zone->GetZoneID(); ztz->current_instance_id = zone->GetInstanceID(); - ztz->requested_zone_id = database.GetZoneID(zone_name); + ztz->requested_zone_id = ZoneID(zone_name); ztz->admin = initiator->Admin(); strcpy(ztz->name, initiator->GetName()); ztz->guild_id = initiator->GuildID(); @@ -473,7 +473,7 @@ void QuestManager::ZoneRaid(const char *zone_name) { ztz->response = 0; ztz->current_zone_id = zone->GetZoneID(); ztz->current_instance_id = zone->GetInstanceID(); - ztz->requested_zone_id = database.GetZoneID(zone_name); + ztz->requested_zone_id = ZoneID(zone_name); ztz->admin = raid_member->Admin(); strcpy(ztz->name, raid_member->GetName()); ztz->guild_id = raid_member->GuildID(); diff --git a/zone/zoning.cpp b/zone/zoning.cpp index d9b17925f..63b918744 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -452,7 +452,7 @@ void Client::MoveZone(const char *zone_short_name) { ztz->response = 0; ztz->current_zone_id = zone->GetZoneID(); ztz->current_instance_id = zone->GetInstanceID(); - ztz->requested_zone_id = database.GetZoneID(zone_short_name); + ztz->requested_zone_id = ZoneID(zone_short_name); ztz->admin = Admin(); strcpy(ztz->name, GetName()); ztz->guild_id = GuildID();