[Scummvm-git-logs] scummvm master -> 074e1d19fc93f22ef57d961262d5aeba5541291d

[sev-]

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:
074e1d19fc LASTEXPRESS: Fix conflicting enums


Commit: 074e1d19fc93f22ef57d961262d5aeba5541291d
    https://github.com/scummvm/scummvm/commit/074e1d19fc93f22ef57d961262d5aeba5541291d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T16:29:50+01:00

Commit Message:
LASTEXPRESS: Fix conflicting enums

Changed paths:
    engines/lastexpress/data/scene.h
    engines/lastexpress/game/action.cpp


diff --git a/engines/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h
index b9aff4d..d950aad 100644
--- a/engines/lastexpress/data/scene.h
+++ b/engines/lastexpress/data/scene.h
@@ -83,7 +83,7 @@ class Scene;
 class SceneHotspot {
 public:
 	enum Action {
-		kActionNone = 0,
+		kActionNoneHS = 0,
 		kActionInventory = 1,
 		kActionSavePoint = 2,
 		kActionPlaySound = 3,
@@ -112,8 +112,8 @@ public:
 		kAction27 = 27,
 		kActionConcertSitCough = 28,
 		kAction29 = 29,
-		kActionCatchBeetle = 30,
-		kActionExitCompartment = 31,
+		kActionCatchBeetleHS = 30,
+		kActionExitCompartmentHS = 31,
 		kAction32 = 32,
 		KActionUseWhistle = 33,
 		kActionOpenMatchBox = 34,
@@ -157,7 +157,7 @@ public:
 		coordsOffset = 0;
 		scene = kSceneNone;
 		location = 0;
-		action = kActionNone;
+		action = kActionNoneHS;
 		param1 = 0;
 		param2 = 0;
 		param3 = 0;
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index d0ef927..5351edb 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -1852,7 +1852,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const {
 
 		return kCursorHand;
 
-	case SceneHotspot::kActionCatchBeetle:
+	case SceneHotspot::kActionCatchBeetleHS:
 		if (!getBeetle()->isLoaded())
 			return kCursorNormal;
 
@@ -1897,7 +1897,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const {
 LABEL_KEY:
 	// Handle compartment action
 	case SceneHotspot::kActionCompartment:
-	case SceneHotspot::kActionExitCompartment:
+	case SceneHotspot::kActionExitCompartmentHS:
 		debugC(2, kLastExpressDebugScenes, "================================= DOOR %03d =================================", object);
 		if (object >= kObjectMax)
 			return kCursorNormal;