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

digitall noreply at scummvm.org
Tue Jul 5 21:45:08 UTC 2022


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:
c4174f6e9b GLK: SCOTT: Fix Type Limits Make Comparison Always False GCC Warning


Commit: c4174f6e9be269f9bafa3a5113e864376e9691a2
    https://github.com/scummvm/scummvm/commit/c4174f6e9be269f9bafa3a5113e864376e9691a2
Author: D G Turner (digitall at scummvm.org)
Date: 2022-07-05T22:42:01+01:00

Commit Message:
GLK: SCOTT: Fix Type Limits Make Comparison Always False GCC Warning

While this could be fixed in other ways, this works for both signed
and unsigned 8 bit types avoiding the type issues for char.

Changed paths:
    engines/glk/scott/load_ti99_4a.cpp


diff --git a/engines/glk/scott/load_ti99_4a.cpp b/engines/glk/scott/load_ti99_4a.cpp
index cceff04505b..7dddd36c957 100644
--- a/engines/glk/scott/load_ti99_4a.cpp
+++ b/engines/glk/scott/load_ti99_4a.cpp
@@ -280,7 +280,7 @@ uint8_t *loadTitleScreen() {
 			char c = *(p++);
 			if (static_cast<size_t>(p - _G(_entireFile)) >= _G(_fileLength))
 				return nullptr;
-			if (!((c <= 127) && (c >= 0))) /* isascii() */
+			if (c & 0x80) /* if not 7-bit ascii */
 				c = '?';
 			switch (c) {
 			case '\\':




More information about the Scummvm-git-logs mailing list