diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-17 21:11:41 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-03-25 20:32:36 +0100 |
| commit | 8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6 (patch) | |
| tree | e77633d3d4e2c2538a1044589b5cc927cfa4e125 /src/game-server/mapcomposite.cpp | |
| parent | 626e4c98353f2111ae21123756396fc845447b57 (diff) | |
| download | manaserv-8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6.tar.gz manaserv-8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6.tar.bz2 manaserv-8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6.tar.xz manaserv-8ebd7ef2c200009e6d22b2cfaa3dd0d849155db6.zip | |
Changed SpawnArea and TriggerArea to components of Entity
Well, first visible change is that everything just gets longer to read.
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 99d2734f..a1a3f989 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -1,7 +1,7 @@ /* * The Mana Server * Copyright (C) 2006-2010 The Mana World Development Team - * Copyright (C) 2010-2011 The Mana Development Team + * Copyright (C) 2010-2012 The Mana Development Team * * This file is part of The Mana Server. * @@ -31,8 +31,8 @@ #include "game-server/mapmanager.h" #include "game-server/mapreader.h" #include "game-server/monstermanager.h" -#include "game-server/spawnarea.h" -#include "game-server/trigger.h" +#include "game-server/spawnareacomponent.h" +#include "game-server/triggerareacomponent.h" #include "scripting/script.h" #include "scripting/scriptmanager.h" #include "utils/logger.h" @@ -800,9 +800,12 @@ void MapComposite::initializeContent() if (destMap && destX && destY) { + Entity *entity = new Entity(OBJECT_OTHER, this); WarpAction *action = new WarpAction(destMap, destX, destY); - insert(new TriggerArea(this, object->getBounds(), - action, false)); + entity->addComponent( + new TriggerAreaComponent(object->getBounds(), + action, false)); + insert(entity); } else { @@ -838,8 +841,13 @@ void MapComposite::initializeContent() if (monster && maxBeings && spawnRate) { - insert(new SpawnArea(this, monster, object->getBounds(), - maxBeings, spawnRate)); + Entity *entity = new Entity(OBJECT_OTHER, this); + SpawnAreaComponent *spawnArea = + new SpawnAreaComponent(monster, object->getBounds(), + maxBeings, spawnRate); + + entity->addComponent(spawnArea); + insert(entity); } } else if (utils::compareStrI(type, "NPC") == 0) |