[Scummvm-git-logs] scummvm master -> 57479c2fa45554e8b75843de4d3366758ee7bc9d

[bonki]

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:
57479c2fa4 TUCKER: Use Verb enum in even more places


Commit: 57479c2fa45554e8b75843de4d3366758ee7bc9d
    https://github.com/scummvm/scummvm/commit/57479c2fa45554e8b75843de4d3366758ee7bc9d
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-14T21:59:17+01:00

Commit Message:
TUCKER: Use Verb enum in even more places

Changed paths:
    engines/tucker/tucker.cpp
    engines/tucker/tucker.h


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 6673164..59506bd 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -986,19 +986,21 @@ void TuckerEngine::updateFlagsForCharPosition() {
 			return;
 		}
 		switch (_previousActionVerb) {
-		case 3:
-		case 4:
-		case 8:
-		case 2:
+		case kVerbTalk:
+		case kVerbOpen:
+		case kVerbClose:
+		case kVerbUse:
 			debug(3, "updateFlagsForCharPosition() set flag %d value %d", _charPositionFlagNum, _charPositionFlagValue);
 			_flagsTable[_charPositionFlagNum] = _charPositionFlagValue;
 			break;
-		case 6:
+		case kVerbTake:
 			if (_charPositionFlagValue == 1) {
 				addObjectToInventory(_charPositionFlagNum);
 				_forceRedrawPanelItems = true;
 			}
 			break;
+		default:
+			break;
 		}
 		if (_pendingActionIndex > 0) {
 			_nextAction = _pendingActionIndex;
@@ -1058,9 +1060,10 @@ void TuckerEngine::updateCursor() {
 	}
 	if (_rightMouseButtonPressed) {
 		if (!_updateCursorFlag) {
-			++_actionVerb;
-			if (_actionVerb > 8) {
-				_actionVerb = kVerbWalk;
+			if (_actionVerb == kVerbLast) {
+				_actionVerb = kVerbFirst;
+			} else {
+				_actionVerb = (Verb)(_actionVerb + 1);
 			}
 			_updateCursorFlag = true;
 			_actionVerbLocked = true;
@@ -3473,7 +3476,7 @@ void TuckerEngine::setActionVerbUnderCursor() {
 	} else if (_mousePosX > 195) {
 		_actionVerb = kVerbLook;
 	} else if (_panelStyle == kPanelStyleVerbs) {
-		_actionVerb = ((_mousePosY - 150) / 17) * 3 + (_mousePosX / 67);
+		_actionVerb = (Verb)(((_mousePosY - 150) / 17) * 3 + (_mousePosX / 67));
 	} else {
 		_actionVerb = kVerbWalk;
 		if (_mousePosX < 30) {
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 2972052..6088231 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -95,7 +95,10 @@ enum Verb {
 	kVerbGive  = 5,
 	kVerbTake  = 6,
 	kVerbMove  = 7,
-	kVerbUse   = 8
+	kVerbUse   = 8,
+
+	kVerbFirst = kVerbWalk,
+	kVerbLast  = kVerbUse
 };
 
 enum VerbPreposition {
@@ -798,7 +801,9 @@ protected:
 	int _pendingActionDelay;
 	int _charPositionFlagNum;
 	int _charPositionFlagValue;
-	int _actionVerb;
+	Verb _actionVerb;
+	Verb _currentActionVerb;
+	Verb _previousActionVerb;
 	int _nextAction;
 	int _selectedObjectNum;
 	int _selectedObjectType;
@@ -865,8 +870,6 @@ protected:
 	int _characterAnimationsTable[200];
 	int _characterStateTable[200];
 	int _backgroundSprOffset;
-	int _currentActionVerb;
-	int _previousActionVerb;
 	int _mainSpritesBaseOffset;
 	int _currentSpriteAnimationLength;
 	int _currentSpriteAnimationFrame;