diff options
author | Filippos Karapetis | 2009-08-18 09:12:41 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-08-18 09:12:41 +0000 |
commit | 65ac355efa2cb792278e34de5c397ab11c8a46e3 (patch) | |
tree | 6ccefc71fb3a8a03050be104bf54ebbff43e840d /engines/sci/resource.cpp | |
parent | c9402c5559dee28ccc99fb7abca5dc83ec46a330 (diff) | |
download | scummvm-rg350-65ac355efa2cb792278e34de5c397ab11c8a46e3.tar.gz scummvm-rg350-65ac355efa2cb792278e34de5c397ab11c8a46e3.tar.bz2 scummvm-rg350-65ac355efa2cb792278e34de5c397ab11c8a46e3.zip |
Removed the maxMemory parameter of the resource manager and replaced it with a define
svn-id: r43503
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r-- | engines/sci/resource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 7b201d0506..2ca198954a 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -396,8 +396,7 @@ void ResourceManager::freeResourceSources() { _sources.clear(); } -ResourceManager::ResourceManager(int maxMemory) { - _maxMemory = maxMemory; +ResourceManager::ResourceManager() { _memoryLocked = 0; _memoryLRU = 0; _LRU.clear(); @@ -506,7 +505,7 @@ void ResourceManager::printLRU() { } void ResourceManager::freeOldResources() { - while (_maxMemory < _memoryLRU) { + while (MAX_MEMORY < _memoryLRU) { assert(!_LRU.empty()); Resource *goner = *_LRU.reverse_begin(); removeFromLRU(goner); @@ -614,6 +613,7 @@ ResourceManager::ResVersion ResourceManager::detectMapVersion() { break; } } + if (file.isOpen() == false) { error("Failed to open resource map file"); return kResVersionUnknown; |