From 262432f504f2013aed2a625b046e836fe8d862d5 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Wed, 11 Mar 2020 03:58:30 -0500 Subject: [PATCH] Migrate start_zones [skip ci] --- world/client.cpp | 2 +- world/worlddb.cpp | 2 +- zone/client_packet.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/world/client.cpp b/world/client.cpp index 2d4b65e71..c33b3a8d1 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -1528,7 +1528,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) } } /* use normal starting zone logic to either get defaults, or if startzone was set, load that from the db table.*/ - bool ValidStartZone = database.GetStartZone(&pp, cc, m_ClientVersionBit & EQEmu::versions::maskTitaniumAndEarlier); + bool ValidStartZone = content_db.GetStartZone(&pp, cc, m_ClientVersionBit & EQEmu::versions::maskTitaniumAndEarlier); if (!ValidStartZone){ return false; diff --git a/world/worlddb.cpp b/world/worlddb.cpp index 57e911415..e1dbd0196 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -202,7 +202,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o p_character_select_entry_struct->Deity, p_character_select_entry_struct->Race ); - auto results_bind = database.QueryDatabase(character_list_query); + auto results_bind = content_db.QueryDatabase(character_list_query); for (auto row_d = results_bind.begin(); row_d != results_bind.end(); ++row_d) { /* If a bind_id is specified, make them start there */ if (atoi(row_d[1]) != 0) { diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 7d8664737..e5df21477 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -12374,7 +12374,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app) std::string query = StringFormat("SELECT zone_id, bind_id, x, y, z FROM start_zones " "WHERE player_class=%i AND player_deity=%i AND player_race=%i", m_pp.class_, m_pp.deity, m_pp.race); - auto results = database.QueryDatabase(query); + auto results = content_db.QueryDatabase(query); if (!results.Success()) { LogError("No valid start zones found for /setstartcity"); return; @@ -12405,7 +12405,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app) query = StringFormat("SELECT zone_id, bind_id FROM start_zones " "WHERE player_class=%i AND player_deity=%i AND player_race=%i", m_pp.class_, m_pp.deity, m_pp.race); - results = database.QueryDatabase(query); + results = content_db.QueryDatabase(query); if (!results.Success()) return;