[Scummvm-git-logs] scummvm master -> 17384de8b426c07fee3d76eb963410341f2730b9

digitall noreply at scummvm.org
Sat Jan 20 14:18:44 UTC 2024


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:
17384de8b4 M4: Fix Enumerated vs. Non-Enumerated Type In Conditional GCC Warning


Commit: 17384de8b426c07fee3d76eb963410341f2730b9
    https://github.com/scummvm/scummvm/commit/17384de8b426c07fee3d76eb963410341f2730b9
Author: D G Turner (digitall at scummvm.org)
Date: 2024-01-20T14:17:47Z

Commit Message:
M4: Fix Enumerated vs. Non-Enumerated Type In Conditional GCC Warning

Changed paths:
    engines/m4/platform/events.cpp


diff --git a/engines/m4/platform/events.cpp b/engines/m4/platform/events.cpp
index 96a9062a0cf..9370f585661 100644
--- a/engines/m4/platform/events.cpp
+++ b/engines/m4/platform/events.cpp
@@ -221,7 +221,7 @@ bool Events::util_kbd_check(int32 *parm1) {
 		return false;
 
 	int flags = ks.flags & (Common::KBD_CTRL | Common::KBD_ALT);
-	int key = (ks.ascii >= 32 && ks.ascii <= 127 && !flags) ? ks.ascii : ks.keycode;
+	int key = (ks.ascii >= 32 && ks.ascii <= 127 && !flags) ? ks.ascii : (int)ks.keycode;
 	*parm1 = key | (flags << 16);
 
 	return true;




More information about the Scummvm-git-logs mailing list