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

Strangerke Strangerke at scummvm.org
Fri Nov 9 22:04:53 CET 2012


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:
d8fb63467a TSAGE: Fix a bug reported by salty-horse (and Clang)


Commit: d8fb63467a00898edc9f91bd87d66bbb01182379
    https://github.com/scummvm/scummvm/commit/d8fb63467a00898edc9f91bd87d66bbb01182379
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-11-09T13:03:52-08:00

Commit Message:
TSAGE: Fix a bug reported by salty-horse (and Clang)

Changed paths:
    engines/tsage/events.h
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 475db47..a1e9da3 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -32,7 +32,7 @@
 namespace TsAGE {
 
 enum EventType {EVENT_NONE = 0, EVENT_BUTTON_DOWN = 1, EVENT_BUTTON_UP = 2, EVENT_KEYPRESS = 4,
-	EVENT_MOUSE_MOVE = 8};
+	EVENT_MOUSE_MOVE = 8, EVENT_UNK27 = 27};
 
 enum ButtonShiftFlags {BTNSHIFT_LEFT = 0, BTNSHIFT_RIGHT = 3, BTNSHIFT_MIDDLE = 4};
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 4c98fcf..76e5abd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -61,7 +61,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
 }
 
 void Scene50::process(Event &event) {
-	if ((event.eventType != EVENT_BUTTON_DOWN) && (event.eventType != EVENT_KEYPRESS) && (event.eventType == 27)) {
+	if ((event.eventType != EVENT_BUTTON_DOWN) && (event.eventType != EVENT_KEYPRESS) && (event.eventType == EVENT_UNK27)) {
 		event.handled = true;
 		warning("TODO: incomplete Scene50::process()");
 		// CursorType _oldCursorId = _cursorId;






More information about the Scummvm-git-logs mailing list