Merge branch 'bugfix-lambda' into multiple-rooms

Conflicts:
	server/server_methods.cpp
This commit is contained in:
Kayne Ruse
2015-01-02 07:10:29 +11:00
13 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -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)) {