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

[digitall]

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:
e9c374feae AGS: Fix GCC Compiler Warnings


Commit: e9c374feae4383fe78428232d4a63edb41083f1f
    https://github.com/scummvm/scummvm/commit/e9c374feae4383fe78428232d4a63edb41083f1f
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:08:46+01:00

Commit Message:
AGS: Fix GCC Compiler Warnings

Changed paths:
    engines/ags/lib/allegro/unicode.cpp
    engines/ags/shared/game/tra_file.cpp
    engines/ags/shared/game/tra_file.h


diff --git a/engines/ags/lib/allegro/unicode.cpp b/engines/ags/lib/allegro/unicode.cpp
index 7b77879477..7a31f26528 100644
--- a/engines/ags/lib/allegro/unicode.cpp
+++ b/engines/ags/lib/allegro/unicode.cpp
@@ -37,7 +37,7 @@ size_t ustrsize(const char *s) {
  * Reads a character from a UTF - 8 string.
  */
 /*static*/ int utf8_getc(const char *s) {
-	int c = *((unsigned char *)(s++));
+	int c = *((const unsigned char *)(s++));
 	int n, t;
 
 	if (c & 0x80) {
@@ -48,7 +48,7 @@ size_t ustrsize(const char *s) {
 		c &= (1 << (8 - n)) - 1;
 
 		while (--n > 0) {
-			t = *((unsigned char *)(s++));
+			t = *((const unsigned char *)(s++));
 
 			if ((!(t & 0x80)) || (t & 0x40))
 				return '^';
@@ -136,7 +136,7 @@ size_t ustrsize(const char *s) {
  *  Returns the width of a UTF-8 character.
  */
 /*static*/ int utf8_width(const char *s) {
-	int c = *((unsigned char *)s);
+	int c = *((const unsigned char *)s);
 	int n = 1;
 
 	if (c & 0x80) {
diff --git a/engines/ags/shared/game/tra_file.cpp b/engines/ags/shared/game/tra_file.cpp
index a78cc9d7a2..f023c827a3 100644
--- a/engines/ags/shared/game/tra_file.cpp
+++ b/engines/ags/shared/game/tra_file.cpp
@@ -102,7 +102,7 @@ HError ReadTraBlock(Translation &tra, Stream *in, TraFileBlock block, const Stri
 		tra.SpeechFont = in->ReadInt32();
 		tra.RightToLeft = in->ReadInt32();
 		return HError::None();
-	case (TraFileBlock)0:
+	case kTraFblk_ExtStrID:
 		// continue reading extensions with string ID
 		break;
 	default:
diff --git a/engines/ags/shared/game/tra_file.h b/engines/ags/shared/game/tra_file.h
index 6060465d8e..0fc6213cb6 100644
--- a/engines/ags/shared/game/tra_file.h
+++ b/engines/ags/shared/game/tra_file.h
@@ -48,6 +48,7 @@ enum TraFileErrorType {
 };
 
 enum TraFileBlock {
+	kTraFblk_ExtStrID = 0,
 	kTraFblk_Dict = 1,
 	kTraFblk_GameID = 2,
 	kTraFblk_TextOpts = 3,