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

Migrate start_zones [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-11 03:58:30 -05:00
parent 3a09197d77
commit 262432f504
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/client.cpp
View File

@ -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.*/ /* 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){ if (!ValidStartZone){
return false; return false;

2
world/worlddb.cpp
View File

@ -202,7 +202,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o
p_character_select_entry_struct->Deity, p_character_select_entry_struct->Deity,
p_character_select_entry_struct->Race 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) { 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 a bind_id is specified, make them start there */
if (atoi(row_d[1]) != 0) { if (atoi(row_d[1]) != 0) {

4
zone/client_packet.cpp
View File

@ -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 " 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", "WHERE player_class=%i AND player_deity=%i AND player_race=%i",
m_pp.class_, m_pp.deity, m_pp.race); m_pp.class_, m_pp.deity, m_pp.race);
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogError("No valid start zones found for /setstartcity"); LogError("No valid start zones found for /setstartcity");
return; return;
@ -12405,7 +12405,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
query = StringFormat("SELECT zone_id, bind_id FROM start_zones " query = StringFormat("SELECT zone_id, bind_id FROM start_zones "
"WHERE player_class=%i AND player_deity=%i AND player_race=%i", "WHERE player_class=%i AND player_deity=%i AND player_race=%i",
m_pp.class_, m_pp.deity, m_pp.race); m_pp.class_, m_pp.deity, m_pp.race);
results = database.QueryDatabase(query); results = content_db.QueryDatabase(query);
if (!results.Success()) if (!results.Success())
return; return;