--- deliantra/server/server/commands.C	2010/04/10 04:54:09	1.66
+++ deliantra/server/server/commands.C	2018/11/17 23:40:03	1.75
@@ -1,24 +1,25 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
- * 
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -48,8 +49,6 @@
 
   {"apply",        command_apply, 1.0},        /* should be variable */
   {"cast",         command_cast, 1.0},  /* Is this right? */
-  {"dm",           command_dm, 0.0},
-  {"dmhide",       command_dmhide, 0.0},      /* Like dm, but don't tell a dm arrived, hide player */
   {"drop",         command_drop, 1.0},
   {"dropall",      command_dropall, 0.5 / TICK},
   {"examine",      command_examine, 0.5 / TICK},
@@ -93,7 +92,7 @@
   {"fire"     , command_fire     , 0.0},
   {"fire_stop", command_fire_stop, 0.0},
 };
-static const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
+static const int CommandsSize = array_length (Commands);
 
 /*
  * Wizard commands (for both)
@@ -109,14 +108,11 @@
   {"forget_spell", command_forget_spell, 0.0},
   {"free",     command_free, 0.0},
   {"freeze",   command_freeze, 0.0},
-  {"hide",     command_hide, 0.0},
   {"insert_into", command_insert_into, 0.0},
   {"inventory",   command_inventory, 0.0},
   {"invisible", command_invisible, 0.0},
   {"learn_special_prayer", command_learn_special_prayer, 0.0},
   {"learn_spell", command_learn_spell, 0.0},
-  {"nodm",     command_nowiz, 0.0},
-  {"nowiz",    command_nowiz, 0.0},
   {"patch",    command_patch, 0.0},
   {"remove",   command_remove, 0.0},
   {"set_god",  command_setgod, 0.0},
@@ -128,7 +124,7 @@
   {"summon",   command_summon, 0.0},
   //{"overlay_save", command_save_overlay, 0.0},
 };
-static const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
+static const int WizCommandsSize = array_length (WizCommands);
 
 static int
 compare_A (const void *a, const void *b)
@@ -139,7 +135,7 @@
 static struct init_commands
 {
   init_commands ()
-  { 
+  {
     qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A);
     qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
   }
@@ -187,7 +183,7 @@
     {
       csp = find_command_element (command, Commands, CommandsSize);
 
-      if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
+      if (!csp && pl->flag [FLAG_WIZ])
         csp = find_command_element (command, WizCommands, WizCommandsSize);
 
       if (csp)