diff options
| author | Torbjörn Andersson | 2003-11-03 07:47:42 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-11-03 07:47:42 +0000 |
| commit | b3b0118292df23a5d4bf0e9b32a56fb4ddfba1ea (patch) | |
| tree | df5851f12ebb885d05db421078980e122698243e /sword2/mem_view.cpp | |
| parent | 0ece8aab8b03e0aead5f18e33797ec85294bf158 (diff) | |
| download | scummvm-rg350-b3b0118292df23a5d4bf0e9b32a56fb4ddfba1ea.tar.gz scummvm-rg350-b3b0118292df23a5d4bf0e9b32a56fb4ddfba1ea.tar.bz2 scummvm-rg350-b3b0118292df23a5d4bf0e9b32a56fb4ddfba1ea.zip | |
The resource and memory managers are now created dynamically.
Renamed the resource manager's open/close methods openResource() and
closeResource() to avoid confusion. (It was I who originally shortened
their names to open() and close(), but I've changed my mind now.)
Moved more stuff into Sword2Engine.
svn-id: r11088
Diffstat (limited to 'sword2/mem_view.cpp')
| -rw-r--r-- | sword2/mem_view.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp index 43befd36b5..80081023b5 100644 --- a/sword2/mem_view.cpp +++ b/sword2/mem_view.cpp @@ -44,9 +44,9 @@ void MemoryManager::displayMemory(void) { j = _baseMemBlock; do { if (_memList[j].uid < 65536) { - file_header = (_standardHeader*) res_man.open(_memList[j].uid); + file_header = (_standardHeader*) res_man->openResource(_memList[j].uid); // close immediately so give a true count - res_man.close(_memList[j].uid); + res_man->closeResource(_memList[j].uid); debug(5, "view %d", _memList[j].uid); @@ -73,10 +73,10 @@ void MemoryManager::displayMemory(void) { _memList[j].size / 1024, (_memList[j].size * 100) / _totalFreeMemory, _memList[j].uid, - res_man.fetchCluster(_memList[j].uid), + res_man->fetchCluster(_memList[j].uid), file_header->name, - res_man.fetchAge(_memList[j].uid), - res_man.fetchCount(_memList[j].uid)); + res_man->fetchAge(_memList[j].uid), + res_man->fetchCount(_memList[j].uid)); } else Debug_Printf(" %d is an illegal resource\n", _memList[j].uid); } else { @@ -160,7 +160,7 @@ void MemoryManager::memoryString(char *string) { sprintf(string, "locked(%u)+float(%u)+free(%u) = %u/%u blocks (%u%% used)(cur %uk)", mem_locked, mem_floating, mem_free, blocksUsed, MAX_mem_blocks, - percent, (res_man.fetchUsage() / 1024)); + percent, (res_man->fetchUsage() / 1024)); } } // End of namespace Sword2 |