Merge branch 'bugfix-lambda' into multiple-rooms

Conflicts: server/server_methods.cpp
2015-01-02 07:10:29 +11:00
parent b2452fb6fe eb897c81e8
commit e4d7ece99c
13 changed files with 15 additions and 15 deletions
@@ -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)) {