From dc054c19aefcc9ca20aa0d4104386886a912a9d7 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 30 Mar 2007 17:27:11 +0000
Subject: Renamed "Controlled" to "Monster" and moved it into the game-server
 directory.

---
 src/game-server/testing.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/game-server/testing.cpp')

diff --git a/src/game-server/testing.cpp b/src/game-server/testing.cpp
index 7243793..5db3557 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);
 
-- 
cgit