Merge branch 'bugfix-lambda' into multiple-rooms

Conflicts:
	server/server_methods.cpp

server/accounts/account_manager.cpp

@@ -200,7 +200,7 @@ void AccountManager::UnloadAll() {
 	elementMap.clear();
 }
 
-void AccountManager::UnloadIf(std::function<bool(std::pair<const int, AccountData>)> fn) {
+void AccountManager::UnloadIf(std::function<bool(std::pair<const int, AccountData const&>)> fn) {
 	//replicate std::remove_if, using custom code
 	std::map<int, AccountData>::iterator it = elementMap.begin();
 	while (it != elementMap.end()) {

server/accounts/account_manager.hpp

@@ -44,7 +44,7 @@ public:
 	void Delete(int uid);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, AccountData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, AccountData const&>)> fn);
 
 	//accessors and mutators
 	AccountData* Get(int uid);

server/characters/character_manager.cpp

@@ -229,7 +229,7 @@ void CharacterManager::UnloadAll() {
 	elementMap.clear();
 }
 
-void CharacterManager::UnloadIf(std::function<bool(std::pair<const int, CharacterData>)> fn) {
+void CharacterManager::UnloadIf(std::function<bool(std::pair<const int, CharacterData const&>)> fn) {
 	std::map<int, CharacterData>::iterator it = elementMap.begin();
 	while (it != elementMap.end()) {
 		if (fn(*it)) {

server/characters/character_manager.hpp

@@ -44,7 +44,7 @@ public:
 	void Delete(int uid);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, CharacterData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, CharacterData const&>)> fn);
 
 	//accessors and mutators
 	CharacterData* Get(int uid);

server/clients/client_manager.cpp

@@ -73,7 +73,7 @@ void ClientManager::UnloadAll() {
 	elementMap.clear();
 }
 
-void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData>)> fn) {
+void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData const&>)> fn) {
 	std::map<int, ClientData>::iterator it = elementMap.begin();
 	while (it != elementMap.end()) {
 		if (fn(*it)) {

server/clients/client_manager.hpp

@@ -42,7 +42,7 @@ public:
 	void Unload(int uid);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, ClientData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, ClientData const&>)> fn);
 
 	//accessors & mutators
 	ClientData* Get(int uid);

server/monsters/monster_manager.cpp

@@ -45,7 +45,7 @@ void MonsterManager::UnloadAll() {
 	//TODO
 }
 
-void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData>)> fn) {
+void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData const&>)> fn) {
 	//TODO
 }
 

server/monsters/monster_manager.hpp

@@ -47,7 +47,7 @@ public:
 	void Delete(int uid);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, MonsterData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, MonsterData const&>)> fn);
 
 	//accessors & mutators
 	MonsterData* Get(int uid);

server/rooms/room_manager.cpp

@@ -90,7 +90,7 @@ void RoomManager::UnloadAll() {
 	elementMap.clear();
 }
 
-void RoomManager::UnloadIf(std::function<bool(std::pair<const int,RoomData>)> fn) {
+void RoomManager::UnloadIf(std::function<bool(std::pair<const int, RoomData const&>)> fn) {
 	std::map<int, RoomData>::iterator it = elementMap.begin();
 	while (it != elementMap.end()) {
 		if (fn(*it)) {

server/rooms/room_manager.hpp

@@ -44,7 +44,7 @@ public:
 	void PopEntity(Entity* entity);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int,RoomData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, RoomData const&>)> fn);
 
 	//accessors and mutators
 	RoomData* Get(int uid);

server/server_methods.cpp

@@ -97,7 +97,7 @@ void ServerApplication::HandleShutdownRequest(ClientPacket* const argPacket) {
 //-------------------------
 
 void ServerApplication::FullClientUnload(int index) {
-	clientMgr.UnloadIf([&](std::pair<const int, ClientData> client) -> bool {
+	clientMgr.UnloadIf([&](std::pair<const int, ClientData const&> client) -> bool {
 		//skip the wrong clients
 		if (client.first != index) {
 			return false;
@@ -120,7 +120,7 @@ void ServerApplication::FullClientUnload(int index) {
 }
 
 void ServerApplication::FullAccountUnload(int index) {
-	accountMgr.UnloadIf([&](std::pair<const int, AccountData> account) -> bool {
+	accountMgr.UnloadIf([&](std::pair<const int, AccountData const&> account) -> bool {
 		//skip the wrong accounts
 		if (account.first != index) {
 			return false;
@@ -144,7 +144,7 @@ void ServerApplication::FullAccountUnload(int index) {
 
 void ServerApplication::FullCharacterUnload(int index) {
 	//BUG: #38 UnloadIf() lambas are taking COPIES of data structures, rather than the structures themselves
-	characterMgr.UnloadIf([&](std::pair<const int, CharacterData> character) -> bool {
+	characterMgr.UnloadIf([&](std::pair<const int, CharacterData const&> character) -> bool {
 		//skip the wrong characters
 		if (character.first != index) {
 			return false;

server/waypoints/waypoint_manager.cpp

@@ -45,7 +45,7 @@ void WaypointManager::UnloadAll() {
 	//TODO
 }
 
-void WaypointManager::UnloadIf(std::function<bool(std::pair<const int, WaypointData>)> fn) {
+void WaypointManager::UnloadIf(std::function<bool(std::pair<const int, WaypointData const&>)> fn) {
 	//TODO
 }
 

server/waypoints/waypoint_manager.hpp

@@ -47,7 +47,7 @@ public:
 	void Delete(int uid);
 
 	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, WaypointData>)> fn);
+	void UnloadIf(std::function<bool(std::pair<const int, WaypointData const&>)> fn);
 
 	//accessors & mutators
 	WaypointData* Get(int uid);