[Scummvm-cvs-logs] scummvm master -> fc6fce22212fad5a9c8d15f0b8649eed3b0104b4
eriktorbjorn
eriktorbjorn at telia.com
Thu Sep 15 05:55:54 CEST 2011
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:
fc6fce2221 TSAGE: Silence GCC warnings
Commit: fc6fce22212fad5a9c8d15f0b8649eed3b0104b4
https://github.com/scummvm/scummvm/commit/fc6fce22212fad5a9c8d15f0b8649eed3b0104b4
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-09-14T20:49:45-07:00
Commit Message:
TSAGE: Silence GCC warnings
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
engines/tsage/blue_force/blueforce_ui.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index ac8fe46..35cccdf 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -567,7 +567,7 @@ bool Scene60::Ignition::check1() {
else
BF_GLOBALS._v5098C |= 2;
} else {
- int v = ((BF_GLOBALS._v5098C >> 2) & 15 + 1) & 15;
+ int v = (((BF_GLOBALS._v5098C >> 2) & 15) + 1) & 15;
BF_GLOBALS._v5098C = (BF_GLOBALS._v5098C & 0xC3) | (v << 2);
if ((v != 1) && (v != 2)) {
diff --git a/engines/tsage/blue_force/blueforce_ui.cpp b/engines/tsage/blue_force/blueforce_ui.cpp
index 75ab9a6..89a7d85 100644
--- a/engines/tsage/blue_force/blueforce_ui.cpp
+++ b/engines/tsage/blue_force/blueforce_ui.cpp
@@ -203,6 +203,8 @@ void UIInventoryScroll::process(Event &event) {
// Scroll the inventory as necessary
BF_GLOBALS._uiElements.scrollInventory(_isLeft);
event.handled = true;
+ break;
+ default:
break;
}
}
More information about the Scummvm-git-logs
mailing list