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

Kirben kirben at optusnet.com.au
Tue Mar 11 09:38:40 CET 2014


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:
ac26163f4d AGOS: Fix scroll wheel glitch in Simon the Sorcerer 1.


Commit: ac26163f4deeaafa3fd9062318359f7e1c371d59
    https://github.com/scummvm/scummvm/commit/ac26163f4deeaafa3fd9062318359f7e1c371d59
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-03-11T19:37:52+11:00

Commit Message:
AGOS: Fix scroll wheel glitch in Simon the Sorcerer 1.

Changed paths:
    engines/agos/input.cpp



diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 3577932..8a4e870 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -450,7 +450,7 @@ void AGOSEngine_Feeble::handleMouseWheelDown() {
 
 void AGOSEngine_Simon1::handleMouseWheelUp() {
 	HitArea *ha = findBox(206);
-	if (ha != NULL && (ha->flags & kBFBoxInUse)) {
+	if (ha != NULL && (ha->flags & kBFBoxInUse) && !(ha->flags & kBFBoxDead)) {
 			if (_saveLoadRowCurPos != 1) {
 				if (_saveLoadRowCurPos < 7)
 					_saveLoadRowCurPos = 1;
@@ -467,7 +467,7 @@ void AGOSEngine_Simon1::handleMouseWheelUp() {
 
 void AGOSEngine_Simon1::handleMouseWheelDown() {
 	HitArea *ha = findBox(207);
-	if (ha != NULL && (ha->flags & kBFBoxInUse)) {
+	if (ha != NULL && (ha->flags & kBFBoxInUse) && !(ha->flags & kBFBoxDead)) {
 			if (_saveDialogFlag) {
 				_saveLoadRowCurPos += 1;
 				if (_saveLoadRowCurPos >= _numSaveGameRows)






More information about the Scummvm-git-logs mailing list