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

[criezy]

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:
e80a56c8a3 AGS: One more attempt to fix compilation with uint32_t


Commit: e80a56c8a3df27ee9b0da4a29581aaf8d625c229
    https://github.com/scummvm/scummvm/commit/e80a56c8a3df27ee9b0da4a29581aaf8d625c229
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-15T01:43:55Z

Commit Message:
AGS: One more attempt to fix compilation with uint32_t

Changed paths:
    engines/ags/console.cpp
    engines/ags/console.h


diff --git a/engines/ags/console.cpp b/engines/ags/console.cpp
index a0fef57b1c..e47c217354 100644
--- a/engines/ags/console.cpp
+++ b/engines/ags/console.cpp
@@ -61,7 +61,7 @@ static const LevelName levelNames[] = {
 
 struct GroupName{
 	const char* name;
-	uint32_t group;
+	AGS3::uint32_t group;
 };
 
 static const GroupName groupNames[] = {
@@ -70,7 +70,7 @@ static const GroupName groupNames[] = {
 	{"Script", AGS3::AGS::Shared::kDbgGroup_Script},
 	{"SpriteCache", AGS3::AGS::Shared::kDbgGroup_SprCache},
 	{"ManObj", AGS3::AGS::Shared::kDbgGroup_ManObj},
-	{nullptr, (uint32_t)-1}
+	{nullptr, (AGS3::uint32_t)-1}
 };
 
 bool AGSConsole::Cmd_listDebugGroups(int argc, const char **argv) {
@@ -98,7 +98,7 @@ bool AGSConsole::Cmd_setDebugGroupLevel(int argc, const char **argv) {
 	}
 
 	bool found = false;
-	uint32_t group = parseGroup(argv[1], found);
+	AGS3::uint32_t group = parseGroup(argv[1], found);
 	if (!found) {
 		debugPrintf("Unknown debug group '%s'\n", argv[1]);
 		debugPrintf("Valid groups are: ");
@@ -120,7 +120,7 @@ bool AGSConsole::Cmd_setDebugGroupLevel(int argc, const char **argv) {
 	return true;
 }
 
-const char *AGSConsole::getVerbosityLevel(uint32_t groupID) const {
+const char *AGSConsole::getVerbosityLevel(AGS3::uint32_t groupID) const {
 	int i = 1;
 	while (levelNames[i].name != nullptr) {
 		if (!_agsDebuggerOutput->TestGroup(groupID, levelNames[i].level))
@@ -130,7 +130,7 @@ const char *AGSConsole::getVerbosityLevel(uint32_t groupID) const {
 	return levelNames[i - 1].name;
 }
 
-uint32_t AGSConsole::parseGroup(const char *name, bool &found) const {
+AGS3::uint32_t AGSConsole::parseGroup(const char *name, bool &found) const {
 	int i = 0;
 	while (groupNames[i].name != nullptr) {
 		if (scumm_stricmp(name, groupNames[i].name) == 0) {
@@ -141,7 +141,7 @@ uint32_t AGSConsole::parseGroup(const char *name, bool &found) const {
 	}
 
 	found = false;
-	return (uint32_t)-1;
+	return (AGS3::uint32_t)-1;
 }
 
 AGS3::AGS::Shared::MessageType AGSConsole::parseLevel(const char *name, bool &found) const {
diff --git a/engines/ags/console.h b/engines/ags/console.h
index e6e091cc04..fbfea12a5c 100644
--- a/engines/ags/console.h
+++ b/engines/ags/console.h
@@ -50,8 +50,8 @@ private:
 	bool Cmd_getSptintInfo(int argc, const char **argv);
 	bool Cmd_dumpSrite(int argc, const char **argv);
 
-	const char *getVerbosityLevel(uint32_t groupID) const;
-	uint32_t parseGroup(const char *, bool &) const;
+	const char *getVerbosityLevel(AGS3::uint32_t groupID) const;
+	AGS3::uint32_t parseGroup(const char *, bool &) const;
 	AGS3::AGS::Shared::MessageType parseLevel(const char *, bool &) const;
 	void printGroupList();
 	void printLevelList();