diff options
Diffstat (limited to 'src/game-server/being.cpp')
| -rw-r--r-- | src/game-server/being.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 238d63e6..b1e6063b 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -18,22 +18,19 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include <cassert> - #include "game-server/being.h" -#include "common/configuration.h" +#include <cassert> + #include "common/defines.h" +#include "game-server/actorcomponent.h" #include "game-server/attributemanager.h" -#include "game-server/charactercomponent.h" -#include "game-server/collisiondetection.h" #include "game-server/mapcomposite.h" -#include "game-server/effect.h" #include "game-server/statuseffect.h" #include "game-server/statusmanager.h" +#include "scripting/scriptmanager.h" #include "utils/logger.h" #include "utils/speedconv.h" -#include "scripting/scriptmanager.h" Script::Ref BeingComponent::mRecalculateDerivedAttributesCallback; @@ -363,8 +360,7 @@ void BeingComponent::setAttribute(Entity &entity, void BeingComponent::createAttribute(AttributeInfo *attributeInfo) { - mAttributes.insert(std::pair<AttributeInfo *, Attribute> - (attributeInfo, Attribute(attributeInfo))); + mAttributes.insert(std::make_pair(attributeInfo, Attribute(attributeInfo))); } const Attribute *BeingComponent::getAttribute(AttributeInfo *attribute) const |