[Scummvm-git-logs] scummvm master -> ac91321768f3406c351aa213787fba8e0d2dabef

[dreammaster]

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:
ac91321768 ULTIMA: Use correct enum for button constants


Commit: ac91321768f3406c351aa213787fba8e0d2dabef
    https://github.com/scummvm/scummvm/commit/ac91321768f3406c351aa213787fba8e0d2dabef
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-14T21:21:33-07:00

Commit Message:
ULTIMA: Use correct enum for button constants

All the comparisons are done against Shared::MouseButton. Using values
from SpecialButtons makes no sense.

Changed paths:
    engines/ultima/nuvie/core/nuvie_defs.h


diff --git a/engines/ultima/nuvie/core/nuvie_defs.h b/engines/ultima/nuvie/core/nuvie_defs.h
index 34c4f111e5..21f75ae365 100644
--- a/engines/ultima/nuvie/core/nuvie_defs.h
+++ b/engines/ultima/nuvie/core/nuvie_defs.h
@@ -33,10 +33,10 @@ typedef int8 sint8;
 typedef int16 sint16;
 typedef int32 sint32;
 
-#define USE_BUTTON Shared::MK_LBUTTON
-#define WALK_BUTTON Shared::MK_RBUTTON
-#define ACTION_BUTTON Shared::MK_RBUTTON
-#define DRAG_BUTTON Shared::MK_LBUTTON
+#define USE_BUTTON Shared::BUTTON_LEFT
+#define WALK_BUTTON Shared::BUTTON_RIGHT
+#define ACTION_BUTTON Shared::BUTTON_RIGHT
+#define DRAG_BUTTON Shared::BUTTON_LEFT
 
 typedef uint8 nuvie_game_t; // Game type (1=u6,2=md,4=se)