[Scummvm-git-logs] scummvm master -> 6b7e96abfc7869ac6f061ce78d5ec903b210e28b

[dreammaster]

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

Summary:
6b7e96abfc MADS: Update MADSV2 references in include file header guards


Commit: 6b7e96abfc7869ac6f061ce78d5ec903b210e28b
    https://github.com/scummvm/scummvm/commit/6b7e96abfc7869ac6f061ce78d5ec903b210e28b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-21T21:54:10+10:00

Commit Message:
MADS: Update MADSV2 references in include file header guards

Changed paths:
    engines/mads/animview/anim_timer.h
    engines/mads/animview/animview.h
    engines/mads/animview/functions.h
    engines/mads/console.h
    engines/mads/detection_tables.h
    engines/mads/engine.h
    engines/mads/nebular/console.h
    engines/mads/textview/textview.h


diff --git a/engines/mads/animview/anim_timer.h b/engines/mads/animview/anim_timer.h
index c623c6afb19..b97772a8c1a 100644
--- a/engines/mads/animview/anim_timer.h
+++ b/engines/mads/animview/anim_timer.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_ANIMVIEW_ANIM_TIMER_H
-#define MADSV2_ANIMVIEW_ANIM_TIMER_H
+#ifndef MADS_ANIMVIEW_ANIM_TIMER_H
+#define MADS_ANIMVIEW_ANIM_TIMER_H
 
 #include "common/scummsys.h"
 
diff --git a/engines/mads/animview/animview.h b/engines/mads/animview/animview.h
index 67b9f63a037..84aacc4c578 100644
--- a/engines/mads/animview/animview.h
+++ b/engines/mads/animview/animview.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_ANIMVIEW_H
-#define MADSV2_ANIMVIEW_H
+#ifndef MADS_ANIMVIEW_H
+#define MADS_ANIMVIEW_H
 
 #include "audio/audiostream.h"
 #include "mads/core/anim.h"
diff --git a/engines/mads/animview/functions.h b/engines/mads/animview/functions.h
index 36b797301db..1b7f32d0b4c 100644
--- a/engines/mads/animview/functions.h
+++ b/engines/mads/animview/functions.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_ANIMVIEW_FUNCTIONS_H
-#define MADSV2_ANIMVIEW_FUNCTIONS_H
+#ifndef MADS_ANIMVIEW_FUNCTIONS_H
+#define MADS_ANIMVIEW_FUNCTIONS_H
 
 #include "common/stream.h"
 #include "mads/core/pal.h"
diff --git a/engines/mads/console.h b/engines/mads/console.h
index 03def51c272..821f6bde226 100644
--- a/engines/mads/console.h
+++ b/engines/mads/console.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_CONSOLE_H
-#define MADSV2_CONSOLE_H
+#ifndef MADS_CONSOLE_H
+#define MADS_CONSOLE_H
 
 #include "gui/debugger.h"
 
diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 9417839df7a..ad1173192bb 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -146,7 +146,6 @@ static const MADSGameDescription gameDescriptions[] = {
 		GType_RexNebular,
 		0
 	},
-#ifdef ENABLE_MADSV2
 	{
 		// Return of the Phantom DOS English
 		{
@@ -282,7 +281,7 @@ static const MADSGameDescription gameDescriptions[] = {
 		GType_Forest,
 		0
 	},
-#endif
+
 	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
diff --git a/engines/mads/engine.h b/engines/mads/engine.h
index 3d173cd1221..c1889717346 100644
--- a/engines/mads/engine.h
+++ b/engines/mads/engine.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_ENGINE_H
-#define MADSV2_ENGINE_H
+#ifndef MADS_ENGINE_H
+#define MADS_ENGINE_H
 
 #include "audio/mixer.h"
 #include "common/events.h"
diff --git a/engines/mads/nebular/console.h b/engines/mads/nebular/console.h
index 337ea16eae0..120b924b6b4 100644
--- a/engines/mads/nebular/console.h
+++ b/engines/mads/nebular/console.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_NEBULAR_CONSOLE_H
-#define MADSV2_NEBULAR_CONSOLE_H
+#ifndef MADS_NEBULAR_CONSOLE_H
+#define MADS_NEBULAR_CONSOLE_H
 
 #include "mads/console.h"
 
diff --git a/engines/mads/textview/textview.h b/engines/mads/textview/textview.h
index c61125ba9ad..787c6dc40f8 100644
--- a/engines/mads/textview/textview.h
+++ b/engines/mads/textview/textview.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADSV2_TEXTVIEW_H
-#define MADSV2_TEXTVIEW_H
+#ifndef MADS_TEXTVIEW_H
+#define MADS_TEXTVIEW_H
 
 #include "mads/core/general.h"