From 0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 11 May 2011 17:19:26 +0200 Subject: SCUMM: Clean up ResourceManager initialization --- engines/scumm/resource.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'engines/scumm/resource.cpp') 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() { -- cgit v1.2.3