[Scummvm-git-logs] scummvm master -> 63c8669e851cf99eb90917449974e58b50e82e4d

[lephilousophe]

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:
4dc3436cac JANITORIAL: Don't include ScummVM files using brackets
748461c57d JANITORIAL: Remove useless headers
63c8669e85 GROOVIE: Get rid of limits.h


Commit: 4dc3436cac0cccdfa08a320ddb32ff0d160fe5de
    https://github.com/scummvm/scummvm/commit/4dc3436cac0cccdfa08a320ddb32ff0d160fe5de
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T12:17:58+02:00

Commit Message:
JANITORIAL: Don't include ScummVM files using brackets

Changed paths:
    engines/agos/midi.cpp
    engines/asylum/puzzles/pipes.cpp
    engines/groovie/video/roq.cpp


diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 7f877139718..46c8775efac 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -44,7 +44,7 @@
 #include "common/translation.h"
 
 #include "gui/message.h"
-#include <engines/agos/intern_detection.h>
+#include "agos/intern_detection.h"
 
 namespace AGOS {
 
diff --git a/engines/asylum/puzzles/pipes.cpp b/engines/asylum/puzzles/pipes.cpp
index fe2cbf25577..43b93614e7b 100644
--- a/engines/asylum/puzzles/pipes.cpp
+++ b/engines/asylum/puzzles/pipes.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <common/math.h>
+#include "common/math.h"
 
 #include "asylum/puzzles/pipes.h"
 
diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index 23036c5b61f..9ebf063fa2a 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -43,7 +43,7 @@
 #include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 
-#include <common/file.h>
+#include "common/file.h"
 #ifdef USE_PNG
 #include "image/png.h"
 #else


Commit: 748461c57d02cd7717134ac23473c0264d5d65ff
    https://github.com/scummvm/scummvm/commit/748461c57d02cd7717134ac23473c0264d5d65ff
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T12:17:58+02:00

Commit Message:
JANITORIAL: Remove useless headers

System headers are not allowed in engines code and are not used

Changed paths:
    engines/ags/shared/ac/game_setup_struct_base.cpp
    engines/groovie/logic/cake.cpp
    engines/sky/compact.cpp


diff --git a/engines/ags/shared/ac/game_setup_struct_base.cpp b/engines/ags/shared/ac/game_setup_struct_base.cpp
index a4c1fa41c99..1d32a93a3bf 100644
--- a/engines/ags/shared/ac/game_setup_struct_base.cpp
+++ b/engines/ags/shared/ac/game_setup_struct_base.cpp
@@ -26,7 +26,6 @@
 #include "ags/shared/ac/words_dictionary.h"
 #include "ags/shared/script/cc_script.h"
 #include "ags/shared/util/stream.h"
-#include <string.h>
 
 namespace AGS3 {
 
diff --git a/engines/groovie/logic/cake.cpp b/engines/groovie/logic/cake.cpp
index a8afa0b220a..fe62d688471 100644
--- a/engines/groovie/logic/cake.cpp
+++ b/engines/groovie/logic/cake.cpp
@@ -25,7 +25,6 @@
  *
  */
 
-#include <limits.h>
 #include "groovie/groovie.h"
 #include "groovie/logic/cake.h"
 
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index f2e94b35ad5..448a03ee075 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -27,7 +27,6 @@
 #include "common/translation.h"
 #include "sky/compact.h"
 #include "gui/message.h"
-#include <stddef.h>	// for ptrdiff_t
 
 namespace Sky {
 


Commit: 63c8669e851cf99eb90917449974e58b50e82e4d
    https://github.com/scummvm/scummvm/commit/63c8669e851cf99eb90917449974e58b50e82e4d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T12:17:58+02:00

Commit Message:
GROOVIE: Get rid of limits.h

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 15e60008d89..bc1309ac814 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include <limits.h>
-
 #include "audio/mididrv.h"
 
 #include "groovie/script.h"
@@ -76,7 +74,7 @@ enum kSpecialVariableTypes {
 
 Script::Script(GroovieEngine *vm, EngineVersion version) :
 	_code(nullptr), _savedCode(nullptr), _stacktop(0), _debugger(nullptr), _vm(vm),
-	_videoFile(nullptr), _videoRef(UINT_MAX), _cellGame(nullptr), _lastCursor(0xff),
+	_videoFile(nullptr), _videoRef(uint32(-1)), _cellGame(nullptr), _lastCursor(0xff),
 #ifdef ENABLE_GROOVIE2
 	_beehive(ConfMan.getBool("easier_ai")), _cake(ConfMan.getBool("easier_ai")), _gallery(ConfMan.getBool("easier_ai")),
 	_mouseTrap(ConfMan.getBool("easier_ai")), _othello(ConfMan.getBool("easier_ai")), _pente(ConfMan.getBool("easier_ai")),
@@ -918,11 +916,11 @@ bool Script::playvideofromref(uint32 fileref, bool loopUntilAudioDone) {
 
 		// Close the previous video file
 		if (_videoFile) {
-			_videoRef = UINT_MAX;
+			_videoRef = uint32(-1);
 			delete _videoFile;
 		}
 
-		if (fileref == UINT_MAX)
+		if (fileref == uint32(-1))
 			return true;
 
 		// Try to open the new file
@@ -1000,7 +998,7 @@ bool Script::playvideofromref(uint32 fileref, bool loopUntilAudioDone) {
 			// Close the file
 			delete _videoFile;
 			_videoFile = nullptr;
-			_videoRef = UINT_MAX;
+			_videoRef = uint32(-1);
 
 			// Clear the input events while playing the video
 			_eventMouseClicked = 0;
@@ -1025,7 +1023,7 @@ bool Script::playvideofromref(uint32 fileref, bool loopUntilAudioDone) {
 }
 
 bool Script::playBackgroundSound(uint32 fileref, uint32 loops) {
-	if (fileref == UINT_MAX) {
+	if (fileref == uint32(-1)) {
 		return false;
 	}