diff options
author | m-kiewitz | 2013-09-16 00:35:29 +0200 |
---|---|---|
committer | m-kiewitz | 2013-09-16 00:35:29 +0200 |
commit | 2fc1f7eddae6fd1573e0ababce58b94414d70047 (patch) | |
tree | fbde025aa6fa38c00614a0c26cb3579ff26d9a12 | |
parent | 1c9316cee03c5e2f694cf630b231f21e5c5ad32a (diff) | |
parent | 0b4929877aa42511440096825bcbca8b6541b7d8 (diff) | |
download | scummvm-rg350-2fc1f7eddae6fd1573e0ababce58b94414d70047.tar.gz scummvm-rg350-2fc1f7eddae6fd1573e0ababce58b94414d70047.tar.bz2 scummvm-rg350-2fc1f7eddae6fd1573e0ababce58b94414d70047.zip |
Merge branch 'master' of github.com:scummvm/scummvm
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.cpp | 68 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.h | 4 | ||||
-rw-r--r-- | engines/tsage/staticres.cpp | 188 |
3 files changed, 131 insertions, 129 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 5570e3e975..eabf330f0d 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -4917,10 +4917,10 @@ Scene2900::Scene2900(): SceneExt() { _field412 = 0; _altitudeChanging = false; _field416 = false; - _offsetPos = Common::Point(550, 550); + _balloonLocation = Common::Point(550, 550); _field41C = 0; _altitudeMajorChange = 0; - _pos = Common::Point(160, 100); + _balloonScreenPos = Common::Point(160, 100); _newAltitude = 0; _field425 = 100; _field426 = 100; @@ -4929,15 +4929,17 @@ Scene2900::Scene2900(): SceneExt() { } void Scene2900::synchronize(Serializer &s) { + SceneExt::synchronize(s); + s.syncAsSint16LE(_field412); s.syncAsSint16LE(_altitudeChanging); s.syncAsSint16LE(_field416); s.syncAsSint16LE(_field41C); s.syncAsSint16LE(_altitudeMajorChange); - s.syncAsSint16LE(_offsetPos.x); - s.syncAsSint16LE(_offsetPos.y); - s.syncAsSint16LE(_pos.x); - s.syncAsSint16LE(_pos.y); + s.syncAsSint16LE(_balloonLocation.x); + s.syncAsSint16LE(_balloonLocation.y); + s.syncAsSint16LE(_balloonScreenPos.x); + s.syncAsSint16LE(_balloonScreenPos.y); s.syncAsSint16LE(_newAltitude); s.syncAsSint16LE(_field425); s.syncAsSint16LE(_field426); @@ -5002,7 +5004,7 @@ void Scene2900::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS._sceneManager._previousScene == 2350 && R2_GLOBALS._balloonPosition.x == 0 && R2_GLOBALS._balloonPosition.y == 0) { R2_GLOBALS._balloonAltitude = 5; - _map.setPosition(Common::Point(_offsetPos.x - 120, _offsetPos.y - 100)); + _map.setPosition(Common::Point(_balloonLocation.x - 120, _balloonLocation.y - 100)); _sceneMode = 10; R2_GLOBALS._player.changeZoom(100); @@ -5011,30 +5013,30 @@ void Scene2900::postInit(SceneObjectList *OwnerList) { _altimeterContent.setPosition(Common::Point(9, 189)); } else { - _offsetPos.x = R2_GLOBALS._balloonPosition.x + 120; - _offsetPos.y = R2_GLOBALS._balloonPosition.y + 100; + _balloonLocation.x = R2_GLOBALS._balloonPosition.x + 120; + _balloonLocation.y = R2_GLOBALS._balloonPosition.y + 100; if ((R2_GLOBALS._balloonAltitude % 8) == 0) - _offsetPos.x -= 70; + _balloonLocation.x -= 70; else if ((R2_GLOBALS._balloonAltitude % 8) == 7) - _offsetPos.x += 70; + _balloonLocation.x += 70; - if (_offsetPos.x <= 120) - _pos.x = _offsetPos.x + 40; - else if (_offsetPos.x >= 680) - _pos.x = _offsetPos.x - 520; + if (_balloonLocation.x <= 120) + _balloonScreenPos.x = _balloonLocation.x + 40; + else if (_balloonLocation.x >= 680) + _balloonScreenPos.x = _balloonLocation.x - 520; if ((R2_GLOBALS._balloonAltitude / 6) == 5) - _offsetPos.y -= 50; - if (_offsetPos.y <= 100) - _pos.y = _offsetPos.y; + _balloonLocation.y -= 50; + if (_balloonLocation.y <= 100) + _balloonScreenPos.y = _balloonLocation.y; _field425 = _field426 = 100 - (R2_GLOBALS._balloonAltitude / 48) * 25; - _map.setPosition(Common::Point(_offsetPos.x - 120, _offsetPos.y - 100)); + _map.setPosition(Common::Point(_balloonLocation.x - 120, _balloonLocation.y - 100)); _sceneMode = 11; R2_GLOBALS._player.changeZoom(_field425); - R2_GLOBALS._player.setPosition(_pos); + R2_GLOBALS._player.setPosition(_balloonScreenPos); R2_GLOBALS._player.enableControl(); R2_GLOBALS._player._canWalk = false; @@ -5077,8 +5079,8 @@ void Scene2900::signal() { void Scene2900::dispatch() { if (_sceneMode == 11) { - _offsetPos.x += balloonData[R2_GLOBALS._balloonAltitude].x; - _offsetPos.y += balloonData[R2_GLOBALS._balloonAltitude].y; + _balloonLocation.x += balloonData[R2_GLOBALS._balloonAltitude].x; + _balloonLocation.y += balloonData[R2_GLOBALS._balloonAltitude].y; _field41C = balloonData[R2_GLOBALS._balloonAltitude].v3; if (_field41C == 0) { @@ -5122,20 +5124,20 @@ void Scene2900::dispatch() { } R2_GLOBALS._balloonPosition = _map.setPosition( - Common::Point(_offsetPos.x - 120, _offsetPos.y - 100), !_field8F8); + Common::Point(_balloonLocation.x - 120, _balloonLocation.y - 100), !_field8F8); _field8F8 = true; - if (_offsetPos.x <= 120) - _pos.x = _offsetPos.x + 40; - else if (_offsetPos.x >= 680) - _pos.x = _offsetPos.x - 520; + if (_balloonLocation.x <= 120) + _balloonScreenPos.x = _balloonLocation.x + 40; + else if (_balloonLocation.x >= 680) + _balloonScreenPos.x = _balloonLocation.x - 520; - if (_offsetPos.y <= 100) - _pos.y = _offsetPos.y; + if (_balloonLocation.y <= 100) + _balloonScreenPos.y = _balloonLocation.y; - R2_GLOBALS._player.setPosition(_pos); + R2_GLOBALS._player.setPosition(_balloonScreenPos); - if ((_offsetPos.x % 100) == 50 && (_offsetPos.y % 100) == 50 && !_field416) { + if ((_balloonLocation.x % 100) == 50 && (_balloonLocation.y % 100) == 50 && !_field416) { _newAltitude = R2_GLOBALS._balloonAltitude; if (_altitudeChanging) { _newAltitude += _altitudeMajorChange * 48; @@ -5149,8 +5151,8 @@ void Scene2900::dispatch() { } if (balloonData[R2_GLOBALS._balloonAltitude].y > 0) { - _newAltitude += 240; - } else if (balloonData[R2_GLOBALS._balloonAltitude].x < 0) { + _newAltitude -= 8; + } else if (balloonData[R2_GLOBALS._balloonAltitude].y < 0) { _newAltitude += 8; } diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h index a4d309960c..0c2b971cda 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.h +++ b/engines/tsage/ringworld2/ringworld2_scenes2.h @@ -739,8 +739,8 @@ public: bool _field416; int _field41C; int _altitudeMajorChange; - Common::Point _offsetPos; - Common::Point _pos; + Common::Point _balloonLocation; + Common::Point _balloonScreenPos; int _newAltitude; int _field425; int _field426; diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp index b67b798b83..2c5e8e57a0 100644 --- a/engines/tsage/staticres.cpp +++ b/engines/tsage/staticres.cpp @@ -162,7 +162,7 @@ char const *const BIKINI_HUT = "Bikini Hut"; char const *const RADIO_BTN_LIST[8] = { "10-2 ", "10-4 ", "10-13", "10-15", "10-27", "10-35", "10-97", "10-98" }; // Scene 570 computer messageS -char const *const SCENE570_PASSWORD = "PASSWORD -> "; +char const *const SCENE570_PASSWORD = "PASSWORD - }, "; char const *const SCENE570_C_DRIVE = "C:\\"; char const *const SCENE570_RING = "RING"; char const *const SCENE570_PROTO = "PROTO"; @@ -458,150 +458,150 @@ const BalloonRecord balloonData[] = { { -2, 0, 0 }, { -2, 0, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 1 }, { 0, -2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, + { 0, 2, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 0, 2, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, { 0, 0, -1 }, + { 0, 2, 0 }, { 0, -2, 0 }, + { 2, 0, 0 }, { 0, -2, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, 0, -1 }, { 0, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, 0, 0 }, { 0, 0, -1 }, { -2, 0, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, - { 0, -2, 0 }, { -2, 0, 0 }, + { 0, 2, 0 }, + { 2, 0, 0 }, { 0, 0, -1 }, { -2, 0, 0 }, { 0, 0, -1 }, { -2, 0, 0 }, { 0, 0, -1 }, - { -2, 0, 0 }, + { 2, 0, 0 }, { 0, 0, -1 }, + { 0, 2, 0 }, { 0, -2, 0 }, + { 2, 0, 0 }, + { 0, 2, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, { 0, -2, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, 0, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, 0, 1 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, 0, 1 }, { -2, 0, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, - { -2, 0, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, + { 2, 0, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, @@ -609,37 +609,37 @@ const BalloonRecord balloonData[] = { { -2, 0, 0 }, { -2, 0, 0 }, { 0, 0, -1 }, - { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { 0, -2, 0 }, { 0, -2, 0 }, { 0, 0, -1 }, { -2, 0, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { 0, -2, 0 }, + { 2, 0, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { 0, 0, 0 }, - { -2, 0, 0 }, - { 0, -2, 0 }, - { 0, -2, 0 }, + { 2, 0, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { -2, 0, 0 }, { 0, -2, 0 }, - { 0, -2, 0 }, + { 0, 2, 0 }, { -2, 0, 0 } }; |