General code cleanups

* Overall includes cleanup
* Use std::make_pair
* Make some functions const

1 files changed, 7 insertions, 6 deletions

diff --git a/src/game-server/charactercomponent.cpp b/src/game-server/charactercomponent.cpp
index 68ecc792..4f2244ac 100644
--- a/src/game-server/charactercomponent.cpp
+++ b/src/game-server/charactercomponent.cpp
@@ -21,12 +21,13 @@
 #include "game-server/charactercomponent.h"
 
 #include "common/configuration.h"
+#include "game-server/abilitycomponent.h"
 #include "game-server/accountconnection.h"
+#include "game-server/actorcomponent.h"
 #include "game-server/attributemanager.h"
+#include "game-server/being.h"
 #include "game-server/buysell.h"
 #include "game-server/inventory.h"
-#include "game-server/item.h"
-#include "game-server/itemmanager.h"
 #include "game-server/gamehandler.h"
 #include "game-server/map.h"
 #include "game-server/mapcomposite.h"
@@ -207,9 +208,9 @@ void CharacterComponent::deserialize(Entity &entity, MessageIn &msg)
     poss.setEquipment(equipmentData);
 }
 
-void CharacterComponent::serialize(Entity &entity, MessageOut &msg)
+void CharacterComponent::serialize(Entity &entity, MessageOut &msg) const
 {
-    auto *beingComponent = entity.getComponent<BeingComponent>();
+    const auto *beingComponent = entity.getComponent<BeingComponent>();
 
     // general character properties
     msg.writeInt8(getAccountLevel());
@@ -268,8 +269,8 @@ void CharacterComponent::serialize(Entity &entity, MessageOut &msg)
 
     // questlog
     msg.writeInt16(mQuestlog.size());
-    for (auto questlogIt : mQuestlog) {
-        QuestInfo &quest = questlogIt.second;
+    for (const auto &questlogIt : mQuestlog) {
+        const QuestInfo &quest = questlogIt.second;
         msg.writeInt16(quest.id);
         msg.writeInt8(quest.state);
         msg.writeString(quest.title);