[Scummvm-cvs-logs] scummvm master -> 2e3474771206f3542b71920d93305ba0eb843ea1

dreammaster dreammaster at scummvm.org
Tue May 10 13:51:21 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:
2e34747712 TSAGE: Further tweaks to movement in Scene #6100


Commit: 2e3474771206f3542b71920d93305ba0eb843ea1
    https://github.com/scummvm/scummvm/commit/2e3474771206f3542b71920d93305ba0eb843ea1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-10T04:49:32-07:00

Commit Message:
TSAGE: Further tweaks to movement in Scene #6100

Changed paths:
    engines/tsage/ringworld_scenes1.cpp



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 9dafcba..e5ec60c 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -3232,9 +3232,9 @@ void Scene6100::process(Event &event) {
 	if (event.eventType == EVENT_KEYPRESS) {
 		// Handle incremental turning speeds with arrow keys
 		if ((event.kbd.keycode == Common::KEYCODE_LEFT) || (event.kbd.keycode == Common::KEYCODE_KP4)) {
-			_turnAmount = MAX(_turnAmount - 1, -8);
+			_turnAmount = MIN(_turnAmount + 1, 8);
 		} else if ((event.kbd.keycode == Common::KEYCODE_RIGHT) || (event.kbd.keycode == Common::KEYCODE_KP6)) {
-			_turnAmount = MIN(_turnAmount + 1, -8);
+			_turnAmount = MAX(_turnAmount - 1, -8);
 		}
 	}
 
@@ -3250,8 +3250,7 @@ void Scene6100::dispatch() {
 
 	// Handle mouse controlling the turning
 	int changeAmount = (_globals->_events._mousePos.x - 160) / -20;
-	int turnDifference = (changeAmount - _turnAmount) / 2;
-	_turnAmount = !turnDifference ? 0 : _turnAmount + turnDifference;
+	_turnAmount += (changeAmount - _turnAmount) / 2;
 
 	if (_fadePercent < 100) {
 		_fadePercent += 10;






More information about the Scummvm-git-logs mailing list