repaired some svn errors

4 files changed, 3 insertions, 192 deletions

diff --git a/src/controller.cpp b/src/controller.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/src/controller.cpp
+++ /dev/null
diff --git a/src/controller.h b/src/controller.h
deleted file mode 100644
index e69de29b..00000000
--- a/src/controller.h
+++ /dev/null
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index 9d75e6fa..91f7e16e 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -87,109 +87,3 @@ void Monster::calculateDerivedAttributes()
      * Do any monster specific attribute calculation here

      */

 }

-/*

- *  The Mana World Server

- *  Copyright 2004 The Mana World Development Team

- *

- *  This file is part of The Mana World.

- *

- *  The Mana World  is free software; you can redistribute  it and/or modify it

- *  under the terms of the GNU General  Public License as published by the Free

- *  Software Foundation; either version 2 of the License, or any later version.

- *

- *  The Mana  World is  distributed in  the hope  that it  will be  useful, but

- *  WITHOUT ANY WARRANTY; without even  the implied warranty of MERCHANTABILITY

- *  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for

- *  more details.

- *

- *  You should  have received a  copy of the  GNU General Public  License along

- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

- *

- *  $Id: controller.cpp 3191 2007-03-15 23:47:13Z crush_tmw $

- */

-

-#include "game-server/monster.hpp"

-

-#include "utils/logger.h"

-

-extern int worldTime;

-

-Monster::Monster():

-    Being(OBJECT_MONSTER, 65535),

-    mCountDown(0)

-{

-    mAttributes.resize(NB_ATTRIBUTES_CONTROLLED, 1); // TODO: fill with the real attributes

-}

-

-void Monster::update()

-{

-    /* Temporary "AI" behaviour that is purely artificial and not at all

-     * intelligent.

-     */

-    if (mCountDown == 0)

-    {

-        if (mAction != DEAD)

-        {

-            Point randomPos( rand() % 320 + 720,

-                                rand() % 320 + 840 );

-            setDestination(randomPos);

-            mCountDown = 10 + rand() % 10;

-

-            LOG_DEBUG("Setting new random destination " << randomPos.x << ","

-                      << randomPos.y << " for being " << getPublicID());

-        }

-        else

-        {

-            raiseUpdateFlags(UPDATEFLAG_REMOVE);

-        }

-    }

-    else

-    {

-        mCountDown--;

-    }

-}

-

-int Monster::damage(Damage damage)

-{

-    int damageValue = Being::damage(damage);

-

-    BattleLogEntry newEntry;

-

-    newEntry.timestamp = worldTime;

-    newEntry.attacker = damage.source;

-    newEntry.skill = damage.skill;

-    newEntry.value = damageValue;

-    battleLog.push_back(newEntry);

-

-    return damageValue;

-};

-

-void Monster::die()

-{

-    mCountDown = 50; //sets remove time to 5 seconds

-    Being::die();

-}

-

-WeaponStats Monster::getWeaponStats()

-{

-

-    WeaponStats weaponStats;

-

-    /*

-     * TODO: This should all be set by the monster database

-     */

-    weaponStats.piercing = 1;

-    weaponStats.element = ELEMENT_NEUTRAL;

-    weaponStats.skill = MONSTER_SKILL_WEAPON;

-

-    return weaponStats;

-}

-

-void Monster::calculateDerivedAttributes()

-{

-    Being::calculateDerivedAttributes();

-    /*

-     * Do any monster specific attribute calculation here

-     */

-}

diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp
index cc8df0bc..8c32e67f 100644
--- a/src/game-server/monster.hpp
+++ b/src/game-server/monster.hpp
@@ -20,8 +20,8 @@
  *  $Id: controller.h 3191 2007-03-15 23:47:13Z crush_tmw $

  */

 

-#ifndef _TMWSERV_CONTROLLER_H_

-#define _TMWSERV_CONTROLLER_H_

+#ifndef _TMWSERV_MONSTER_H_

+#define _TMWSERV_MONSTER_H_

 

 #include "game-server/being.hpp"

 

@@ -63,87 +63,4 @@ class Monster: public Being
         unsigned int mCountDown;

 };

 

-#endif // _TMWSERV_CONTROLLER_H_

-/*

- *  The Mana World Server

- *  Copyright 2004 The Mana World Development Team

- *

- *  This file is part of The Mana World.

- *

- *  The Mana World  is free software; you can redistribute  it and/or modify it

- *  under the terms of the GNU General  Public License as published by the Free

- *  Software Foundation; either version 2 of the License, or any later version.

- *

- *  The Mana  World is  distributed in  the hope  that it  will be  useful, but

- *  WITHOUT ANY WARRANTY; without even  the implied warranty of MERCHANTABILITY

- *  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for

- *  more details.

- *

- *  You should  have received a  copy of the  GNU General Public  License along

- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

- *

- *  $Id: controller.h 3191 2007-03-15 23:47:13Z crush_tmw $

- */

-

-#ifndef _TMWSERV_CONTROLLER_H_

-#define _TMWSERV_CONTROLLER_H_

-

-#include "game-server/being.hpp"

-

-#include "utils/safeptr.hpp"

-

-/**

- * The class for a fightable monster with its own AI

- */

-class Monster: public Being

-{

-    public:

-        /**

-         * Constructor.

-         */

-        Monster();

-

-        /**

-         * Performs one step of controller logic.

-         */

-        void update();

-

-        /**

-         * Kills the being

-         */

-        virtual void die();

-

-        /**

-         *

-         */

-        virtual int damage(Damage);

-

-    protected:

-        /**

-         * Gets the stats of the currently equipped weapon that are relevant

-         * for damage calculation

-         */

-        virtual WeaponStats getWeaponStats();

-

-        /**

-         * Calculates all derived attributes

-         */

-        void calculateDerivedAttributes();

-

-    private:

-        /** Count down till next random movement (temporary). */

-        unsigned int mCountDown;

-

-        /** List of targets and how much priority they have */

-        struct BattleLogEntry

-        {

-            int timestamp;

-            SafePtr attacker;

-            int skill;

-            int value;

-        };

-        std::list<BattleLogEntry> battleLog;

-};

-

-#endif // _TMWSERV_CONTROLLER_H_

+#endif // _TMWSERV_MONSTER_H_