aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/scumm/resource.cpp16
-rw-r--r--engines/scumm/resource.h6
2 files changed, 17 insertions, 5 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() {
diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h
index 8540ef3138..f1bcc14cb6 100644
--- a/engines/scumm/resource.h
+++ b/engines/scumm/resource.h
@@ -95,7 +95,11 @@ public:
public:
byte *roomno;
uint32 *roomoffs;
- uint32 *globsize;
+ uint32 *globsize; ///!< Occurs in HE 70+, but we don't use it for anything.
+
+ public:
+ ResTypeData();
+ ~ResTypeData();
};
ResTypeData _types[rtNumTypes];