diff options
| author | Paul Gilbert | 2010-07-24 05:56:06 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-07-24 05:56:06 +0000 |
| commit | ec460ca2cabf426a6b3591d32a68872897c00ac3 (patch) | |
| tree | c6795daeef0fd6d00000d01058042a006fd0b4bc /engines/m4/m4_scene.cpp | |
| parent | cd66b7d11b4a1f3082b62d440e1b010a40be94b5 (diff) | |
| download | scummvm-rg350-ec460ca2cabf426a6b3591d32a68872897c00ac3.tar.gz scummvm-rg350-ec460ca2cabf426a6b3591d32a68872897c00ac3.tar.bz2 scummvm-rg350-ec460ca2cabf426a6b3591d32a68872897c00ac3.zip | |
M4: Implemented lots of support code for pre-action handling
svn-id: r51235
Diffstat (limited to 'engines/m4/m4_scene.cpp')
| -rw-r--r-- | engines/m4/m4_scene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/m4/m4_scene.cpp b/engines/m4/m4_scene.cpp index 0c984af448..475fdba653 100644 --- a/engines/m4/m4_scene.cpp +++ b/engines/m4/m4_scene.cpp @@ -45,7 +45,7 @@ M4Scene::M4Scene(M4Engine *vm): _sceneResources(), Scene(vm, &_sceneResources) { _sceneResources.hotspots = new HotSpotList(); _sceneResources.parallax = new HotSpotList(); - _sceneResources.props = new HotSpotList(); + _sceneResources.dynamicHotspots = new HotSpotList(); _interfaceSurface = new M4InterfaceView(vm); } @@ -74,9 +74,9 @@ void M4Scene::loadSceneResources(int sceneNumber) { if (sceneS != NULL) { sceneS->read(_sceneResources.artBase, MAX_CHK_FILENAME_SIZE); sceneS->read(_sceneResources.pictureBase, MAX_CHK_FILENAME_SIZE); - _sceneResources.hotspotCount = sceneS->readUint32LE(); + int hotspotCount = sceneS->readUint32LE(); _sceneResources.parallaxCount = sceneS->readUint32LE(); - _sceneResources.propsCount = sceneS->readUint32LE(); + int dynHotspotCount = sceneS->readUint32LE(); _sceneResources.frontY = sceneS->readUint32LE(); _sceneResources.backY = sceneS->readUint32LE(); _sceneResources.frontScale = sceneS->readUint32LE(); @@ -99,11 +99,11 @@ void M4Scene::loadSceneResources(int sceneNumber) { // Clear current hotspot lists _sceneResources.hotspots->clear(); _sceneResources.parallax->clear(); - _sceneResources.props->clear(); + _sceneResources.dynamicHotspots->clear(); - _sceneResources.hotspots->loadHotSpots(sceneS, _sceneResources.hotspotCount); + _sceneResources.hotspots->loadHotSpots(sceneS, hotspotCount); _sceneResources.parallax->loadHotSpots(sceneS, _sceneResources.parallaxCount); - _sceneResources.props->loadHotSpots(sceneS, _sceneResources.propsCount); + _sceneResources.dynamicHotspots->loadHotSpots(sceneS, dynHotspotCount); // Note that toss() deletes the MemoryReadStream _vm->res()->toss(filename); |