Moved AttributeInfo into a seperate file

5 files changed, 8 insertions, 8 deletions

diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index 5ce55d13..6d22774a 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -113,7 +113,7 @@ void LuaScript::push(const std::list<InventoryItem> &itemList)
     ++nbArgs;
 }
 
-void LuaScript::push(AttributeManager::AttributeInfo *attributeInfo)
+void LuaScript::push(AttributeInfo *attributeInfo)
 {
     assert(nbArgs >= 0);
     ::push(mCurrentState, attributeInfo);
diff --git a/src/scripting/luascript.h b/src/scripting/luascript.h
index a30cbf08..2d47d8ea 100644
--- a/src/scripting/luascript.h
+++ b/src/scripting/luascript.h
@@ -57,7 +57,7 @@ class LuaScript : public Script
         void push(const std::string &);
         void push(Entity *);
         void push(const std::list<InventoryItem> &itemList);
-        void push(AttributeManager::AttributeInfo *);
+        void push(AttributeInfo *);
 
         int execute(const Context &context = Context());
 
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index 5a0cf883..ed277ee0 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -226,9 +226,9 @@ AbilityManager::AbilityInfo *checkAbility(lua_State *s, int p)
     return abilityInfo;
 }
 
-AttributeManager::AttributeInfo *checkAttribute(lua_State *s, int p)
+AttributeInfo *checkAttribute(lua_State *s, int p)
 {
-    AttributeManager::AttributeInfo *attributeInfo;
+    AttributeInfo *attributeInfo;
 
     switch (lua_type(s, p))
     {
diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h
index 03c4666e..45e075f1 100644
--- a/src/scripting/luautil.h
+++ b/src/scripting/luautil.h
@@ -165,7 +165,7 @@ typedef LuaUserData<MapObject> LuaMapObject;
 typedef LuaUserData<MonsterClass> LuaMonsterClass;
 typedef LuaUserData<StatusEffect> LuaStatusEffect;
 typedef LuaUserData<AbilityManager::AbilityInfo> LuaAbilityInfo;
-typedef LuaUserData<AttributeManager::AttributeInfo> LuaAttributeInfo;
+typedef LuaUserData<AttributeInfo> LuaAttributeInfo;
 
 Script *                               getScript(lua_State *s);
 
@@ -180,7 +180,7 @@ Entity *                               checkMonster(lua_State *s, int p);
 MonsterClass *                         checkMonsterClass(lua_State *s, int p);
 Entity *                               checkNpc(lua_State *s, int p);
 AbilityManager::AbilityInfo *          checkAbility(lua_State *s, int p);
-AttributeManager::AttributeInfo *      checkAttribute(lua_State *s, int p);
+AttributeInfo *      checkAttribute(lua_State *s, int p);
 unsigned char                          checkWalkMask(lua_State *s, int p);
 
 MapComposite *  checkCurrentMap(lua_State *s, Script *script = 0);
@@ -220,7 +220,7 @@ inline void push(lua_State *s, MonsterClass *val)
     LuaMonsterClass::push(s, val);
 }
 
-inline void push(lua_State *s, AttributeManager::AttributeInfo *val)
+inline void push(lua_State *s, AttributeInfo *val)
 {
     LuaAttributeInfo::push(s, val);
 }
diff --git a/src/scripting/script.h b/src/scripting/script.h
index 1f8c415e..d4b51345 100644
--- a/src/scripting/script.h
+++ b/src/scripting/script.h
@@ -195,7 +195,7 @@ class Script : public sigc::trackable
          */
         virtual void push(const std::list<InventoryItem> &itemList) = 0;
 
-        virtual void push(AttributeManager::AttributeInfo *) = 0;
+        virtual void push(AttributeInfo *) = 0;
 
         /**
          * Executes the function being prepared.