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

dwatteau noreply at scummvm.org
Sun Oct 5 12:37:20 UTC 2025 

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

Summary:
3583f0abb2 PRIVATE: Fix detection plugin build with MSVC 2015 (C1004)
c433fea209 MEDIASTATION: Fix detection plugin build with MSVC 2015 (C1004)


Commit: 3583f0abb26ca7febaf219a85c04c828e5106e6b
    https://github.com/scummvm/scummvm/commit/3583f0abb26ca7febaf219a85c04c828e5106e6b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-05T14:35:26+02:00

Commit Message:
PRIVATE: Fix detection plugin build with MSVC 2015 (C1004)

Missing newline at end of file.

Changed paths:
    engines/private/detection.h


diff --git a/engines/private/detection.h b/engines/private/detection.h
index 3b0af3faad1..833ef07ae5e 100644
--- a/engines/private/detection.h
+++ b/engines/private/detection.h
@@ -3,4 +3,4 @@
 
 #define GAMEOPTION_SFX_SUBTITLES GUIO_GAMEOPTIONS1
 
-#endif // PRIVATE_DETECTION_H
\ No newline at end of file
+#endif // PRIVATE_DETECTION_H


Commit: c433fea2090330988a2ecc6c29a1dd782bee5933
    https://github.com/scummvm/scummvm/commit/c433fea2090330988a2ecc6c29a1dd782bee5933
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-05T14:36:16+02:00

Commit Message:
MEDIASTATION: Fix detection plugin build with MSVC 2015 (C1004)

Missing newline at end of file.

Changed paths:
    engines/mediastation/asset.h
    engines/mediastation/assets/canvas.h
    engines/mediastation/assets/document.h
    engines/mediastation/assets/font.h
    engines/mediastation/assets/hotspot.h
    engines/mediastation/assets/image.h
    engines/mediastation/assets/movie.h
    engines/mediastation/assets/palette.h
    engines/mediastation/assets/path.cpp
    engines/mediastation/assets/path.h
    engines/mediastation/assets/screen.h
    engines/mediastation/assets/sound.h
    engines/mediastation/assets/sprite.h
    engines/mediastation/assets/text.h
    engines/mediastation/assets/timer.h
    engines/mediastation/bitmap.h
    engines/mediastation/boot.h
    engines/mediastation/context.h
    engines/mediastation/cursors.h
    engines/mediastation/datafile.h
    engines/mediastation/debugchannels.h
    engines/mediastation/mediascript/collection.h
    engines/mediastation/mediascript/scriptconstants.h
    engines/mediastation/mediascript/scriptvalue.h


diff --git a/engines/mediastation/asset.h b/engines/mediastation/asset.h
index cbd934e147c..cdc2dffff35 100644
--- a/engines/mediastation/asset.h
+++ b/engines/mediastation/asset.h
@@ -135,8 +135,8 @@ public:
 	virtual void initFromParameterStream(Chunk &chunk);
 	virtual void readParameter(Chunk &chunk, AssetHeaderSectionType paramType);
 
-	// These are not pure virtual so if an asset doesnʻt read any chunks or
-	// subfiles it doesnʻt need to just implement these with an error message.
+	// These are not pure virtual so if an asset doesn't read any chunks or
+	// subfiles it doesn't need to just implement these with an error message.
 	virtual void readChunk(Chunk &chunk);
 	virtual void readSubfile(Subfile &subfile, Chunk &chunk);
 
@@ -198,4 +198,4 @@ protected:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/canvas.h b/engines/mediastation/assets/canvas.h
index 4210d95ac58..485f4821256 100644
--- a/engines/mediastation/assets/canvas.h
+++ b/engines/mediastation/assets/canvas.h
@@ -38,4 +38,4 @@ public:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/document.h b/engines/mediastation/assets/document.h
index dadb1e8b0ef..6e5a0f1dbef 100644
--- a/engines/mediastation/assets/document.h
+++ b/engines/mediastation/assets/document.h
@@ -40,4 +40,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/font.h b/engines/mediastation/assets/font.h
index c53f2436b0f..f565ba5f220 100644
--- a/engines/mediastation/assets/font.h
+++ b/engines/mediastation/assets/font.h
@@ -54,4 +54,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/hotspot.h b/engines/mediastation/assets/hotspot.h
index 7dab8844e1f..e7fcde1e71f 100644
--- a/engines/mediastation/assets/hotspot.h
+++ b/engines/mediastation/assets/hotspot.h
@@ -49,4 +49,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/image.h b/engines/mediastation/assets/image.h
index 23c708f32af..20195562672 100644
--- a/engines/mediastation/assets/image.h
+++ b/engines/mediastation/assets/image.h
@@ -57,4 +57,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/movie.h b/engines/mediastation/assets/movie.h
index d82e0e310bb..a7b8c3acf3d 100644
--- a/engines/mediastation/assets/movie.h
+++ b/engines/mediastation/assets/movie.h
@@ -134,4 +134,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/palette.h b/engines/mediastation/assets/palette.h
index 5345e24facd..bf72ced7701 100644
--- a/engines/mediastation/assets/palette.h
+++ b/engines/mediastation/assets/palette.h
@@ -42,4 +42,4 @@ public:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/path.cpp b/engines/mediastation/assets/path.cpp
index 6fdf2861491..fee18c67262 100644
--- a/engines/mediastation/assets/path.cpp
+++ b/engines/mediastation/assets/path.cpp
@@ -136,7 +136,7 @@ void Path::process() {
 		// TODO: Actually step the path. It seems they mostly just use this for
 		// palette animation in the On Step event handler, so nothing is actually drawn on the screen now.
 
-		// We donʻt run a step event for the last step.
+		// We don't run a step event for the last step.
 		runEventHandlerIfExists(kStepEvent);
 		_nextPathStepTime = ++_currentStep * _stepDurationInMilliseconds;
 	} else {
diff --git a/engines/mediastation/assets/path.h b/engines/mediastation/assets/path.h
index dc2f280bf8d..92930d28bef 100644
--- a/engines/mediastation/assets/path.h
+++ b/engines/mediastation/assets/path.h
@@ -58,4 +58,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/screen.h b/engines/mediastation/assets/screen.h
index 78ef10b597a..3ee17f397cc 100644
--- a/engines/mediastation/assets/screen.h
+++ b/engines/mediastation/assets/screen.h
@@ -42,4 +42,4 @@ public:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/sound.h b/engines/mediastation/assets/sound.h
index d1c94ccf6f8..7ee75b1eba2 100644
--- a/engines/mediastation/assets/sound.h
+++ b/engines/mediastation/assets/sound.h
@@ -55,4 +55,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/sprite.h b/engines/mediastation/assets/sprite.h
index 4c89bcc83d6..257f28b71ad 100644
--- a/engines/mediastation/assets/sprite.h
+++ b/engines/mediastation/assets/sprite.h
@@ -115,4 +115,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/text.h b/engines/mediastation/assets/text.h
index 98d057dc17e..a3742e145ec 100644
--- a/engines/mediastation/assets/text.h
+++ b/engines/mediastation/assets/text.h
@@ -73,4 +73,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/assets/timer.h b/engines/mediastation/assets/timer.h
index c1a3bc272d0..bfd5b5f9e1c 100644
--- a/engines/mediastation/assets/timer.h
+++ b/engines/mediastation/assets/timer.h
@@ -44,4 +44,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/bitmap.h b/engines/mediastation/bitmap.h
index 16660887cfa..98108d03059 100644
--- a/engines/mediastation/bitmap.h
+++ b/engines/mediastation/bitmap.h
@@ -68,4 +68,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/boot.h b/engines/mediastation/boot.h
index 664f22135be..9509b48b8e6 100644
--- a/engines/mediastation/boot.h
+++ b/engines/mediastation/boot.h
@@ -191,4 +191,4 @@ public:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/context.h b/engines/mediastation/context.h
index 846fcea05ef..1b35b6ba6cd 100644
--- a/engines/mediastation/context.h
+++ b/engines/mediastation/context.h
@@ -97,4 +97,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/cursors.h b/engines/mediastation/cursors.h
index 6ecf5bf3347..70a5f24621b 100644
--- a/engines/mediastation/cursors.h
+++ b/engines/mediastation/cursors.h
@@ -73,4 +73,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/datafile.h b/engines/mediastation/datafile.h
index ac656fea9a6..03183c088e8 100644
--- a/engines/mediastation/datafile.h
+++ b/engines/mediastation/datafile.h
@@ -151,4 +151,4 @@ public:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/debugchannels.h b/engines/mediastation/debugchannels.h
index 3d2878464cc..015172ea2ed 100644
--- a/engines/mediastation/debugchannels.h
+++ b/engines/mediastation/debugchannels.h
@@ -41,4 +41,4 @@ enum DebugChannels {
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/mediascript/collection.h b/engines/mediastation/mediascript/collection.h
index 950b7b7f662..616625308b8 100644
--- a/engines/mediastation/mediascript/collection.h
+++ b/engines/mediastation/mediascript/collection.h
@@ -46,4 +46,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/mediascript/scriptconstants.h b/engines/mediastation/mediascript/scriptconstants.h
index 232294a46f5..b12308e5d3c 100644
--- a/engines/mediastation/mediascript/scriptconstants.h
+++ b/engines/mediastation/mediascript/scriptconstants.h
@@ -264,4 +264,4 @@ const char *scriptValueTypeToStr(ScriptValueType type);
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/mediastation/mediascript/scriptvalue.h b/engines/mediastation/mediascript/scriptvalue.h
index 9d7b7ae1485..2465d6a9358 100644
--- a/engines/mediastation/mediascript/scriptvalue.h
+++ b/engines/mediastation/mediascript/scriptvalue.h
@@ -117,4 +117,4 @@ private:
 
 } // End of namespace MediaStation
 
-#endif
\ No newline at end of file
+#endif

More information about the Scummvm-git-logs mailing list