From 63a8d2d641084b7c208fd0670efab569c5ab1525 Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:06:40 -0400 Subject: [PATCH] [Cleanup] Delete zone_numbers.h (#3129) * [Cleanup] Delete zone_numbers.h # Notes - This is unused. * Update client_packet.cpp * Update client_packet.cpp --- common/CMakeLists.txt | 1 - common/zone_numbers.h | 490 ----------------------------------------- world/worlddb.h | 1 - zone/client_packet.cpp | 3 +- 4 files changed, 1 insertion(+), 494 deletions(-) delete mode 100644 common/zone_numbers.h diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 0f9fe6aa6..b6e9ec89d 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -608,7 +608,6 @@ SET(common_headers unix.h useperl.h version.h - zone_numbers.h zone_store.h event/event_loop.h event/task.h diff --git a/common/zone_numbers.h b/common/zone_numbers.h deleted file mode 100644 index 466ffc493..000000000 --- a/common/zone_numbers.h +++ /dev/null @@ -1,490 +0,0 @@ -#include "../common/types.h" - -inline const char* StaticGetZoneName(uint32 zoneID) { - // @merth: I did the following query to retrieve these (following by a simple find/replace) - // select concat('case ', zoneidnumber), concat(short_name, '";') from zone order by zoneidnumber; - switch (zoneID) { - case 1: return "qeynos"; - case 2: return "qeynos2"; - case 3: return "qrg"; - case 4: return "qeytoqrg"; - case 5: return "highpass"; - case 6: return "highkeep"; - case 8: return "freportn"; - case 9: return "freportw"; - case 10: return "freporte"; - case 11: return "runnyeye"; - case 12: return "qey2hh1"; - case 13: return "northkarana"; - case 14: return "southkarana"; - case 15: return "eastkarana"; - case 16: return "beholder"; - case 17: return "blackburrow"; - case 18: return "paw"; - case 19: return "rivervale"; - case 20: return "kithicor"; - case 21: return "commons"; - case 22: return "ecommons"; - case 23: return "erudnint"; - case 24: return "erudnext"; - case 25: return "nektulos"; - case 26: return "cshome"; - case 27: return "lavastorm"; - case 28: return "nektropos"; - case 29: return "halas"; - case 30: return "everfrost"; - case 31: return "soldunga"; - case 32: return "soldungb"; - case 33: return "misty"; - case 34: return "nro"; - case 35: return "sro"; - case 36: return "befallen"; - case 37: return "oasis"; - case 38: return "tox"; - case 39: return "hole"; - case 40: return "neriaka"; - case 41: return "neriakb"; - case 42: return "neriakc"; - case 43: return "neriakd"; - case 44: return "najena"; - case 45: return "qcat"; - case 46: return "innothule"; - case 47: return "feerrott"; - case 48: return "cazicthule"; - case 49: return "oggok"; - case 50: return "rathemtn"; - case 51: return "lakerathe"; - case 52: return "grobb"; - case 53: return "aviak"; - case 54: return "gfaydark"; - case 55: return "akanon"; - case 56: return "steamfont"; - case 57: return "lfaydark"; - case 58: return "crushbone"; - case 59: return "mistmoore"; - case 60: return "kaladima"; - case 61: return "felwithea"; - case 62: return "felwitheb"; - case 63: return "unrest"; - case 64: return "kedge"; - case 65: return "guktop"; - case 66: return "gukbottom"; - case 67: return "kaladimb"; - case 68: return "butcher"; - case 69: return "oot"; - case 70: return "cauldron"; - case 71: return "airplane"; - case 72: return "fearplane"; - case 73: return "permafrost"; - case 74: return "kerraridge"; - case 75: return "paineel"; - case 76: return "hateplane"; - case 77: return "arena"; - case 78: return "fieldofbone"; - case 79: return "warslikswood"; - case 80: return "soltemple"; - case 81: return "droga"; - case 82: return "cabwest"; - case 83: return "swampofnohope"; - case 84: return "firiona"; - case 85: return "lakeofillomen"; - case 86: return "dreadlands"; - case 87: return "burningwood"; - case 88: return "kaesora"; - case 89: return "sebilis"; - case 90: return "citymist"; - case 91: return "skyfire"; - case 92: return "frontiermtns"; - case 93: return "overthere"; - case 94: return "emeraldjungle"; - case 95: return "trakanon"; - case 96: return "timorous"; - case 97: return "kurn"; - case 98: return "erudsxing"; - case 100: return "stonebrunt"; - case 101: return "warrens"; - case 102: return "karnor"; - case 103: return "chardok"; - case 104: return "dalnir"; - case 105: return "charasis"; - case 106: return "cabeast"; - case 107: return "nurga"; - case 108: return "veeshan"; - case 109: return "veksar"; - case 110: return "iceclad"; - case 111: return "frozenshadow"; - case 112: return "velketor"; - case 113: return "kael"; - case 114: return "skyshrine"; - case 115: return "thurgadina"; - case 116: return "eastwastes"; - case 117: return "cobaltscar"; - case 118: return "greatdivide"; - case 119: return "wakening"; - case 120: return "westwastes"; - case 121: return "crystal"; - case 123: return "necropolis"; - case 124: return "templeveeshan"; - case 125: return "sirens"; - case 126: return "mischiefplane"; - case 127: return "growthplane"; - case 128: return "sleeper"; - case 129: return "thurgadinb"; - case 130: return "erudsxing2"; - case 150: return "shadowhaven"; - case 151: return "bazaar"; - case 152: return "nexus"; - case 153: return "echo"; - case 154: return "acrylia"; - case 155: return "sharvahl"; - case 156: return "paludal"; - case 157: return "fungusgrove"; - case 158: return "vexthal"; - case 159: return "sseru"; - case 160: return "katta"; - case 161: return "netherbian"; - case 162: return "ssratemple"; - case 163: return "griegsend"; - case 164: return "thedeep"; - case 165: return "shadeweaver"; - case 166: return "hollowshade"; - case 167: return "grimling"; - case 168: return "mseru"; - case 169: return "letalis"; - case 170: return "twilight"; - case 171: return "thegrey"; - case 172: return "tenebrous"; - case 173: return "maiden"; - case 174: return "dawnshroud"; - case 175: return "scarlet"; - case 176: return "umbral"; - case 179: return "akheva"; - case 180: return "arena2"; - case 181: return "jaggedpine"; - case 182: return "nedaria"; - case 183: return "tutorial"; - case 184: return "load"; - case 185: return "load2"; - case 186: return "hateplaneb"; - case 187: return "shadowrest"; - case 188: return "tutoriala"; - case 189: return "tutorialb"; - case 190: return "clz"; - case 200: return "codecay"; - case 201: return "pojustice"; - case 202: return "poknowledge"; - case 203: return "potranquility"; - case 204: return "ponightmare"; - case 205: return "podisease"; - case 206: return "poinnovation"; - case 207: return "potorment"; - case 208: return "povalor"; - case 209: return "bothunder"; - case 210: return "postorms"; - case 211: return "hohonora"; - case 212: return "solrotower"; - case 213: return "powar"; - case 214: return "potactics"; - case 215: return "poair"; - case 216: return "powater"; - case 217: return "pofire"; - case 218: return "poeartha"; - case 219: return "potimea"; - case 220: return "hohonorb"; - case 221: return "nightmareb"; - case 222: return "poearthb"; - case 223: return "potimeb"; - case 224: return "gunthak"; - case 225: return "dulak"; - case 226: return "torgiran"; - case 227: return "nadox"; - case 228: return "hatesfury"; - case 229: return "guka"; - case 230: return "ruja"; - case 231: return "taka"; - case 232: return "mira"; - case 233: return "mmca"; - case 234: return "gukb"; - case 235: return "rujb"; - case 236: return "takb"; - case 237: return "mirb"; - case 238: return "mmcb"; - case 239: return "gukc"; - case 240: return "rujc"; - case 241: return "takc"; - case 242: return "mirc"; - case 243: return "mmcc"; - case 244: return "gukd"; - case 245: return "rujd"; - case 246: return "takd"; - case 247: return "mird"; - case 248: return "mmcd"; - case 249: return "guke"; - case 250: return "ruje"; - case 251: return "take"; - case 252: return "mire"; - case 253: return "mmce"; - case 254: return "gukf"; - case 255: return "rujf"; - case 256: return "takf"; - case 257: return "mirf"; - case 258: return "mmcf"; - case 259: return "gukg"; - case 260: return "rujg"; - case 261: return "takg"; - case 262: return "mirg"; - case 263: return "mmcg"; - case 264: return "gukh"; - case 265: return "rujh"; - case 266: return "takh"; - case 267: return "mirh"; - case 268: return "mmch"; - case 269: return "ruji"; - case 270: return "taki"; - case 271: return "miri"; - case 272: return "mmci"; - case 273: return "rujj"; - case 274: return "takj"; - case 275: return "mirj"; - case 276: return "mmcj"; - case 277: return "chardokb"; - case 278: return "soldungc"; - case 279: return "abysmal"; - case 280: return "natimbi"; - case 281: return "qinimi"; - case 282: return "riwwi"; - case 283: return "barindu"; - case 284: return "ferubi"; - case 285: return "snpool"; - case 286: return "snlair"; - case 287: return "snplant"; - case 288: return "sncrematory"; - case 289: return "tipt"; - case 290: return "vxed"; - case 291: return "yxtta"; - case 292: return "uqua"; - case 293: return "kodtaz"; - case 294: return "ikkinz"; - case 295: return "qvic"; - case 296: return "inktuta"; - case 297: return "txevu"; - case 298: return "tacvi"; - case 299: return "qvicb"; - case 300: return "wallofslaughter"; - case 301: return "bloodfields"; - case 302: return "draniksscar"; - case 303: return "causeway"; - case 304: return "chambersa"; - case 305: return "chambersb"; - case 306: return "chambersc"; - case 307: return "chambersd"; - case 308: return "chamberse"; - case 309: return "chambersf"; - case 316: return "provinggrounds"; - case 317: return "anguish"; - case 318: return "dranikhollowsa"; - case 319: return "dranikhollowsb"; - case 320: return "dranikhollowsc"; - case 328: return "dranikcatacombsa"; - case 329: return "dranikcatacombsb"; - case 330: return "dranikcatacombsc"; - case 331: return "draniksewersa"; - case 332: return "draniksewersb"; - case 333: return "draniksewersc"; - case 334: return "riftseekers"; - case 335: return "harbingers"; - case 336: return "dranik"; - case 337: return "broodlands"; - case 338: return "stillmoona"; - case 339: return "stillmoonb"; - case 340: return "thundercrest"; - case 341: return "delvea"; - case 342: return "delveb"; - case 343: return "thenest"; - case 344: return "guildlobby"; - case 345: return "guildhall"; - case 346: return "barter"; - case 347: return "illsalin"; - case 348: return "illsalina"; - case 349: return "illsalinb"; - case 350: return "illsalinc"; - case 351: return "dreadspire"; - case 354: return "drachnidhive"; - case 355: return "drachnidhivea"; - case 356: return "drachnidhiveb"; - case 357: return "drachnidhivec"; - case 358: return "westkorlach"; - case 359: return "westkorlacha"; - case 360: return "westkorlachb"; - case 361: return "westkorlachc"; - case 362: return "eastkorlach"; - case 363: return "eastkorlacha"; - case 364: return "shadowspine"; - case 365: return "corathus"; - case 366: return "corathusa"; - case 367: return "corathusb"; - case 368: return "nektulosa"; - case 369: return "arcstone"; - case 370: return "relic"; - case 371: return "skylance"; - case 372: return "devastation"; - case 373: return "devastationa"; - case 374: return "rage"; - case 375: return "ragea"; - case 376: return "takishruins"; - case 377: return "takishruinsa"; - case 378: return "elddar"; - case 379: return "elddara"; - case 380: return "theater"; - case 381: return "theatera"; - case 382: return "freeporteast"; - case 383: return "freeportwest"; - case 384: return "freeportsewers"; - case 385: return "freeportacademy"; - case 386: return "freeporttemple"; - case 387: return "freeportmilitia"; - case 388: return "freeportarena"; - case 389: return "freeportcityhall"; - case 390: return "freeporttheater"; - case 391: return "freeporthall"; - case 392: return "northro"; - case 393: return "southro"; - case 394: return "crescent"; - case 395: return "moors"; - case 396: return "stonehive"; - case 397: return "mesa"; - case 398: return "roost"; - case 399: return "steppes"; - case 400: return "icefall"; - case 401: return "valdeholm"; - case 402: return "frostcrypt"; - case 403: return "sunderock"; - case 404: return "vergalid"; - case 405: return "direwind"; - case 406: return "ashengate"; - case 407: return "highpasshold"; - case 408: return "commonlands"; - case 409: return "oceanoftears"; - case 410: return "kithforest"; - case 411: return "befallenb"; - case 412: return "highpasskeep"; - case 413: return "innothuleb"; - case 414: return "toxxulia"; - case 415: return "mistythicket"; - case 416: return "kattacastrum"; - case 417: return "thalassius"; - case 418: return "atiiki"; - case 419: return "zhisza"; - case 420: return "silyssar"; - case 421: return "solteris"; - case 422: return "barren"; - case 423: return "buriedsea"; - case 424: return "jardelshook"; - case 425: return "monkeyrock"; - case 426: return "suncrest"; - case 427: return "deadbone"; - case 428: return "blacksail"; - case 429: return "maidensgrave"; - case 430: return "redfeather"; - case 431: return "shipmvp"; - case 432: return "shipmvu"; - case 433: return "shippvu"; - case 434: return "shipuvu"; - case 435: return "shipmvm"; - case 436: return "mechanotus"; - case 437: return "mansion"; - case 438: return "steamfactory"; - case 439: return "shipworkshop"; - case 440: return "gyrospireb"; - case 441: return "gyrospirez"; - case 442: return "dragonscale"; - case 443: return "lopingplains"; - case 444: return "hillsofshade"; - case 445: return "bloodmoon"; - case 446: return "crystallos"; - case 447: return "guardian"; - case 448: return "steamfontmts"; - case 449: return "cryptofshade"; - case 451: return "dragonscaleb"; - case 452: return "oldfieldofbone"; - case 453: return "oldkaesoraa"; - case 454: return "oldkaesorab"; - case 455: return "oldkurn"; - case 456: return "oldkithicor"; - case 457: return "oldcommons"; - case 458: return "oldhighpass"; - case 459: return "thevoida"; - case 460: return "thevoidb"; - case 461: return "thevoidc"; - case 462: return "thevoidd"; - case 463: return "thevoide"; - case 464: return "thevoidf"; - case 465: return "thevoidg"; - case 466: return "oceangreenhills"; - case 467: return "oceangreenvillage"; - case 468: return "oldblackburrow"; - case 469: return "bertoxtemple"; - case 470: return "discord"; - case 471: return "discordtower"; - case 472: return "oldbloodfield"; - case 473: return "precipiceofwar"; - case 474: return "olddranik"; - case 475: return "toskirakk"; - case 476: return "korascian"; - case 477: return "rathechamber"; - case 480: return "brellsrest"; - case 481: return "fungalforest"; - case 482: return "underquarry"; - case 483: return "coolingchamber"; - case 484: return "shiningcity"; - case 485: return "arthicrex"; - case 486: return "foundation"; - case 487: return "lichencreep"; - case 488: return "pellucid"; - case 489: return "stonesnake"; - case 490: return "brellstemple"; - case 491: return "convorteum"; - case 492: return "brellsarena"; - case 493: return "weddingchapel"; - case 494: return "weddingchapeldark"; - case 495: return "dragoncrypt"; - case 700: return "feerrott2"; - case 701: return "thulehouse1"; - case 702: return "thulehouse2"; - case 703: return "housegarden"; - case 704: return "thulelibrary"; - case 705: return "well"; - case 706: return "fallen"; - case 707: return "morellcastle"; - case 708: return "somnium"; - case 709: return "alkabormare"; - case 710: return "miragulmare"; - case 711: return "thuledream"; - case 712: return "neighborhood"; - case 724: return "argath"; - case 725: return "arelis"; - case 726: return "sarithcity"; - case 727: return "rubak"; - case 728: return "beastdomain"; - case 729: return "resplendent"; - case 730: return "pillarsalra"; - case 731: return "windsong"; - case 732: return "cityofbronze"; - case 733: return "sepulcher"; - case 734: return "eastsepulcher"; - case 735: return "westsepulcher"; - case 752: return "shardslanding"; - case 753: return "xorbb"; - case 754: return "kaelshard"; - case 755: return "eastwastesshard"; - case 756: return "crystalshard"; - case 757: return "breedinggrounds"; - case 758: return "eviltree"; - case 759: return "grelleth"; - case 760: return "chapterhouse"; - case 996: return "arttest"; - case 998: return "fhalls"; - case 999: return "apprentice"; - } - return "UNKNWN"; -} diff --git a/world/worlddb.h b/world/worlddb.h index 2b3d7ea07..9054c77ea 100644 --- a/world/worlddb.h +++ b/world/worlddb.h @@ -19,7 +19,6 @@ #define WORLDDB_H_ #include "../common/shareddb.h" -#include "../common/zone_numbers.h" #include "../common/eq_packet.h" struct PlayerProfile_Struct; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index cc48a9844..75111a266 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -48,7 +48,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/skills.h" #include "../common/spdat.h" #include "../common/strings.h" -#include "../common/zone_numbers.h" #include "data_bucket.h" #include "event_codes.h" #include "expedition.h" @@ -6779,7 +6778,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app) bool corpseBuried = Strings::ToInt(row[7]); popupText += StringFormat("%s%s%8.0f%8.0f%8.0f%s%s%s", - charName, StaticGetZoneName(ZoneID), CorpseX, CorpseY, CorpseZ, time_of_death, + charName, zone_store.GetZoneName(ZoneID, true), CorpseX, CorpseY, CorpseZ, time_of_death, corpseRezzed ? "Yes" : "No", corpseBuried ? "Yes" : "No"); if (popupText.size() > 4000) {