[Scummvm-cvs-logs] scummvm master -> 39c175f7835921f9dba34ea26ebf2658bfb5bf00

[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:
39c175f783 TSAGE: Bugfix for #3423512 - Not being able to get crown


Commit: 39c175f7835921f9dba34ea26ebf2658bfb5bf00
    https://github.com/scummvm/scummvm/commit/39c175f7835921f9dba34ea26ebf2658bfb5bf00
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-14T03:22:23-07:00

Commit Message:
TSAGE: Bugfix for #3423512 - Not being able to get crown

Changed paths:
    engines/tsage/ringworld/ringworld_logic.cpp
    engines/tsage/ringworld/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 5254fe6..ad67b66 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -603,19 +603,19 @@ void NamedHotspot::doAction(int action) {
 			break;
 
 		SceneItem::display(_resNum, _lookLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
-		break;
+		return;
 	case CURSOR_USE:
 		if (_useLineNum == -1)
 			break;
 		
 		SceneItem::display(_resNum, _useLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
-		break;
+		return;
 	case CURSOR_TALK:
 		if (_talkLineNum == -1)
 			break;
 
 		SceneItem::display(_resNum, _lookLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
-		break;
+		return;
 	default:
 		break;
 	}
diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index 474999d..5aeb127 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -1182,7 +1182,7 @@ void Scene9500::postInit(SceneObjectList *OwnerList) {
 		_object2.setFrame(_object2.getFrameCount());
 		_object2.setPosition(Common::Point(303, 130));
 		_object2.fixPriority(132);
-		if (RING_INVENTORY._helmet._sceneNumber == 1) {
+		if (RING_INVENTORY._helmet._sceneNumber != 1) {
 			_hotspot2.setDetails(87, 294, 104, 314, 9400, 17, -1);
 		} else {
 			_object2.setStrip(2);