diff options
author | Max Horn | 2011-05-13 14:40:45 +0200 |
---|---|---|
committer | Max Horn | 2011-05-13 14:40:45 +0200 |
commit | cf513e3ed64556d05383209664a0cd3909f45399 (patch) | |
tree | 87f5fcd83639fcd11390e64dfdc9ea674b1ba403 | |
parent | 749a1beb350d33fb1e48494134bdca70bc8c2ad8 (diff) | |
download | scummvm-rg350-cf513e3ed64556d05383209664a0cd3909f45399.tar.gz scummvm-rg350-cf513e3ed64556d05383209664a0cd3909f45399.tar.bz2 scummvm-rg350-cf513e3ed64556d05383209664a0cd3909f45399.zip |
SCUMM: Get rid of the unused Resource::_globSize field
-rw-r--r-- | engines/scumm/resource.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/resource.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 10f28516b3..85addeb9c3 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -520,7 +520,8 @@ int ScummEngine_v70he::readResTypeList(ResType type) { } for (idx = 0; idx < num; idx++) { - _res->_types[type]._resources[idx]._globsize = _fileHandle->readUint32LE(); + // The globsize is currently not being used + /*_res->_types[type]._resources[idx]._globsize =*/ _fileHandle->readUint32LE(); } return num; @@ -841,7 +842,6 @@ ResourceManager::Resource::Resource() { _status = 0; _roomno = 0; _roomoffs = 0; - _globsize = 0; } ResourceManager::Resource::~Resource() { diff --git a/engines/scumm/resource.h b/engines/scumm/resource.h index 49f5f07851..6e73732772 100644 --- a/engines/scumm/resource.h +++ b/engines/scumm/resource.h @@ -125,11 +125,6 @@ public: */ uint32 _roomoffs; - /** - * Occurs in HE 70+, but we don't use it for anything. - */ - uint32 _globsize; - public: Resource(); ~Resource(); |