summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-17 22:28:51 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-17 22:28:51 +0300
commiteeb6f3b831e707b413a10de53c7f72139e73f963 (patch)
tree1a6eb21cf6ddd74111cda9f94129846ecea7b083
parente29c975369db3c0999de16d6a4fb529e4490d24e (diff)
downloadplus-eeb6f3b831e707b413a10de53c7f72139e73f963.tar.gz
plus-eeb6f3b831e707b413a10de53c7f72139e73f963.tar.bz2
plus-eeb6f3b831e707b413a10de53c7f72139e73f963.tar.xz
plus-eeb6f3b831e707b413a10de53c7f72139e73f963.zip
Remove default parameters from resourcemanager.
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/progs/manaplus/client.cpp2
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp2
-rw-r--r--src/resources/resourcemanager/resourcemanager.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3fab73d0a..f87b8796f 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -360,7 +360,7 @@ void Gui::slowLogic()
if (time > mTime10 || mTime10 - time > 10)
{
mTime10 = time + 10;
- ResourceManager::cleanOrphans();
+ ResourceManager::cleanOrphans(false);
guiInput->simulateMouseMove();
}
}
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 9bc4b03cb..65d5fde89 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -1019,7 +1019,7 @@ int Client::gameExec()
delete2(mGame);
assertListener = new AssertListener;
Game::clearInstance();
- ResourceManager::cleanOrphans();
+ ResourceManager::cleanOrphans(false);
Party::clearParties();
Guild::clearGuilds();
NpcDialog::clearDialogs();
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 98c9baab5..787d84545 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -174,7 +174,7 @@ void deleteResourceManager()
++iter;
}
}
- clearDeleted();
+ clearDeleted(true);
clearScheduled();
mDestruction = false;
}
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index 1ca9aecf1..6e4e733a7 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -71,7 +71,7 @@ namespace ResourceManager
*/
void release(Resource *const res);
- void clearDeleted(const bool full = true);
+ void clearDeleted(const bool full);
void decRefDelete(Resource *const res);
@@ -99,7 +99,7 @@ namespace ResourceManager
const std::set<Resource*> &getDeletedResources() A_WARN_UNUSED;
#endif // defined(DEBUG_DUMP_LEAKS) || defined(UNITTESTS)
- bool cleanOrphans(const bool always = false);
+ bool cleanOrphans(const bool always);
void cleanProtected();