diff options
| author | Johannes Schickel | 2011-04-13 16:10:38 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-13 16:10:38 +0200 |
| commit | 0234c9ff95e3456bdb2c0eb0f2763516f6748c29 (patch) | |
| tree | 313d152be463431d2cf220731a06ae0aab4a9049 | |
| parent | deb46ab38b8a904543ede68ff2d2315f40168096 (diff) | |
| download | scummvm-rg350-0234c9ff95e3456bdb2c0eb0f2763516f6748c29.tar.gz scummvm-rg350-0234c9ff95e3456bdb2c0eb0f2763516f6748c29.tar.bz2 scummvm-rg350-0234c9ff95e3456bdb2c0eb0f2763516f6748c29.zip | |
TSAGE: Fix compilation on Linux/amd64 with g++ 4.5.2.
| -rw-r--r-- | engines/tsage/ringworld_scenes10.cpp | 5 | ||||
| -rw-r--r-- | engines/tsage/ringworld_scenes3.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp index 3e92a60a2e..34a222a627 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 8a8730ca88..00cd82bd2a 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); |