Changed Item to a component of Actor

Items also have positions, so the ItemComponent only makes sense as part of
an Actor. Later on it will probably be part of an entity that also has an
ActorComponent.

Since it was annoying to update all the places where items were created,
I've introduced a function for this.

The component types are now prefixed with "CT_" because I wanted to introduce
an 'Item' namespace which would otherwise be conflicting. The component types
enum isn't used much in the code so it can look a bit ugly.

Reviewed-by: Yohann Ferreira

1 files changed, 13 insertions, 11 deletions

diff --git a/src/game-server/state.h b/src/game-server/state.h
index 34eb8814..c518972f 100644
--- a/src/game-server/state.h
+++ b/src/game-server/state.h
@@ -18,16 +18,18 @@
  *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SERVER_STATE_H
-#define SERVER_STATE_H
+#ifndef STATE_H
+#define STATE_H
+
+#include "utils/point.h"
 
 #include <string>
 
-class MapComposite;
-class Entity;
 class Actor;
 class Character;
-
+class Entity;
+class ItemClass;
+class MapComposite;
 
 namespace GameState
 {
@@ -107,21 +109,21 @@ namespace GameState
     void sayToAll(const std::string &text);
 
     /**
-     * Gets the cached value of a global script variable
+     * Gets the cached value of a global script variable.
      */
     std::string getVariable(const std::string &key);
 
     /**
      * Changes a global script variable and notifies the database server
-     * about the change
+     * about the change.
      */
-    void setVariable (const std::string &key, const std::string &value);
+    void setVariable(const std::string &key, const std::string &value);
 
     /**
      * Changes a global variable without notifying the database server
-     * about the change
+     * about the change.
      */
-    void setVariableFromDbserver (const std::string &key, const std::string &value);
+    void setVariableFromDbserver(const std::string &key, const std::string &value);
 
     /**
      * Informs all maps about the change of a variable so the maps can call
@@ -131,4 +133,4 @@ namespace GameState
                                const std::string &value);
 }
 
-#endif
+#endif // STATE_H