[Scummvm-cvs-logs] scummvm master -> 953c36675b7229a708f17b088030734fce41a1e2
dreammaster
dreammaster at scummvm.org
Wed Sep 21 14:05:07 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e91e1e1cbe TSAGE: Default to displaying walk cursor on Blue Force map screen
953c36675b TSAGE: Bugfixes to Blue Force map screen for leaving Marina
Commit: e91e1e1cbe77e742443dfc18c401983eff8293ee
https://github.com/scummvm/scummvm/commit/e91e1e1cbe77e742443dfc18c401983eff8293ee
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-21T02:52:05-07:00
Commit Message:
TSAGE: Default to displaying walk cursor on Blue Force map screen
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 35cccdf..730fc63 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -337,8 +337,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.setStrip(3);
BF_GLOBALS._player.setPosition(Common::Point(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2));
BF_GLOBALS._player.hide();
- BF_GLOBALS._player.enableControl();
- BF_GLOBALS._player._uiEnabled = false;
+ BF_GLOBALS._player.disableControl();
BF_GLOBALS._scrollFollower = NULL;
_text._color1 = 19;
@@ -466,6 +465,7 @@ void Scene50::signal() {
// Initial delay complete, time to switch to interactive mode
_text.remove();
BF_GLOBALS._player.enableControl();
+ BF_GLOBALS._events.setCursor(CURSOR_WALK);
_sceneMode = 0;
_field380 = 0;
}
Commit: 953c36675b7229a708f17b088030734fce41a1e2
https://github.com/scummvm/scummvm/commit/953c36675b7229a708f17b088030734fce41a1e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-21T04:56:57-07:00
Commit Message:
TSAGE: Bugfixes to Blue Force map screen for leaving Marina
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 730fc63..ad748d6 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -279,7 +279,7 @@ void Scene50::Tooltip::highlight(bool btnDown) {
BF_GLOBALS._player.disableControl();
BF_GLOBALS._mapLocationId = _locationId;
- if (BF_GLOBALS._driveToScene == 330) {
+ if (BF_GLOBALS._driveToScene != 330) {
scene->_sceneNumber = 330;
} else {
scene->_sceneNumber = (BF_GLOBALS._dayNumber != 1) || (BF_GLOBALS._bookmark < bStartOfGame) ||
@@ -429,11 +429,11 @@ void Scene50::signal() {
if (_sceneMode == 1) {
// Destination selected
if ((BF_GLOBALS._driveFromScene == 551) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
- BF_GLOBALS.setFlag(109);
- BF_GLOBALS.setFlag(115);
- BF_GLOBALS.setFlag(121);
- BF_GLOBALS.setFlag(127);
- BF_GLOBALS.setFlag(133);
+ BF_GLOBALS.clearFlag(f1015Drunk);
+ BF_GLOBALS.clearFlag(f1027Drunk);
+ BF_GLOBALS.clearFlag(f1035Drunk);
+ BF_GLOBALS.clearFlag(f1097Drunk);
+ BF_GLOBALS.clearFlag(f1098Drunk);
}
if ((BF_GLOBALS._driveFromScene == 410) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
@@ -446,16 +446,16 @@ void Scene50::signal() {
if ((BF_GLOBALS._driveFromScene == 380) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
if (BF_GLOBALS._bookmark >= bLauraToParamedics)
- BF_GLOBALS.setFlag(129);
+ BF_GLOBALS.setFlag(f1098Marina);
if (BF_GLOBALS._bookmark >= bStoppedFrankie)
- BF_GLOBALS.setFlag(131);
+ BF_GLOBALS.setFlag(f1098Frankie);
if (BF_GLOBALS._bookmark == bArrestedGreen) {
BF_GLOBALS._deathReason = 19;
_sceneNumber = 666;
}
}
- if ((_sceneNumber == 551) && BF_GLOBALS.getFlag(147))
+ if ((_sceneNumber == 551) && BF_GLOBALS.getFlag(fHasDrivenFromDrunk))
_sceneNumber = 550;
BF_GLOBALS._sound1.fadeOut2(NULL);
More information about the Scummvm-git-logs
mailing list