aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2011-05-11 17:19:26 +0200
committerMax Horn2011-05-13 11:47:10 +0200
commit0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab (patch)
treee02e5ec9605ffe71a960c21e753c59639ae0f85d /engines/scumm/resource.cpp
parent7be0305da9998568c9ac2538ab8c0ab4ca507bf1 (diff)
downloadscummvm-rg350-0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab.tar.gz
scummvm-rg350-0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab.tar.bz2
scummvm-rg350-0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab.zip
SCUMM: Clean up ResourceManager initialization
Diffstat (limited to 'engines/scumm/resource.cpp')
-rw-r--r--engines/scumm/resource.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 7f88def0ad..a00630f1ec 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -828,10 +828,18 @@ byte *ResourceManager::createResource(int type, int idx, uint32 size) {
return (byte *)ptr + sizeof(MemBlkHeader); /* skip header */
}
-ResourceManager::ResourceManager(ScummEngine *vm) {
- memset(this, 0, sizeof(ResourceManager));
- _vm = vm;
-// _allocatedSize = 0;
+ResourceManager::ResTypeData::ResTypeData() {
+ memset(this, 0, sizeof(this));
+}
+
+ResourceManager::ResTypeData::~ResTypeData() {
+}
+
+ResourceManager::ResourceManager(ScummEngine *vm) : _vm(vm) {
+ _allocatedSize = 0;
+ _maxHeapThreshold = 0;
+ _minHeapThreshold = 0;
+ _expireCounter = 0;
}
ResourceManager::~ResourceManager() {