Some general cleanups and merged Being::perform() into update()

The main change here is to remove the separate calling of 'perform' on all
beings, and rather rely on the beings to do whatever they were doing in
that function when the virtual 'update' function is called.

Reviewed-by: Yohann Ferreira

1 files changed, 5 insertions, 8 deletions

diff --git a/src/game-server/character.h b/src/game-server/character.h
index f54d4ec..eb8e432 100644
--- a/src/game-server/character.h
+++ b/src/game-server/character.h
@@ -21,10 +21,6 @@
 #ifndef CHARACTER_H
 #define CHARACTER_H
 
-#include <map>
-#include <string>
-#include <vector>
-
 #include "common/defines.h"
 #include "common/inventorydata.h"
 #include "common/manaserv_protocol.h"
@@ -32,6 +28,10 @@
 #include "scripting/script.h"
 #include "utils/logger.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 class BuySell;
 class GameClient;
 class MessageIn;
@@ -69,10 +69,7 @@ class Character : public Being
          */
         void update();
 
-        /**
-         * Perform actions.
-         */
-        void perform();
+        void processAttacks();
 
         /**
          * Executes the global die script and calls the base class function