Small lingering changes made while merging to 0.0.

4 files changed, 14 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d63d47c2..f37db10b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-21  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/properties.h, src/net/charserverhandler.cpp, src/being.h: Small
+	lingering changes made while merging to 0.0.
+
 2007-11-21  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/being.cpp: Added interpolation of tile offset for intermediate
diff --git a/src/being.h b/src/being.h
index fd17caf5..7c114cd9 100644
--- a/src/being.h
+++ b/src/being.h
@@ -236,7 +236,7 @@ class Being : public Sprite
         setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; }
 
         /**
-         * Gets the sprite id.
+         * Gets the being id.
          */
         Uint16
         getId() const { return mId; }
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 76311266..0082db4c 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -24,8 +24,8 @@
 #include "charserverhandler.h"
 
 #include "connection.h"
-#include "protocol.h"
 #include "messagein.h"
+#include "protocol.h"
 
 #include "../game.h"
 #include "../localplayer.h"
@@ -52,8 +52,7 @@ CharServerHandler::CharServerHandler():
     handledMessages = _messages;
 }
 
-void
-CharServerHandler::handleMessage(MessageIn &msg)
+void CharServerHandler::handleMessage(MessageIn &msg)
 {
     int slot;
     LocalPlayer *tempPlayer;
@@ -116,8 +115,7 @@ CharServerHandler::handleMessage(MessageIn &msg)
     }
 }
 
-void
-CharServerHandler::handleCharCreateResponse(MessageIn &msg)
+void CharServerHandler::handleCharCreateResponse(MessageIn &msg)
 {
     int errMsg = msg.readByte();
 
@@ -168,8 +166,7 @@ CharServerHandler::handleCharCreateResponse(MessageIn &msg)
         mCharCreateDialog->unlock();
 }
 
-void
-CharServerHandler::handleCharSelectResponse(MessageIn &msg)
+void CharServerHandler::handleCharSelectResponse(MessageIn &msg)
 {
     int errMsg = msg.readByte();
 
@@ -210,8 +207,7 @@ CharServerHandler::handleCharSelectResponse(MessageIn &msg)
     }
 }
 
-LocalPlayer*
-CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
+LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
 {
     LocalPlayer *tempPlayer = new LocalPlayer;
     slot = msg.readByte(); // character slot
diff --git a/src/properties.h b/src/properties.h
index 69950d56..93148bdf 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -49,7 +49,7 @@ class Properties
          *         doesn't exist.
          */
         const std::string&
-        getProperty(const std::string &name, const std::string &def = "")
+        getProperty(const std::string &name, const std::string &def = "") const
         {
             PropertyMap::const_iterator i = mProperties.find(name);
             return (i != mProperties.end()) ? i->second : def;
@@ -63,7 +63,7 @@ class Properties
          * @return the value of the given property, or 0.0f when it doesn't
          *         exist.
          */
-        float getFloatProperty(std::string const &name, float def = 0.0f)
+        float getFloatProperty(std::string const &name, float def = 0.0f) const
         {
             PropertyMap::const_iterator i = mProperties.find(name);
             float ret = def;
@@ -84,7 +84,7 @@ class Properties
          *         <code>false</code> otherwise.
          */
         bool
-        hasProperty(const std::string &name)
+        hasProperty(const std::string &name) const
         {
             return (mProperties.find(name) != mProperties.end());
         }