diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index 46c235455..2eb9749f1 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -559,7 +559,6 @@ SET(gm_commands gm_commands/zonebootup.cpp gm_commands/zonelock.cpp gm_commands/zoneshutdown.cpp - gm_commands/zonespawn.cpp gm_commands/zonestatus.cpp gm_commands/zopp.cpp gm_commands/zsafecoords.cpp diff --git a/zone/command.cpp b/zone/command.cpp index febedd00c..d9060227d 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -398,7 +398,6 @@ int command_init(void) command_add("zoneinstance", "[instanceid] [x] [y] [z] - Go to specified instance zone (coords optional)", AccountStatus::Guide, command_zone_instance) || command_add("zonelock", "[List|Lock|Unlock] [Zone ID|Zone Short Name] - Set or get lock status of a Zone by ID or Short Name", AccountStatus::GMAdmin, command_zonelock) || command_add("zoneshutdown", "[shortname] - Shut down a zone server", AccountStatus::GMLeadAdmin, command_zoneshutdown) || - command_add("zonespawn", "- Not implemented", AccountStatus::GMImpossible, command_zonespawn) || command_add("zonestatus", "- Show connected zoneservers, synonymous with /servers", AccountStatus::GMLeadAdmin, command_zonestatus) || command_add("zopp", "Troubleshooting command - Sends a fake item packet to you. No server reference is created.", AccountStatus::GMImpossible, command_zopp) || command_add("zsafecoords", "[x] [y] [z] - Set safe coords", AccountStatus::QuestTroupe, command_zsafecoords) || diff --git a/zone/command.h b/zone/command.h index 4b5f99b2d..6d5f9e247 100644 --- a/zone/command.h +++ b/zone/command.h @@ -321,7 +321,6 @@ void command_zonebootup(Client *c, const Seperator *sep); void command_zonelock(Client *c, const Seperator *sep); void command_viewzoneloot(Client *c, const Seperator *sep); void command_zoneshutdown(Client *c, const Seperator *sep); -void command_zonespawn(Client *c, const Seperator *sep); void command_zonestatus(Client *c, const Seperator *sep); void command_zopp(Client *c, const Seperator *sep); void command_zsafecoords(Client *c, const Seperator *sep); diff --git a/zone/gm_commands/zonespawn.cpp b/zone/gm_commands/zonespawn.cpp deleted file mode 100755 index 01a3a8683..000000000 --- a/zone/gm_commands/zonespawn.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "../client.h" - -void command_zonespawn(Client *c, const Seperator *sep) -{ - c->Message(Chat::White, "This command is not yet implemented."); - return; - -/* this was kept from client.cpp verbatim (it was commented out) */ - // if (target && target->IsNPC()) { - // Message(0, "Inside main if."); - // if (strcasecmp(sep->arg[1], "add")==0) { - // Message(0, "Inside add if."); - // database.DBSpawn(1, StaticGetZoneName(this->GetPP().current_zone), target->CastToNPC()); - // } - // else if (strcasecmp(sep->arg[1], "update")==0) { - // database.DBSpawn(2, StaticGetZoneName(this->GetPP().current_zone), target->CastToNPC()); - // } - // else if (strcasecmp(sep->arg[1], "remove")==0) { - // if (strcasecmp(sep->arg[2], "all")==0) { - // database.DBSpawn(4, StaticGetZoneName(this->GetPP().current_zone)); - // } - // else { - // if (database.DBSpawn(3, StaticGetZoneName(this->GetPP().current_zone), target->CastToNPC())) { - // Message(0, "#zonespawn: %s removed successfully!", target->GetName()); - // target->CastToNPC()->Death(target, target->GetHP()); - // } - // } - // } - // else - // Message(0, "Error: #dbspawn: Invalid command. (Note: EDIT and REMOVE are NOT in yet.)"); - // if (target->CastToNPC()->GetNPCTypeID() > 0) { - // Message(0, "Spawn is type %i", target->CastToNPC()->GetNPCTypeID()); - // } - // } - // else if(!target || !target->IsNPC()) - // Message(0, "Error: #zonespawn: You must have a NPC targeted!"); - // else - // Message(0, "Usage: #zonespawn [add|edit|remove|remove all]"); -} -