Merge branch 'master' into lpc2012

Conflicts:
	gameserver.cbp
	src/account-server/accounthandler.cpp
	src/game-server/attack.cpp
	src/game-server/attack.h
	src/game-server/being.cpp
	src/game-server/being.h
	src/game-server/character.cpp
	src/game-server/character.h
	src/game-server/inventory.cpp
	src/game-server/item.h
	src/game-server/monster.cpp
	src/game-server/monster.h

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index cdea12a8..4c7dc66a 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -92,6 +92,7 @@ void MapZone::insert(Actor *obj)
         default:
         {
             objects.push_back(obj);
+            break;
         }
     }
 }
@@ -117,6 +118,7 @@ void MapZone::remove(Actor *obj)
         {
             i = objects.begin() + nbMovingObjects;
             i_end = objects.end();
+            break;
         }
     }
     i = std::find(i, i_end, obj);
@@ -464,7 +466,8 @@ MapComposite::MapComposite(int id, const std::string &name):
     mMap(0),
     mContent(0),
     mName(name),
-    mID(id)
+    mID(id),
+    mPvPRules(PVP_NONE)
 {
 }