[Scummvm-git-logs] scummvm master -> 88f685217b1c8e7ab2c7a588677ad4744480b4a3

[SupSuper]

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

Summary:
2d0a0fc987 AGS: Add detection for new Blackwell Epiphany version
a399be3844 COMMON: Modern MSVC has inttypes.h
88f685217b COMMON: Don't use Win32 MIN/MAX since ScummVM provides its own


Commit: 2d0a0fc987d1da7322201b36181f77737ffcd6e5
    https://github.com/scummvm/scummvm/commit/2d0a0fc987d1da7322201b36181f77737ffcd6e5
Author: SupSuper (supsuper at gmail.com)
Date: 2021-03-03T11:13:17Z

Commit Message:
AGS: Add detection for new Blackwell Epiphany version

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 2af4d3f321..7709ed408d 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -1635,6 +1635,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY("blackwell5", "epiphany.exe", "c1cddd6fcdbcd030beda9f10d4e4270a", 281849897), // GOG
 	GAME_ENTRY("blackwell5", "agsgame.dat", "c1cddd6fcdbcd030beda9f10d4e4270a", 281849897), // GOG Linux
 	GAME_ENTRY_PLUGIN_PLATFORM("blackwell5", "epiphany.exe", "c1cddd6fcdbcd030beda9f10d4e4270a", 281856724, AGSTEAM_BLACKWELL, "Steam"), // Steam
+	GAME_ENTRY_PLUGIN_PLATFORM("blackwell5", "epiphany.exe", "764f20abb335b94ab8ec6a4ef6db01ea", 283020359, AGSTEAM_BLACKWELL, "Steam"), // Steam
 	GAME_ENTRY("captaindisaster", "cd-dhamsb-1-0-1.exe", "e2d290f8f21c6a83a9e8c5f3a0425b5e", 150665897), // Steam
 	GAME_ENTRY("charnelhousetrilogy", "cht.ags", "55c782c9de5a09157ea6aafac90b9cc8", 339257135), // Steam
 	GAME_ENTRY("charnelhousetrilogy", "cht.exe", "29c49db0805500ec14964eb897fc7b02", 341425110), // Steam


Commit: a399be38449494df5ad69cf3ace06214b372d23e
    https://github.com/scummvm/scummvm/commit/a399be38449494df5ad69cf3ace06214b372d23e
Author: SupSuper (supsuper at gmail.com)
Date: 2021-03-03T11:17:28Z

Commit Message:
COMMON: Modern MSVC has inttypes.h

Changed paths:
    common/inttypes.h


diff --git a/common/inttypes.h b/common/inttypes.h
index 11eb61e5be..a6001c3d8f 100644
--- a/common/inttypes.h
+++ b/common/inttypes.h
@@ -23,7 +23,7 @@
 #ifndef COMMON_INTTYPES_H
 #define COMMON_INTTYPES_H
 
-#if defined(_MSC_VER) || defined (__SYMBIAN32__)
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(__SYMBIAN32__)
 	typedef signed char int8_t;
 	typedef signed short int16_t;
 	typedef unsigned char uint8_t;


Commit: 88f685217b1c8e7ab2c7a588677ad4744480b4a3
    https://github.com/scummvm/scummvm/commit/88f685217b1c8e7ab2c7a588677ad4744480b4a3
Author: SupSuper (supsuper at gmail.com)
Date: 2021-03-03T11:17:37Z

Commit Message:
COMMON: Don't use Win32 MIN/MAX since ScummVM provides its own

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index 872d6d062f..cba63bca95 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -108,6 +108,7 @@
 		#define NOWH
 		#define NOSOUND
 		#define NODRAWTEXT
+		#define NOMINMAX
 
 	#endif