aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2/ringworld2_scenes2.h
diff options
context:
space:
mode:
authorStrangerke2011-12-30 12:08:41 +0100
committerStrangerke2011-12-30 16:56:18 +0100
commit211eb00e8725e36b8c802a9b7b9b9812e9c3053e (patch)
tree563fb105428389da6dda05ef82683c4cb3bcea6d /engines/tsage/ringworld2/ringworld2_scenes2.h
parenta473934abd2dc4d402963c6f43cec4147ab71e82 (diff)
downloadscummvm-rg350-211eb00e8725e36b8c802a9b7b9b9812e9c3053e.tar.gz
scummvm-rg350-211eb00e8725e36b8c802a9b7b9b9812e9c3053e.tar.bz2
scummvm-rg350-211eb00e8725e36b8c802a9b7b9b9812e9c3053e.zip
TSAGE: R2R - Cleanup: reorganise speakers, add ancestor classes where speaker declaration is common to several speakers.
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_scenes2.h')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes2.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index d007f7e9f5..281d1da366 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -106,8 +106,8 @@ class Scene2350 : public SceneExt {
};
public:
- SpeakerQuinn2350 _quinnSpeaker;
- SpeakerPharisha2350 _pharishaSpeaker;
+ SpeakerQuinn _quinnSpeaker;
+ SpeakerPharisha _pharishaSpeaker;
NamedHotspot _item1;
SceneActor _actor1;
Actor2 _actor2;
@@ -368,9 +368,9 @@ class Scene2500 : public SceneExt {
virtual void changeScene();
};
public:
- SpeakerQuinn2500 _quinnSpeaker;
- SpeakerSeeker2500 _seekerSpeaker;
- SpeakerMiranda2500 _mirandaSpeaker;
+ SpeakerQuinn _quinnSpeaker;
+ SpeakerSeeker _seekerSpeaker;
+ SpeakerMiranda _mirandaSpeaker;
SpeakerWebbster2500 _webbsterSpeaker;
NamedHotspot _item1;
SceneActor _actor1;
@@ -665,6 +665,7 @@ public:
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void signal();
};
+
} // End of namespace Ringworld2
} // End of namespace TsAGE