pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 10:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Commands] Cleanup #zheader Command. (#1814)

Browse Source 
* [Commands] Cleanup #zheader Command.
- Cleanup message and logic.
- Add parameter to allow versions to be loaded.
- Cleanup parameter name in CFG methods from instance_id to instance_version.

* Update zonedb.cpp
This commit is contained in:
Kinglykrab
2021-11-23 05:49:11 -05:00
committed by GitHub
parent ef06a0d0b6
commit 2cbcefd9a0
6 changed files with 91 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone.cpp
+4 -4
View File
@@ -1262,7 +1262,7 @@ void Zone::ReloadStaticData() {
LogInfo("Zone Static Data Reloaded");
}
bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
bool Zone::LoadZoneCFG(const char* filename, uint16 instance_version)
{
memset(&newzone_data, 0, sizeof(NewZone_Struct));
@@ -1270,7 +1270,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
if (!content_db.GetZoneCFG(
ZoneID(filename),
instance_id,
instance_version,
&newzone_data,
can_bind,
can_combat,
@@ -1285,7 +1285,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
&map_name
)) {
// If loading a non-zero instance failed, try loading the default
if (instance_id != 0) {
if (instance_version != 0) {
safe_delete_array(map_name);
if (!content_db.GetZoneCFG(
ZoneID(filename),
@@ -1319,7 +1319,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
GetShortName(),
GetLongName(),
GetInstanceVersion(),
instance_id
instance_version
);
return true;