[Scummvm-git-logs] scummvm master -> 6d7348abc91783a8cdefefa861f7f999c2dff373

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bdf15a63af AGS: Engine: Fix override_multitasking type for platforms where `char` is unsigned
6d7348abc9 GLK: Fix osfgetc() usage on platforms where `char` is unsigned


Commit: bdf15a63af2e78b36d6d6463762ff9fa99f151e6
    https://github.com/scummvm/scummvm/commit/bdf15a63af2e78b36d6d6463762ff9fa99f151e6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-08T19:11:41-07:00

Commit Message:
AGS: Engine: Fix override_multitasking type for platforms where `char` is unsigned

Changed paths:
    engines/ags/engine/ac/game_setup.h


diff --git a/engines/ags/engine/ac/game_setup.h b/engines/ags/engine/ac/game_setup.h
index 199bdee9a90..778c2057922 100644
--- a/engines/ags/engine/ac/game_setup.h
+++ b/engines/ags/engine/ac/game_setup.h
@@ -100,7 +100,7 @@ struct GameSetup {
 
 	// User's overrides and hacks
 	int   override_script_os; // pretend engine is running on this eScriptSystemOSID
-	char  override_multitasking; // -1 for none, 0 or 1 to lock in the on/off mode
+	signed char  override_multitasking; // -1 for none, 0 or 1 to lock in the on/off mode
 	bool  override_upscale; // whether upscale old games that supported that
 	// assume game data version when restoring legacy save format
 	GameDataVersion legacysave_assume_dataver = kGameVersion_Undefined;


Commit: 6d7348abc91783a8cdefefa861f7f999c2dff373
    https://github.com/scummvm/scummvm/commit/6d7348abc91783a8cdefefa861f7f999c2dff373
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-08T19:11:41-07:00

Commit Message:
GLK: Fix osfgetc() usage on platforms where `char` is unsigned

Store the result in an `int`, as intended, for a proper check against EOF.

Changed paths:
    engines/glk/tads/tads2/qa_scriptor.cpp


diff --git a/engines/glk/tads/tads2/qa_scriptor.cpp b/engines/glk/tads/tads2/qa_scriptor.cpp
index 3841ecea348..6a517f66291 100644
--- a/engines/glk/tads/tads2/qa_scriptor.cpp
+++ b/engines/glk/tads/tads2/qa_scriptor.cpp
@@ -63,7 +63,7 @@ char *qasgets(char *buf, int bufl) {
 	/* keep going until we find something we like */
 	for (;;)
 	{
-		char c;
+		int c;
 
 		/*
 		 *   Read the next character of input.  If it's not a newline,
@@ -104,7 +104,7 @@ char *qasgets(char *buf, int bufl) {
 				/* return the command */
 				return buf;
 			}
-		} else if ((int)c == EOF) {
+		} else if (c == EOF) {
 			/* end of file - close the script and return eof */
 			qasclose();
 			return nullptr;