--- deliantra/server/server/commands.C	2006/12/11 02:54:57	1.17
+++ deliantra/server/server/commands.C	2006/12/30 10:16:11	1.20
@@ -25,12 +25,11 @@
  * Command parser
  */
 
+#include <cctype>
+
 #include <global.h>
 #include <commands.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
-#endif
-#include <ctype.h>
+#include <sproto.h>
 
 /* Added times to all the commands.  However, this was quickly done,
  * and probably needs more refinements.  All socket and DM commands
@@ -69,7 +68,6 @@
   {"killpets", command_kill_pets, 0.0},
   {"listen", command_listen, 0.0},
   {"logs", command_logs, 0.0},
-  {"maps", command_maps, 0.0},
   {"mapinfo", command_mapinfo, 0.0},
   {"mark", command_mark, 0.0},
   {"motd", command_motd, 0.0},
@@ -114,7 +112,6 @@
   {"southwest", command_southwest, 1.0},
   {"northwest", command_northwest, 1.0},
 };
-
 const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
 
 CommArray_s CommunicationCommands[] = {
@@ -178,7 +175,6 @@
   {"orcknuckle", command_orcknuckle, 0.0},
   {"printlos", command_printlos, 0.0},
 };
-
 const int CommunicationCommandSize = sizeof (CommunicationCommands) / sizeof (CommArray_s);
 
 CommArray_s NewServerCommands[] = {
@@ -187,7 +183,6 @@
   {"fire", command_fire, 1.0},
   {"fire_stop", command_fire_stop, 0.0},
 };
-
 const int NewServerCommandSize = sizeof (NewServerCommands) / sizeof (CommArray_s);
 
 /*
@@ -203,8 +198,6 @@
   {"dump", command_dump, 0.0},
   {"dumpbelow", command_dumpbelow, 0.0},
   {"dumpfriendlyobjects", command_dumpfriendlyobjects, 0.0},
-  {"dumpallmaps", command_dumpallmaps, 0.0},
-  {"dumpmap", command_dumpmap, 0.0},
   {"forget_spell", command_forget_spell, 0.0},
   {"free", command_free, 0.0},
   {"freeze", command_freeze, 0.0},
@@ -225,7 +218,6 @@
   {"nowiz", command_nowiz, 0.0},
   {"patch", command_patch, 0.0},
   {"remove", command_remove, 0.0},
-  {"reset", command_reset, 0.0},
   {"set_god", command_setgod, 0.0},
   {"shutdown", command_shutdown, 0.0},
   {"stack_clear", command_stack_clear, 0.0},
@@ -233,10 +225,9 @@
   {"stack_pop", command_stack_pop, 0.0},
   {"stack_push", command_stack_push, 0.0},
   {"stats", command_stats, 0.0},
-  {"style_info", command_style_map_info, 0.0},                             /* Costly command, so make it wiz only */
   {"summon", command_summon, 0.0},
   {"teleport", command_teleport, 0.0},
-  {"overlay_save", command_save_overlay, 0.0},
+  //{"overlay_save", command_save_overlay, 0.0},
 
 /*  {"possess", command_possess, 0.0}, */
   {"mon_aggr", command_mon_aggr, 0.0},
@@ -249,29 +240,23 @@
 CommArray_s Socket_Commands[] = {
   {"hiscore", command_hiscore, 0.0},
   {"logs", command_logs, 0.0},
-  {"maps", command_maps, 0.0},
   {"motd", command_motd, 0.0},
   {"players", command_players, 0.0},
   {"version", command_version, 0.0},
 };
-
 const int Socket_CommandsSize = sizeof (Socket_Commands) / sizeof (CommArray_s);
 
-
 /* Socket commands - these should really do nothing more than output things
  * to the various players/sockets.
  */
 CommArray_s Socket2_Commands[] = {
 };
-
 const int Socket2_CommandsSize = sizeof (Socket2_Commands) / sizeof (CommArray_s);
 
-
-
 static int
 compare_A (const void *a, const void *b)
 {
-  return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name);
+  return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
 }
 
 void