Implemented "money" remote command.

2 files changed, 33 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e804120..6dd43a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,9 @@
 	src/serialize/characterdata.hpp, src/account-server/characterdata.hpp:
 	Added serialization of account level.
 	* src/game-server/gamehandler.cpp, src/game-server/command.cpp,
-	src/Makefile.am: Added support for user commands. Implemented "warp"
-	and "item".
+	src/Makefile.am: Added support for remote commands.
+	* src/game-server/command.cpp: Implemented "warp", "item", and "money"
+	remote commands.
 
 2007-08-20  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/game-server/command.cpp b/src/game-server/command.cpp
index 2920c30a..19326f08 100644
--- a/src/game-server/command.cpp
+++ b/src/game-server/command.cpp
@@ -31,6 +31,12 @@
 #include "game-server/mapmanager.hpp"
 #include "game-server/state.hpp"
 
+template< typename T1, typename T2 >
+static void proxy(void (*f)(), intptr_t args[4])
+{
+    ((void (*)(T1, T2))f)((T1)args[0], (T2)args[1]);
+}
+
 template< typename T1, typename T2, typename T3 >
 static void proxy(void (*f)(), intptr_t args[4])
 {
@@ -71,6 +77,24 @@ struct Command
 };
 
 /**
+ * Creates a command with a 2-parameter handler.
+ */
+template< typename T1, typename T2 >
+static Command handle(char const *name, int level, void (*f)(T1, T2))
+{
+    Command c;
+    c.name = name;
+    c.level = level;
+    c.handler = &proxy< T1, T2 >;
+    c.target = (void (*)())f;
+    c.type[0] = Argument<T1>::type;
+    c.type[1] = Argument<T2>::type;
+    c.type[2] = 0;
+    c.type[3] = 0;
+    return c;
+}
+
+/**
  * Creates a command with a 3-parameter handler.
  */
 template< typename T1, typename T2, typename T3 >
@@ -117,6 +141,11 @@ static void item(Character *q, ItemClass *it, int nb)
     Inventory(q).insert(it->getDatabaseID(), nb);
 }
 
+static void money(Character *q, int nb)
+{
+    Inventory(q).changeMoney(nb);
+}
+
 /**
  * List of remote commands.
  */
@@ -124,6 +153,7 @@ static Command const commands[] =
 {
     handle("warp", AL_GM, warp),
     handle("item", AL_GM, item),
+    handle("money", AL_GM, money),
 };
 
 /**