summaryrefslogtreecommitdiff
path: root/src/game-server/testing.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2007-03-30 17:27:11 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2007-03-30 17:27:11 +0000
commitdc054c19aefcc9ca20aa0d4104386886a912a9d7 (patch)
tree4faf4a5bc26ac85d1300ca2f3346d4838807013c /src/game-server/testing.cpp
parent24dd2d0a7878f3e1e72a4d857a57bd9c7ea5a25e (diff)
downloadmanaserv-dc054c19aefcc9ca20aa0d4104386886a912a9d7.tar.gz
manaserv-dc054c19aefcc9ca20aa0d4104386886a912a9d7.tar.bz2
manaserv-dc054c19aefcc9ca20aa0d4104386886a912a9d7.tar.xz
manaserv-dc054c19aefcc9ca20aa0d4104386886a912a9d7.zip
Renamed "Controlled" to "Monster" and moved it into the game-server directory.
Diffstat (limited to 'src/game-server/testing.cpp')
-rw-r--r--src/game-server/testing.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game-server/testing.cpp b/src/game-server/testing.cpp
index 7243793a..5db3557c 100644
--- a/src/game-server/testing.cpp
+++ b/src/game-server/testing.cpp
@@ -4,9 +4,8 @@
#include <cassert>
-#include "controller.h"
-
#include "defines.h"
+#include "game-server/monster.hpp"
#include "game-server/itemmanager.hpp"
#include "game-server/state.hpp"
#include "game-server/trigger.hpp"
@@ -36,7 +35,7 @@ void testingMap(int id)
gameState->insert(new TriggerArea(1, rectA, &warpA));
for (int i = 0; i < 10; i++)
{
- Being *being = new Controlled(OBJECT_MONSTER);
+ Being *being = new Monster();
being->setSpeed(150);
being->setSize(8);