[Scummvm-cvs-logs] scummvm master -> 587063afba31f5e48b0ae29f8ba2397ef3183b45

[Strangerke]

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:
198ee3528a TSAGE: BF - Get rid of some magic values related to btnState
587063afba TSAGE: Core - Get rid of some magic values related to btnState


Commit: 198ee3528a48c1a07b8040ad37d762fa27f99ea6
    https://github.com/scummvm/scummvm/commit/198ee3528a48c1a07b8040ad37d762fa27f99ea6
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-09-01T03:33:43-07:00

Commit Message:
TSAGE: BF - Get rid of some magic values related to btnState

Changed paths:
    engines/tsage/blue_force/blueforce_logic.cpp
    engines/tsage/blue_force/blueforce_scenes5.cpp
    engines/tsage/blue_force/blueforce_scenes8.cpp



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 3aef18f..63f84d2 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -678,7 +678,7 @@ void FocusObject::process(Event &event) {
 			BF_GLOBALS._events.setCursor(BF_GLOBALS._events.getCursor());
 
 			if ((event.eventType == EVENT_BUTTON_DOWN) && (BF_GLOBALS._events.getCursor() == CURSOR_WALK) &&
-					(event.btnState == 3)) {
+					(event.btnState == BTNSHIFT_RIGHT)) {
 				BF_GLOBALS._events.setCursor(CURSOR_USE);
 				event.handled = true;
 			}
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 25accbb..0cf487d 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -1220,7 +1220,7 @@ void Scene560::SafeInset::process(Event &event) {
 		}
 
 		if ((event.eventType == EVENT_BUTTON_DOWN) && (BF_GLOBALS._events.getCursor() == CURSOR_WALK) &&
-				(event.btnState == 3)) {
+				(event.btnState == BTNSHIFT_RIGHT)) {
 			BF_GLOBALS._events.setCursor(CURSOR_USE);
 			event.handled = true;
 		}
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 5a60cd7..9a20788 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -1984,7 +1984,7 @@ void Scene840::BoatKeysInset::process(Event &event) {
 			CursorType cursorId = BF_GLOBALS._events.getCursor();
 			BF_GLOBALS._events.setCursor(cursorId);
 
-			if ((event.eventType == EVENT_BUTTON_DOWN) && (cursorId == CURSOR_WALK) && (event.btnState == 3)) {
+			if ((event.eventType == EVENT_BUTTON_DOWN) && (cursorId == CURSOR_WALK) && (event.btnState == BTNSHIFT_RIGHT)) {
 				BF_GLOBALS._events.setCursor(CURSOR_USE);
 				event.handled = true;
 			}


Commit: 587063afba31f5e48b0ae29f8ba2397ef3183b45
    https://github.com/scummvm/scummvm/commit/587063afba31f5e48b0ae29f8ba2397ef3183b45
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-09-01T03:34:09-07:00

Commit Message:
TSAGE: Core - Get rid of some magic values related to btnState

Changed paths:
    engines/tsage/events.cpp



diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index 5ca531f..ac6ce0b 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -113,7 +113,7 @@ bool EventsClass::getEvent(Event &evt, int eventMask) {
 		case Common::EVENT_RBUTTONUP:
 		case Common::EVENT_MBUTTONUP:
 			evt.eventType = EVENT_BUTTON_UP;
-			evt.btnState = 0;
+			evt.btnState = BTNSHIFT_LEFT;
 			break;
 		case Common::EVENT_KEYDOWN:
 			evt.eventType = EVENT_KEYPRESS;