[Scummvm-git-logs] scummvm master -> 5745ea1cfb4d2f024e909db0742c322906667be7

[criezy]

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:
cc2cafc6ee AGS: Fix compilation with undefined time_t
5745ea1cfb AGS: Fix compilation with precision loss when casting pointer to long


Commit: cc2cafc6ee6adcf3c44f8a1f1f204ab7df80412a
    https://github.com/scummvm/scummvm/commit/cc2cafc6ee6adcf3c44f8a1f1f204ab7df80412a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-06-14T14:14:43+01:00

Commit Message:
AGS: Fix compilation with undefined time_t

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


diff --git a/engines/ags/engine/ac/global_game.h b/engines/ags/engine/ac/global_game.h
index 78224eb169..35902055cc 100644
--- a/engines/ags/engine/ac/global_game.h
+++ b/engines/ags/engine/ac/global_game.h
@@ -24,6 +24,7 @@
 #define AGS_ENGINE_AC_GLOBAL_GAME_H
 
 #include "ags/shared/util/string.h"
+#include "ags/lib/system/datetime.h"
 
 namespace AGS3 {
 


Commit: 5745ea1cfb4d2f024e909db0742c322906667be7
    https://github.com/scummvm/scummvm/commit/5745ea1cfb4d2f024e909db0742c322906667be7
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-06-14T14:14:43+01:00

Commit Message:
AGS: Fix compilation with precision loss when casting pointer to long

Changed paths:
    engines/ags/engine/ac/string.cpp


diff --git a/engines/ags/engine/ac/string.cpp b/engines/ags/engine/ac/string.cpp
index 4eeaefbc04..fc2ce987a8 100644
--- a/engines/ags/engine/ac/string.cpp
+++ b/engines/ags/engine/ac/string.cpp
@@ -269,9 +269,9 @@ size_t break_up_text_into_lines(const char *todis, SplitLines &lines, int wii, i
 int MAXSTRLEN = MAX_MAXSTRLEN;
 void check_strlen(char *ptt) {
 	MAXSTRLEN = MAX_MAXSTRLEN;
-	long charstart = (long)&_GP(game).chars[0];
-	long charend = charstart + sizeof(CharacterInfo) * _GP(game).numcharacters;
-	if (((long)&ptt[0] >= charstart) && ((long)&ptt[0] <= charend))
+	uintptr charstart = (uintptr)&_GP(game).chars[0];
+	uintptr charend = charstart + sizeof(CharacterInfo) * _GP(game).numcharacters;
+	if (((uintptr)&ptt[0] >= charstart) && ((uintptr)&ptt[0] <= charend))
 		MAXSTRLEN = 30;
 }