--- deliantra/server/server/commands.C	2009/10/12 14:00:59	1.58
+++ deliantra/server/server/commands.C	2010/04/10 04:54:09	1.66
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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
@@ -22,14 +22,8 @@
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
-/*
- * Command parser
- */
-
-#include <cctype>
-
+/* This file deals with administrative commands from the client. */
 #include <global.h>
-#include <commands.h>
 #include <sproto.h>
 
 /* Added times to all the commands.  However, this was quickly done,
@@ -37,10 +31,18 @@
  * take 0 time.
  */
 
+typedef int (*CommFunc)(object *op, char *params);
+
+struct CommArray_s {		/* global list's structure */
+  const char *name;
+  CommFunc func;
+  float	time;			/* How long it takes to execute this command */
+};
+
 /*
  * Normal game commands
  */
-CommArray_s Commands[] = {
+static CommArray_s Commands[] = {
   {"party", command_party, 1.0},
   {"gsay",  command_gsay, 1.0},
 
@@ -55,12 +57,13 @@
   {"get",          command_take, 1.0},
   {"invoke",       command_invoke, 1.0},
   {"killpets",     command_kill_pets, 1.0},
-  {"motd",         command_motd, 0.5 / TICK},
+  {"lock",         command_lock, 1.0},			/* locks items in inventory with command line or macro */
   {"pickup",       command_pickup, 1.0},
   {"prepare",      command_prepare, 1.0},
   {"resistances",  command_resistances, 1.0},
   {"rotateshoottype", command_rotateshoottype, 1.0},
   {"skills",       command_skills, 0.5 / TICK},      /* shows player list of skills */
+  {"unlock",	   command_unlock, 1.0}, 		/* unlock items in inventory with command line or in macro */
   {"use_skill",    command_uskill, 1.0},
   {"ready_skill",  command_rskill, 1.0},
   {"search-items", command_search_items, 1.0},
@@ -83,13 +86,19 @@
   {"southeast", command_southeast, 0.0},
   {"southwest", command_southwest, 0.0},
   {"northwest", command_northwest, 0.0},
+
+  {"mark"     , command_mark     , 0.0},
+  {"run"      , command_run      , 0.0},
+  {"run_stop" , command_run_stop , 0.0},
+  {"fire"     , command_fire     , 0.0},
+  {"fire_stop", command_fire_stop, 0.0},
 };
-const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
+static const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s);
 
 /*
  * Wizard commands (for both)
  */
-CommArray_s WizCommands[] = {
+static CommArray_s WizCommands[] = {
   {"abil",     command_abil, 0.0},
   {"addexp",   command_addexp, 0.0},
   {"arrest",   command_arrest, 0.0},
@@ -119,7 +128,7 @@
   {"summon",   command_summon, 0.0},
   //{"overlay_save", command_save_overlay, 0.0},
 };
-const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
+static const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s);
 
 static int
 compare_A (const void *a, const void *b)
@@ -127,10 +136,67 @@
   return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
 }
 
+static struct init_commands
+{
+  init_commands ()
+  { 
+    qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A);
+    qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
+  }
+} init_commands;
+
+static CommArray_s *
+find_command_element (char *cmd, CommArray_s *commarray, int commsize)
+{
+  CommArray_s *asp, dummy;
+
+  dummy.name = cmd;
+  asp = (CommArray_s *)bsearch ((void *)&dummy, (void *)commarray, commsize, sizeof (CommArray_s), compare_A);
+  return asp;
+}
+
+/* This function is called from the new client/server code.
+ * pl is the player who is issuing the command, command is the
+ * command.
+ */
 void
-init_commands (void)
+execute_newserver_command (object *pl, char *command)
 {
-  qsort (Commands, CommandsSize, sizeof (CommArray_s), compare_A);
-  qsort (WizCommands, WizCommandsSize, sizeof (CommArray_s), compare_A);
+  CommArray_s *csp;
+  char *cp;
+
+  /*
+   * remove trailing spaces from command
+   */
+  cp = command + strlen (command) - 1;
+  while ((cp >= command) && (*cp == ' '))
+    {
+      *cp = '\0';
+      cp--;
+    }
+
+  cp = strchr (command, ' ');
+  if (cp)
+    {
+      *(cp++) = '\0';
+      while (*cp == ' ')
+        cp++;
+    }
+
+  if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
+    {
+      csp = find_command_element (command, Commands, CommandsSize);
+
+      if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
+        csp = find_command_element (command, WizCommands, WizCommandsSize);
+
+      if (csp)
+        {
+          pl->speed_left -= csp->time;
+          csp->func (pl, cp);
+        }
+      else if (!INVOKE_PLAYER (UNKNOWN_COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
+        pl->failmsgf ("'%s' is not a valid command.", command);
+    }
 }