[Scummvm-cvs-logs] scummvm master -> 3f8027a67f6283c9cf8f64fb7d296536419cd97d

Strangerke Strangerke at scummvm.org
Mon Nov 11 15:18:13 CET 2013


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:
3f8027a67f TSAGE: Ringworld - Renaming in scene 15


Commit: 3f8027a67f6283c9cf8f64fb7d296536419cd97d
    https://github.com/scummvm/scummvm/commit/3f8027a67f6283c9cf8f64fb7d296536419cd97d
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-11T06:13:44-08:00

Commit Message:
TSAGE: Ringworld - Renaming in scene 15

Changed paths:
    engines/tsage/ringworld/ringworld_scenes1.cpp
    engines/tsage/ringworld/ringworld_scenes1.h



diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp
index ad6d945..303da81 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes1.cpp
@@ -228,13 +228,13 @@ void Scene15::Action1::signal() {
 	case 2: {
 		SceneItem::display(15, 1, SET_Y, 20, SET_FONT, 2, SET_BG_COLOR, -1, SET_EXT_BGCOLOR, 7,
 				SET_WIDTH, 320, SET_KEEP_ONSCREEN, 1, LIST_END);
-		scene->_object1.postInit();
-		scene->_object1.setVisage(15);
-		scene->_object1.setPosition(Common::Point(160, -10));
-		scene->_object1.animate(ANIM_MODE_2, NULL);
+		scene->_ship.postInit();
+		scene->_ship.setVisage(15);
+		scene->_ship.setPosition(Common::Point(160, -10));
+		scene->_ship.animate(ANIM_MODE_2, NULL);
 		Common::Point pt(160, 100);
 		NpcMover *mover = new NpcMover();
-		scene->_object1.addMover(mover, &pt, this);
+		scene->_ship.addMover(mover, &pt, this);
 		scene->_soundHandler.play(7);
 		break;
 	}
@@ -248,8 +248,8 @@ void Scene15::Action1::signal() {
 void Scene15::Action1::dispatch() {
 	Scene15 *scene = (Scene15 *)g_globals->_sceneManager._scene;
 
-	if (scene->_object1._position.y < 100)
-		scene->_object1.changeZoom(100 - scene->_object1._position.y);
+	if (scene->_ship._position.y < 100)
+		scene->_ship.changeZoom(100 - scene->_ship._position.y);
 	Action::dispatch();
 }
 
diff --git a/engines/tsage/ringworld/ringworld_scenes1.h b/engines/tsage/ringworld/ringworld_scenes1.h
index 8afdb0a..d29ef1d 100644
--- a/engines/tsage/ringworld/ringworld_scenes1.h
+++ b/engines/tsage/ringworld/ringworld_scenes1.h
@@ -74,7 +74,7 @@ class Scene15 : public Scene {
 	};
 public:
 	Action1 _action1;
-	SceneObject _object1;
+	SceneObject _ship;
 	ASound _soundHandler;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);






More information about the Scummvm-git-logs mailing list