From 17a51a235f9d79378c62d299b1aa1981f3b030b1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 2 Oct 2008 22:04:34 +0000
Subject: Merged loadHotSpotsMads() and loadHotSpotsM4()

svn-id: r34726
---
 engines/m4/scene.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/m4/scene.cpp')

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;
 }
-- 
cgit v1.2.3