[Scummvm-cvs-logs] scummvm master -> ec2512ba25175af3d75927e3a0bf2943634c92ad

[dreammaster]

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:
ec2512ba25 TSAGE: Bugfixes for Blue Force scene 315 - Police station when booking gang evidence


Commit: ec2512ba25175af3d75927e3a0bf2943634c92ad
    https://github.com/scummvm/scummvm/commit/ec2512ba25175af3d75927e3a0bf2943634c92ad
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-09T04:53:31-07:00

Commit Message:
TSAGE: Bugfixes for Blue Force scene 315 - Police station when booking gang evidence

Changed paths:
    engines/tsage/blue_force/blueforce_scenes3.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 6edd6d1..5f88a37 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -717,7 +717,8 @@ bool Scene315::Barry::startAction(CursorType action, Event &event) {
 			scene->_stripNumber = 3174;
 			scene->setAction(&scene->_action1);
 		} else {
-			if (!scene->_field1B6C & (scene->_field1B66 == 1)) {
+			++scene->_field1B66;
+			if (!scene->_field1B6C && (scene->_field1B66 == 1)) {
 				scene->_field1B6C = 1;
 				scene->_stripNumber = 3169;
 			} else {
@@ -737,6 +738,7 @@ bool Scene315::Barry::startAction(CursorType action, Event &event) {
 
 bool Scene315::SutterSlot::startAction(CursorType action, Event &event) {
 	Scene315 *scene = (Scene315 *)BF_GLOBALS._sceneManager._scene;
+	scene->_currentCursor = action;
 
 	switch (action) {
 	case INV_GREENS_GUN:
@@ -1175,6 +1177,7 @@ void Scene315::signal() {
 		if (ctr == 1) {
 			BF_GLOBALS._deathReason = 20;
 			BF_GLOBALS._sound1.fadeOut2(NULL);
+			BF_GLOBALS._sceneManager.changeScene(666);
 		} else if ((BF_GLOBALS._bookmark != bBookedFrankie) || !BF_GLOBALS.getFlag(onDuty)) {
 			BF_GLOBALS._sound1.fadeOut2(NULL);
 			BF_GLOBALS._sceneManager.changeScene(190);