[Scummvm-cvs-logs] scummvm master -> fc742abae797064656cbaaf8054ee7a7e2beb927

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fc742abae7 TSAGE: Renamings for R2R Miranda's cell


Commit: fc742abae797064656cbaaf8054ee7a7e2beb927
    https://github.com/scummvm/scummvm/commit/fc742abae797064656cbaaf8054ee7a7e2beb927
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-02T13:58:44-07:00

Commit Message:
TSAGE: Renamings for R2R Miranda's cell

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes3.cpp
    engines/tsage/ringworld2/ringworld2_scenes3.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index da82c3c..4603016 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -477,7 +477,7 @@ bool Scene3150::FoodTray::startAction(CursorType action, Event &event) {
 	return true;
 }
 
-bool Scene3150::Actor6::startAction(CursorType action, Event &event) {
+bool Scene3150::ToiletFlush::startAction(CursorType action, Event &event) {
 	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
 
 	if (action == CURSOR_USE) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 9f519aa..8bf6eb5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -117,7 +117,7 @@ class Scene3150 : public SceneExt {
 	class FoodTray : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Actor6 : public SceneActor {
+	class ToiletFlush : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 	class AirVent : public SceneActor {
@@ -144,7 +144,7 @@ public:
 	SceneActor _bulbOrWire;
 	Water _water;
 	FoodTray _foodTray;
-	Actor6 _toiletFlush;
+	ToiletFlush _toiletFlush;
 	AirVent _airVent;
 	DoorExit _doorExit;
 	VentExit _ventExit;