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

Few adjustments [skip ci[

Browse Source
This commit is contained in:
Akkadius 2020-04-18 19:46:19 -05:00
parent b8c44ee41b
commit 093509baa9
5 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/database_instances.cpp
View File

@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define strcasecmp _stricmp #define strcasecmp _stricmp
#else #else
#include "unix.h" #include "unix.h"
#include "../zone/zonedb.h"
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@ -319,10 +320,10 @@ uint16 Database::GetInstanceID(const char* zone, uint32 character_id, int16 vers
"AND instance_list.id = instance_list_player.id " "AND instance_list.id = instance_list_player.id "
"AND instance_list_player.charid = %u " "AND instance_list_player.charid = %u "
"LIMIT 1 ", "LIMIT 1 ",
GetZoneID(zone), content_db.GetZoneID(zone),
version, version,
character_id character_id
); );
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) if (!results.Success())

2
world/main.cpp
View File

@ -327,6 +327,8 @@ int main(int argc, char** argv) {
database.PurgeAllDeletedDataBuckets(); database.PurgeAllDeletedDataBuckets();
LogInfo("Loading zones"); LogInfo("Loading zones");
// Load to both context for now... this needs to be cleaned up
database.LoadZoneNames();
content_db.LoadZoneNames(); content_db.LoadZoneNames();
LogInfo("Clearing groups"); LogInfo("Clearing groups");
database.ClearGroup(); database.ClearGroup();

2
zone/client.cpp
View File

@ -9298,7 +9298,7 @@ void Client::SetBotOption(BotOwnerOption boo, bool flag) {
void Client::SendToGuildHall() void Client::SendToGuildHall()
{ {
std::string zone_short_name = "guildhall"; std::string zone_short_name = "guildhall";
uint32 zone_id = database.GetZoneID(zone_short_name.c_str()); uint32 zone_id = content_db.GetZoneID(zone_short_name.c_str());
if (zone_id == 0) { if (zone_id == 0) {
return; return;
} }

4
zone/command.cpp
View File

@ -1289,7 +1289,7 @@ void command_peqzone(Client *c, const Seperator *sep)
if (sep->IsNumber(1)) if (sep->IsNumber(1))
{ {
zoneid = atoi(sep->arg[1]); zoneid = atoi(sep->arg[1]);
destzone = database.GetPEQZone(zoneid, 0); destzone = content_db.GetPEQZone(zoneid, 0);
if(destzone == 0){ if(destzone == 0){
c->Message(Chat::Red, "You cannot use this command to enter that zone!"); c->Message(Chat::Red, "You cannot use this command to enter that zone!");
return; return;
@ -1307,7 +1307,7 @@ void command_peqzone(Client *c, const Seperator *sep)
} }
else { else {
zoneid = content_db.GetZoneID(sep->arg[1]); zoneid = content_db.GetZoneID(sep->arg[1]);
destzone = database.GetPEQZone(zoneid, 0); destzone = content_db.GetPEQZone(zoneid, 0);
if(zoneid == 0) { if(zoneid == 0) {
c->Message(Chat::White, "Unable to locate zone '%s'", sep->arg[1]); c->Message(Chat::White, "Unable to locate zone '%s'", sep->arg[1]);
return; return;