[Scummvm-cvs-logs] scummvm master -> 0fd1058386368b06d8054e7b4a7841ea19e9f0bd

[Strangerke]

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:
0fd1058386 TSAGE: Blue Force - inside PD (315): Fix display of Ryan when discussing about Forest Rapsheet.


Commit: 0fd1058386368b06d8054e7b4a7841ea19e9f0bd
    https://github.com/scummvm/scummvm/commit/0fd1058386368b06d8054e7b4a7841ea19e9f0bd
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-05T06:55:03-07:00

Commit Message:
TSAGE: Blue Force - inside PD (315): Fix display of Ryan when discussing about Forest Rapsheet.

Also fix a test on mugshot

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 a32bd4d..cd664df 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -679,7 +679,7 @@ bool Scene315::Barry::startAction(CursorType action, Event &event) {
 		break;
 	case INV_FOREST_RAP:
 		BF_GLOBALS._player.disableControl();
-		scene->_stripNumber = BF_GLOBALS.getFlag(onDuty) ? 3178 : 3173;
+		scene->_stripNumber = BF_GLOBALS.getFlag(onDuty) ? 3173 : 3178;
 		scene->setAction(&scene->_action1);
 		break;
 	case INV_GREEN_ID:
@@ -697,7 +697,7 @@ bool Scene315::Barry::startAction(CursorType action, Event &event) {
 		scene->setAction(&scene->_action1);
 		break;
 	case INV_COBB_RAP:
-		if (BF_INVENTORY._mugshot._sceneNumber == 1)
+		if (BF_INVENTORY.getObjectScene(INV_MUG_SHOT) == 1)
 			NamedHotspot::startAction(action, event);
 		else {
 			BF_GLOBALS._player.disableControl();