pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate getZoneX calls and npc types calls [skip ci]

Browse Source
This commit is contained in:
Akkadius
2020-03-12 02:27:09 -05:00
parent b22d8f6148
commit ca49f3902f
25 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/console.cpp
+6 -6
View File
@@ -541,7 +541,7 @@ void ConsoleZoneShutdown(
s->ZoneServerID = atoi(args[0].c_str());
}
else {
s->zoneid = database.GetZoneID(args[0].c_str());
s->zoneid = content_db.GetZoneID(args[0].c_str());
}
ZoneServer *zs = 0;
@@ -549,7 +549,7 @@ void ConsoleZoneShutdown(
zs = zoneserver_list.FindByID(s->ZoneServerID);
}
else if (s->zoneid != 0) {
zs = zoneserver_list.FindByName(database.GetZoneName(s->zoneid));
zs = zoneserver_list.FindByName(content_db.GetZoneName(s->zoneid));
}
else {
connection->SendLine("Error: ZoneShutdown: neither ID nor name specified");
@@ -633,10 +633,10 @@ void ConsoleZoneLock(
return;
}
uint16 tmp = database.GetZoneID(args[1].c_str());
uint16 tmp = content_db.GetZoneID(args[1].c_str());
if (tmp) {
if (zoneserver_list.SetLockedZone(tmp, true)) {
zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone locked: %s", database.GetZoneName(tmp));
zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone locked: %s", content_db.GetZoneName(tmp));
}
else {
connection->SendLine("Failed to change lock");
@@ -651,10 +651,10 @@ void ConsoleZoneLock(
return;
}
uint16 tmp = database.GetZoneID(args[1].c_str());
uint16 tmp = content_db.GetZoneID(args[1].c_str());
if (tmp) {
if (zoneserver_list.SetLockedZone(tmp, false)) {
zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone unlocked: %s", database.GetZoneName(tmp));
zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone unlocked: %s", content_db.GetZoneName(tmp));
}
else {
connection->SendLine("Failed to change lock");