[Scummvm-cvs-logs] scummvm master -> 987dff66352be8a32a0b186f3494c90d770d9d0d

dreammaster dreammaster at scummvm.org
Thu Nov 7 14:48:24 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:
987dff6635 TSAGE: Removed useless variable from R2R scene 1580


Commit: 987dff66352be8a32a0b186f3494c90d770d9d0d
    https://github.com/scummvm/scummvm/commit/987dff66352be8a32a0b186f3494c90d770d9d0d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-07T05:47:47-08:00

Commit Message:
TSAGE: Removed useless variable from R2R scene 1580

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 8ab0732..975a22b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -9724,13 +9724,10 @@ void Scene1575::dispatch() {
  *--------------------------------------------------------------------------*/
 
 Scene1580::Scene1580() {
-	_field412 = 0;
 }
 
 void Scene1580::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
-
-	s.syncAsSint16LE(_field412);
 }
 
 bool Scene1580::JoystickPlug::startAction(CursorType action, Event &event) {
@@ -9774,7 +9771,7 @@ bool Scene1580::ScreenSlot::startAction(CursorType action, Event &event) {
 		scene->_screenDisplay.setup(1580, 3, 1);
 		scene->_screenDisplay.setPosition(Common::Point(124, 109));
 		scene->_screenDisplay.fixPriority(20);
-		scene->_field412 = 1;
+		//scene->_field412 = 1;
 		scene->_sceneMode = 10;
 		scene->setAction(&scene->_sequenceManager, scene, 1, &R2_GLOBALS._player, NULL);
 
@@ -9914,7 +9911,6 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 	loadScene(1580);
 	R2_GLOBALS._sceneManager._fadeMode = FADEMODE_GRADUAL;
 	SceneExt::postInit();
-	_field412 = 0;
 
 	_stripManager.setColors(60, 255);
 	_stripManager.setFontNumber(3);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 96aafe1..7360e95 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -663,8 +663,6 @@ class Scene1580 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
-	//CHECKME: Useless variable?
-	int _field412;
 	SpeakerQuinn _quinnSpeaker;
 	SpeakerSeeker _seekerSpeaker;
 	JoystickPlug _joystickPlug;






More information about the Scummvm-git-logs mailing list