TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

1 files changed, 11 insertions, 10 deletions

diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index 554b261f2c..07c89aff25 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -30,6 +30,7 @@
 #include "tsage/core.h"
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
+#include "tsage/sound.h"
 
 namespace tSage {
 
@@ -65,7 +66,7 @@ class Scene15 : public Scene {
 public:
 	Action1 _action1;
 	SceneObject _object1;
-	SoundHandler _soundHandler;
+	ASound _soundHandler;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 };
@@ -97,7 +98,7 @@ public:
 	Action3 _action3;
 	Action4 _action4;
 	SceneObject _sceneObject1, _SceneObjectExt, _sceneObject3, _sceneObject4, _sceneObject5;
-	SoundHandler _sound;
+	ASound _sound;
 public:
 	Scene20();
 	virtual ~Scene20() {}
@@ -143,7 +144,7 @@ class Scene30 : public Scene {
 	};
 
 public:
-	SoundHandler _sound;
+	ASound _sound;
 	DisplayHotspot _groundHotspot, _wallsHotspot, _courtyardHotspot, _treeHotspot;
 	BeamObject _beam;
 	DoorObject _door;
@@ -232,7 +233,7 @@ public:
 	SpeakerQText _speakerQText;
 	SpeakerSText _speakerSText;
 	SpeakerGameText _speakerGameText;
-	SoundHandler _soundHandler;
+	ASound _soundHandler;
 	Action1 _action1;
 	Action2 _action2;
 	Action3 _action3;
@@ -387,9 +388,9 @@ public:
 	SceneObject _redLights;
 	Item1 _item1;
 	Item _item2, _item3, _item4, _item5, _item6;
-	SoundHandler _soundHandler1;
-	SoundHandler _soundHandler2;
-	SoundHandler _soundHandler3;
+	ASound _soundHandler1;
+	ASound _soundHandler2;
+	ASound _soundHandler3;
 
 	Scene60();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
@@ -423,7 +424,7 @@ public:
 	DisplayObject _object3, _object4, _object5;
 	SceneObject _object6;
 	DisplayHotspot _item1, _item2, _item3;
-	SoundHandler _soundHandler1, _soundHandler2;
+	ASound _soundHandler1, _soundHandler2;
 
 	Scene90();
 
@@ -441,7 +442,7 @@ class Scene95 : public Scene {
 public:
 	Action1 _action1;
 	SceneObject _object1, _object2, _object3;
-	SoundHandler _soundHandler;
+	ASound _soundHandler;
 
 	Scene95();
 	virtual void postInit(SceneObjectList *OwnerList);
@@ -503,7 +504,7 @@ public:
 	Action5 _action5;
 	GetBoxAction _getBoxAction;
 	Action7 _action7;
-	SoundHandler _soundHandler;
+	ASound _soundHandler;
 	Speaker _speaker1;
 	SpeakerQR _speakerQR;
 	SpeakerSL _speakerSL;