diff options
| author | Filippos Karapetis | 2008-10-02 22:04:34 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-10-02 22:04:34 +0000 |
| commit | 17a51a235f9d79378c62d299b1aa1981f3b030b1 (patch) | |
| tree | a8687ba74dfc8f5c7f66f73f5bd18eb390a4d13f /engines/m4/scene.cpp | |
| parent | 2219ccf911f3cf9a6d9e5f732e0b6e47d1c8b313 (diff) | |
| download | scummvm-rg350-17a51a235f9d79378c62d299b1aa1981f3b030b1.tar.gz scummvm-rg350-17a51a235f9d79378c62d299b1aa1981f3b030b1.tar.bz2 scummvm-rg350-17a51a235f9d79378c62d299b1aa1981f3b030b1.zip | |
Merged loadHotSpotsMads() and loadHotSpotsM4()
svn-id: r34726
Diffstat (limited to 'engines/m4/scene.cpp')
| -rw-r--r-- | engines/m4/scene.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/m4/scene.cpp b/engines/m4/scene.cpp index a2c9d808db..c2de811d38 100644 --- a/engines/m4/scene.cpp +++ b/engines/m4/scene.cpp @@ -210,9 +210,9 @@ void Scene::loadSceneResources(int sceneNumber) { _sceneResources.parallax->clear(); _sceneResources.props->clear(); - _sceneResources.hotspots->loadHotSpotsM4(sceneS, _sceneResources.hotspotCount); - _sceneResources.parallax->loadHotSpotsM4(sceneS, _sceneResources.parallaxCount); - _sceneResources.props->loadHotSpotsM4(sceneS, _sceneResources.propsCount); + _sceneResources.hotspots->loadHotSpots(sceneS, _sceneResources.hotspotCount); + _sceneResources.parallax->loadHotSpots(sceneS, _sceneResources.parallaxCount); + _sceneResources.props->loadHotSpots(sceneS, _sceneResources.propsCount); // Note that toss() deletes the MemoryReadStream _vm->res()->toss(filename); @@ -235,7 +235,7 @@ void Scene::loadSceneHotSpotsMads(int sceneNumber) { // Clear current hotspot lists _sceneResources.hotspots->clear(); - _sceneResources.hotspots->loadHotSpotsMads(hotspotStream, _sceneResources.hotspotCount); + _sceneResources.hotspots->loadHotSpots(hotspotStream, _sceneResources.hotspotCount); delete hotspotStream; } |