Removed testing.cpp because all of its functionality can now be covered by LUA scripts

5 files changed, 116 insertions, 149 deletions

diff --git a/gameserver.cbp b/gameserver.cbp
index a2de976..0311d10 100644
--- a/gameserver.cbp
+++ b/gameserver.cbp
@@ -23,7 +23,7 @@
 				</Linker>
 			</Target>
 			<Target title="unix">
-				<Option output="bin/gameserver" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\gameserver" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="bin" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -31,12 +31,12 @@
 				<Compiler>
 					<Add option="-g" />
 					<Add directory="src" />
-					<Add directory="/usr/local/include/libxml2" />
-					<Add directory="/usr/local/include/lua51" />
+					<Add directory="\usr\local\include\libxml2" />
+					<Add directory="\usr\local\include\lua51" />
 				</Compiler>
 				<Linker>
 					<Add library="pthread" />
-					<Add directory="/usr/local/lib/lua51" />
+					<Add directory="\usr\local\lib\lua51" />
 				</Linker>
 			</Target>
 		</Build>
@@ -53,111 +53,110 @@
 			<Add library="z" />
 			<Add library="lua" />
 		</Linker>
-		<Unit filename="src/common/configuration.cpp" />
-		<Unit filename="src/common/configuration.hpp" />
-		<Unit filename="src/common/inventorydata.hpp" />
-		<Unit filename="src/defines.h" />
-		<Unit filename="src/game-server/accountconnection.cpp" />
-		<Unit filename="src/game-server/accountconnection.hpp" />
-		<Unit filename="src/game-server/attackzone.cpp" />
-		<Unit filename="src/game-server/attackzone.hpp" />
-		<Unit filename="src/game-server/being.cpp" />
-		<Unit filename="src/game-server/being.hpp" />
-		<Unit filename="src/game-server/buysell.cpp" />
-		<Unit filename="src/game-server/buysell.hpp" />
-		<Unit filename="src/game-server/character.cpp" />
-		<Unit filename="src/game-server/character.hpp" />
-		<Unit filename="src/game-server/collisiondetection.cpp" />
-		<Unit filename="src/game-server/collisiondetection.hpp" />
-		<Unit filename="src/game-server/commandhandler.cpp" />
-		<Unit filename="src/game-server/commandhandler.hpp" />
-		<Unit filename="src/game-server/effect.cpp" />
-		<Unit filename="src/game-server/effect.hpp" />
-		<Unit filename="src/game-server/eventlistener.hpp" />
-		<Unit filename="src/game-server/gamehandler.cpp" />
-		<Unit filename="src/game-server/gamehandler.hpp" />
-		<Unit filename="src/game-server/inventory.cpp" />
-		<Unit filename="src/game-server/inventory.hpp" />
-		<Unit filename="src/game-server/item.cpp" />
-		<Unit filename="src/game-server/item.hpp" />
-		<Unit filename="src/game-server/itemmanager.cpp" />
-		<Unit filename="src/game-server/itemmanager.hpp" />
-		<Unit filename="src/game-server/main-game.cpp" />
-		<Unit filename="src/game-server/map.cpp" />
-		<Unit filename="src/game-server/map.hpp" />
-		<Unit filename="src/game-server/mapcomposite.cpp" />
-		<Unit filename="src/game-server/mapcomposite.hpp" />
-		<Unit filename="src/game-server/mapmanager.cpp" />
-		<Unit filename="src/game-server/mapmanager.hpp" />
-		<Unit filename="src/game-server/mapreader.cpp" />
-		<Unit filename="src/game-server/mapreader.hpp" />
-		<Unit filename="src/game-server/monster.cpp" />
-		<Unit filename="src/game-server/monster.hpp" />
-		<Unit filename="src/game-server/monstermanager.cpp" />
-		<Unit filename="src/game-server/monstermanager.hpp" />
-		<Unit filename="src/game-server/movingobject.cpp" />
-		<Unit filename="src/game-server/movingobject.hpp" />
-		<Unit filename="src/game-server/npc.cpp" />
-		<Unit filename="src/game-server/npc.hpp" />
-		<Unit filename="src/game-server/object.hpp" />
-		<Unit filename="src/game-server/postman.hpp" />
-		<Unit filename="src/game-server/quest.cpp" />
-		<Unit filename="src/game-server/quest.hpp" />
-		<Unit filename="src/game-server/resourcemanager.cpp" />
-		<Unit filename="src/game-server/resourcemanager.hpp" />
-		<Unit filename="src/game-server/spawnarea.cpp" />
-		<Unit filename="src/game-server/spawnarea.hpp" />
-		<Unit filename="src/game-server/state.cpp" />
-		<Unit filename="src/game-server/state.hpp" />
-		<Unit filename="src/game-server/testing.cpp" />
-		<Unit filename="src/game-server/thing.cpp" />
-		<Unit filename="src/game-server/thing.hpp" />
-		<Unit filename="src/game-server/trade.cpp" />
-		<Unit filename="src/game-server/trade.hpp" />
-		<Unit filename="src/game-server/trigger.cpp" />
-		<Unit filename="src/game-server/trigger.hpp" />
-		<Unit filename="src/net/bandwidth.cpp" />
-		<Unit filename="src/net/bandwidth.hpp" />
-		<Unit filename="src/net/connection.cpp" />
-		<Unit filename="src/net/connection.hpp" />
-		<Unit filename="src/net/connectionhandler.cpp" />
-		<Unit filename="src/net/connectionhandler.hpp" />
-		<Unit filename="src/net/messagein.cpp" />
-		<Unit filename="src/net/messagein.hpp" />
-		<Unit filename="src/net/messageout.cpp" />
-		<Unit filename="src/net/messageout.hpp" />
-		<Unit filename="src/net/netcomputer.cpp" />
-		<Unit filename="src/net/netcomputer.hpp" />
-		<Unit filename="src/point.h" />
-		<Unit filename="src/scripting/lua.cpp" />
-		<Unit filename="src/scripting/luascript.cpp" />
-		<Unit filename="src/scripting/luascript.hpp" />
-		<Unit filename="src/scripting/luautil.cpp" />
-		<Unit filename="src/scripting/luautil.hpp" />
-		<Unit filename="src/scripting/script.cpp" />
-		<Unit filename="src/scripting/script.hpp" />
-		<Unit filename="src/utils/base64.cpp" />
-		<Unit filename="src/utils/base64.h" />
-		<Unit filename="src/utils/logger.cpp" />
-		<Unit filename="src/utils/logger.h" />
-		<Unit filename="src/utils/mathutils.cpp" />
-		<Unit filename="src/utils/mathutils.h" />
-		<Unit filename="src/utils/processorutils.cpp" />
-		<Unit filename="src/utils/processorutils.hpp" />
-		<Unit filename="src/utils/string.cpp" />
-		<Unit filename="src/utils/string.hpp" />
-		<Unit filename="src/utils/stringfilter.cpp" />
-		<Unit filename="src/utils/stringfilter.h" />
-		<Unit filename="src/utils/timer.cpp" />
-		<Unit filename="src/utils/timer.h" />
-		<Unit filename="src/utils/tokencollector.cpp" />
-		<Unit filename="src/utils/tokencollector.hpp" />
-		<Unit filename="src/utils/tokendispenser.cpp" />
-		<Unit filename="src/utils/tokendispenser.hpp" />
-		<Unit filename="src/utils/xml.cpp" />
-		<Unit filename="src/utils/xml.hpp" />
-		<Unit filename="src/utils/zlib.cpp" />
-		<Unit filename="src/utils/zlib.hpp" />
+		<Unit filename="src\common\configuration.cpp" />
+		<Unit filename="src\common\configuration.hpp" />
+		<Unit filename="src\common\inventorydata.hpp" />
+		<Unit filename="src\defines.h" />
+		<Unit filename="src\game-server\accountconnection.cpp" />
+		<Unit filename="src\game-server\accountconnection.hpp" />
+		<Unit filename="src\game-server\attackzone.cpp" />
+		<Unit filename="src\game-server\attackzone.hpp" />
+		<Unit filename="src\game-server\being.cpp" />
+		<Unit filename="src\game-server\being.hpp" />
+		<Unit filename="src\game-server\buysell.cpp" />
+		<Unit filename="src\game-server\buysell.hpp" />
+		<Unit filename="src\game-server\character.cpp" />
+		<Unit filename="src\game-server\character.hpp" />
+		<Unit filename="src\game-server\collisiondetection.cpp" />
+		<Unit filename="src\game-server\collisiondetection.hpp" />
+		<Unit filename="src\game-server\commandhandler.cpp" />
+		<Unit filename="src\game-server\commandhandler.hpp" />
+		<Unit filename="src\game-server\effect.cpp" />
+		<Unit filename="src\game-server\effect.hpp" />
+		<Unit filename="src\game-server\eventlistener.hpp" />
+		<Unit filename="src\game-server\gamehandler.cpp" />
+		<Unit filename="src\game-server\gamehandler.hpp" />
+		<Unit filename="src\game-server\inventory.cpp" />
+		<Unit filename="src\game-server\inventory.hpp" />
+		<Unit filename="src\game-server\item.cpp" />
+		<Unit filename="src\game-server\item.hpp" />
+		<Unit filename="src\game-server\itemmanager.cpp" />
+		<Unit filename="src\game-server\itemmanager.hpp" />
+		<Unit filename="src\game-server\main-game.cpp" />
+		<Unit filename="src\game-server\map.cpp" />
+		<Unit filename="src\game-server\map.hpp" />
+		<Unit filename="src\game-server\mapcomposite.cpp" />
+		<Unit filename="src\game-server\mapcomposite.hpp" />
+		<Unit filename="src\game-server\mapmanager.cpp" />
+		<Unit filename="src\game-server\mapmanager.hpp" />
+		<Unit filename="src\game-server\mapreader.cpp" />
+		<Unit filename="src\game-server\mapreader.hpp" />
+		<Unit filename="src\game-server\monster.cpp" />
+		<Unit filename="src\game-server\monster.hpp" />
+		<Unit filename="src\game-server\monstermanager.cpp" />
+		<Unit filename="src\game-server\monstermanager.hpp" />
+		<Unit filename="src\game-server\movingobject.cpp" />
+		<Unit filename="src\game-server\movingobject.hpp" />
+		<Unit filename="src\game-server\npc.cpp" />
+		<Unit filename="src\game-server\npc.hpp" />
+		<Unit filename="src\game-server\object.hpp" />
+		<Unit filename="src\game-server\postman.hpp" />
+		<Unit filename="src\game-server\quest.cpp" />
+		<Unit filename="src\game-server\quest.hpp" />
+		<Unit filename="src\game-server\resourcemanager.cpp" />
+		<Unit filename="src\game-server\resourcemanager.hpp" />
+		<Unit filename="src\game-server\spawnarea.cpp" />
+		<Unit filename="src\game-server\spawnarea.hpp" />
+		<Unit filename="src\game-server\state.cpp" />
+		<Unit filename="src\game-server\state.hpp" />
+		<Unit filename="src\game-server\thing.cpp" />
+		<Unit filename="src\game-server\thing.hpp" />
+		<Unit filename="src\game-server\trade.cpp" />
+		<Unit filename="src\game-server\trade.hpp" />
+		<Unit filename="src\game-server\trigger.cpp" />
+		<Unit filename="src\game-server\trigger.hpp" />
+		<Unit filename="src\net\bandwidth.cpp" />
+		<Unit filename="src\net\bandwidth.hpp" />
+		<Unit filename="src\net\connection.cpp" />
+		<Unit filename="src\net\connection.hpp" />
+		<Unit filename="src\net\connectionhandler.cpp" />
+		<Unit filename="src\net\connectionhandler.hpp" />
+		<Unit filename="src\net\messagein.cpp" />
+		<Unit filename="src\net\messagein.hpp" />
+		<Unit filename="src\net\messageout.cpp" />
+		<Unit filename="src\net\messageout.hpp" />
+		<Unit filename="src\net\netcomputer.cpp" />
+		<Unit filename="src\net\netcomputer.hpp" />
+		<Unit filename="src\point.h" />
+		<Unit filename="src\scripting\lua.cpp" />
+		<Unit filename="src\scripting\luascript.cpp" />
+		<Unit filename="src\scripting\luascript.hpp" />
+		<Unit filename="src\scripting\luautil.cpp" />
+		<Unit filename="src\scripting\luautil.hpp" />
+		<Unit filename="src\scripting\script.cpp" />
+		<Unit filename="src\scripting\script.hpp" />
+		<Unit filename="src\utils\base64.cpp" />
+		<Unit filename="src\utils\base64.h" />
+		<Unit filename="src\utils\logger.cpp" />
+		<Unit filename="src\utils\logger.h" />
+		<Unit filename="src\utils\mathutils.cpp" />
+		<Unit filename="src\utils\mathutils.h" />
+		<Unit filename="src\utils\processorutils.cpp" />
+		<Unit filename="src\utils\processorutils.hpp" />
+		<Unit filename="src\utils\string.cpp" />
+		<Unit filename="src\utils\string.hpp" />
+		<Unit filename="src\utils\stringfilter.cpp" />
+		<Unit filename="src\utils\stringfilter.h" />
+		<Unit filename="src\utils\timer.cpp" />
+		<Unit filename="src\utils\timer.h" />
+		<Unit filename="src\utils\tokencollector.cpp" />
+		<Unit filename="src\utils\tokencollector.hpp" />
+		<Unit filename="src\utils\tokendispenser.cpp" />
+		<Unit filename="src\utils\tokendispenser.hpp" />
+		<Unit filename="src\utils\xml.cpp" />
+		<Unit filename="src\utils\xml.hpp" />
+		<Unit filename="src\utils\zlib.cpp" />
+		<Unit filename="src\utils\zlib.hpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/src/Makefile.am b/src/Makefile.am
index f892382..62cc50f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,7 +138,6 @@ tmwserv_game_SOURCES = \
 	game-server/spawnarea.cpp \
 	game-server/state.hpp \
 	game-server/state.cpp \
-	game-server/testing.cpp \
 	game-server/thing.hpp \
 	game-server/thing.cpp \
 	game-server/trade.hpp \
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp
index 68372ed..2cc37de 100644
--- a/src/game-server/mapmanager.cpp
+++ b/src/game-server/mapmanager.cpp
@@ -132,9 +132,6 @@ void MapManager::raiseActive(int mapId)
     MapReader::readMap(file, composite);
 
     LOG_INFO("Activated map \"" << file << "\" (id " << mapId << ")");
-    // Add some testing stuff
-    extern void testingMap(MapComposite *);
-    testingMap(composite);
 }
 
 
diff --git a/src/game-server/testing.cpp b/src/game-server/testing.cpp
deleted file mode 100644
index 4828df4..0000000
--- a/src/game-server/testing.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file is for testing purpose only. It hardcodes some events related
-   to the game. It should be removed once all the related managers have been
-   implemented. There are no headers for this file on purpose. */
-
-#include <cassert>
-
-#include "game-server/gamehandler.hpp"
-#include "game-server/item.hpp"
-#include "game-server/itemmanager.hpp"
-#include "game-server/mapcomposite.hpp"
-#include "game-server/state.hpp"
-#include "scripting/script.hpp"
-
-static void dropItem(MapComposite *map, int x, int y, int type)
-{
-    ItemClass *ic = ItemManager::getItem(type);
-    assert(ic);
-    Item *i = new Item(ic, 1);
-    i->setMap(map);
-    Point pos(x, y);
-    i->setPosition(pos);
-    GameState::insertSafe(i);
-}
-
-void testingMap(MapComposite *map)
-{
-    switch (map->getID())
-    {
-        case 1:
-        {
-            // Drop some items.
-            dropItem(map, 58 * 32 + 16, 20 * 32 + 16, 508);
-            dropItem(map, 58 * 32 + 16, 21 * 32 + 16, 524);
-        } break;
-    }
-}
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index 010179b..1cfb876 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -982,6 +982,14 @@ static int get_map_id(lua_State *s)
  */
 static int item_drop(lua_State *s)
 {
+    if (!lua_isnumber(s, 1) ||
+        !lua_isnumber(s, 2) ||
+        !lua_isnumber(s, 3))
+    {
+        raiseScriptError(s, "trigger_create called with incorrect parameters.");
+        return 0;
+    }
+
     int x = lua_tointeger(s, 1);
     int y = lua_tointeger(s, 2);
     int type = lua_tointeger(s, 3);