aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorMax Horn2011-05-11 16:23:26 +0200
committerMax Horn2011-05-13 11:47:08 +0200
commit45e65d7ea04b10cf7bb5282bd66b8df609700a63 (patch)
tree9600fbf0670d552e5b68b7f55c446c0fb5c9596d /engines/scumm/scumm.cpp
parentb37463fe5921420a9081aa6c5cf7588d52b41e78 (diff)
downloadscummvm-rg350-45e65d7ea04b10cf7bb5282bd66b8df609700a63.tar.gz
scummvm-rg350-45e65d7ea04b10cf7bb5282bd66b8df609700a63.tar.bz2
scummvm-rg350-45e65d7ea04b10cf7bb5282bd66b8df609700a63.zip
SCUMM: Refactor how resource (types) are srepresented
Previously, we had a couple of arrays of size N (where N = number of resource types), one for each attribute of a resource type (such as as the number of resources of that type. Now, we have one array of size N, whose elements are a record aggregating all the attributes of each resource type.
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 70d8f0dab1..d5c2b2eeb9 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1185,7 +1185,7 @@ Common::Error ScummEngine::init() {
resetScummVars();
if (_imuse) {
- _imuse->setBase(_res->address[rtSound]);
+ _imuse->setBase(_res->_types[rtSound].address);
}
if (_game.version >= 5 && _game.version <= 7)
@@ -2462,7 +2462,7 @@ void ScummEngine::restart() {
resetScummVars();
if (_imuse) {
- _imuse->setBase(_res->address[rtSound]);
+ _imuse->setBase(_res->_types[rtSound].address);
}
// Reinit sound engine