[Scummvm-cvs-logs] scummvm master -> 0234c9ff95e3456bdb2c0eb0f2763516f6748c29

[lordhoto]

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:
0234c9ff95 TSAGE: Fix compilation on Linux/amd64 with g++ 4.5.2.


Commit: 0234c9ff95e3456bdb2c0eb0f2763516f6748c29
    https://github.com/scummvm/scummvm/commit/0234c9ff95e3456bdb2c0eb0f2763516f6748c29
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-13T07:10:38-07:00

Commit Message:
TSAGE: Fix compilation on Linux/amd64 with g++ 4.5.2.

Changed paths:
    engines/tsage/ringworld_scenes10.cpp
    engines/tsage/ringworld_scenes3.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index 3e92a60..34a222a 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -31,8 +31,7 @@
 
 namespace tSage {
 
-Scene2::Scene2() {
-	Scene::Scene();
+Scene2::Scene2() : Scene() {
 	_sceneState = 0;
 }
 
@@ -1700,7 +1699,7 @@ void Scene9900::strAction2::signal() {
 				// Not used?
 				// int x = _txtArray2[_txtArray1Index].getFrame().getBounds().height();
 				_txtArray2[_txtArray1Index]._moveDiff.y = 10;
-				_txtArray1Index = (_txtArray1Index++) % 2;
+				_txtArray1Index = (_txtArray1Index + 1) % 2;
 			}
 			var3 = 1;
 			_txtArray1[_txtArray1Index]._textMode = ALIGN_CENTRE;
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 8a8730c..00cd82b 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -327,7 +327,7 @@ void Scene2000::Action14::signal() {
 		scene->_stripManager.start(2001, this, scene);
 		break;
 	case 6:
-		_globals->_soundHandler.proc1(false);
+		_globals->_soundHandler.proc1(0/* was false */);
 		scene->_object8.setStrip(1);
 		scene->_object8.setFrame(scene->_object8.getFrameCount());
 		scene->_object8.animate(ANIM_MODE_6, this);
@@ -787,7 +787,7 @@ void Scene2100::Action9::signal() {
 		scene->_stripManager.start(6051, this, scene);
 		break;
 	case 4:
-		scene->_soundHandler.proc1(false);
+		scene->_soundHandler.proc1(0/* was false */);
 		scene->_object4.setStrip(1);
 		scene->_object4.setFrame(scene->_object4.getFrameCount());
 		scene->_object4.animate(ANIM_MODE_6, this);
@@ -1103,7 +1103,7 @@ void Scene2100::Action14::signal() {
 		scene->_stripManager.start(6009, this, scene);
 		break;
 	case 6:
-		scene->_soundHandler.proc1(false);
+		scene->_soundHandler.proc1(0/* was false */);
 		scene->_object4.setStrip(1);
 		scene->_object4.setFrame(scene->_object4.getFrameCount());
 		scene->_object4.animate(ANIM_MODE_6, this);