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

[dreammaster]

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:
27bbb64516 MADS: Remove redundant Forest code from MADSEngine
6cc34aecf3 MADS: NEBULAR: Move Rex specific MPSInstaller class into nebular/


Commit: 27bbb645167592fcb4c575d208e5cbf03ef43a73
    https://github.com/scummvm/scummvm/commit/27bbb645167592fcb4c575d208e5cbf03ef43a73
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-13T18:41:20+10:00

Commit Message:
MADS: Remove redundant Forest code from MADSEngine

Changed paths:
    engines/mads/mads.cpp


diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 63eb7f5c0bc..a8355b79683 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -54,8 +54,6 @@
 #include "mads/core/sprite.h"
 #include "mads/core/timer.h"
 #include "mads/core/vocab.h"
-#include "mads/phantom/main.h"
-#include "mads/forest/extra.h"
 #include "mads/forest/global.h"
 #include "mads/core/sound_manager.h"
 
@@ -124,7 +122,6 @@ void MADSEngine::initGlobals() {
 	init_sprite();
 	init_timer();
 	init_vocab();
-	Forest::init_extra();
 }
 
 void MADSEngine::readConfigFile() {


Commit: 6cc34aecf33c78dd5d084b6ddd92706503b044a5
    https://github.com/scummvm/scummvm/commit/6cc34aecf33c78dd5d084b6ddd92706503b044a5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-13T18:45:03+10:00

Commit Message:
MADS: NEBULAR: Move Rex specific MPSInstaller class into nebular/

Changed paths:
  A engines/mads/nebular/mps_installer.cpp
  A engines/mads/nebular/mps_installer.h
  R engines/mads/core/mps_installer.cpp
  R engines/mads/core/mps_installer.h
    engines/mads/dragonsphere/dragonsphere.cpp
    engines/mads/forest/forest.cpp
    engines/mads/module.mk
    engines/mads/nebular/nebular.cpp


diff --git a/engines/mads/dragonsphere/dragonsphere.cpp b/engines/mads/dragonsphere/dragonsphere.cpp
index 48b80429bfe..22a0d113363 100644
--- a/engines/mads/dragonsphere/dragonsphere.cpp
+++ b/engines/mads/dragonsphere/dragonsphere.cpp
@@ -51,7 +51,6 @@
 #include "mads/dragonsphere/mads/inventory.h"
 #include "mads/dragonsphere/mads/sounds.h"
 #include "mads/dragonsphere/mads/words.h"
-#include "mads/core/mps_installer.h"
 
 namespace MADS {
 namespace Dragonsphere {
diff --git a/engines/mads/forest/forest.cpp b/engines/mads/forest/forest.cpp
index 2e5cd41a9b9..7d64ea01a91 100644
--- a/engines/mads/forest/forest.cpp
+++ b/engines/mads/forest/forest.cpp
@@ -51,7 +51,6 @@
 #include "mads/forest/mads/inventory.h"
 #include "mads/forest/mads/sounds.h"
 #include "mads/forest/mads/words.h"
-#include "mads/core/mps_installer.h"
 
 namespace MADS {
 namespace Forest {
diff --git a/engines/mads/module.mk b/engines/mads/module.mk
index 1e7571f6a52..ddc80208ac2 100644
--- a/engines/mads/module.mk
+++ b/engines/mads/module.mk
@@ -40,7 +40,6 @@ MODULE_OBJS := \
 	core/mem.o \
 	core/mouse.o \
 	core/mps_archive.o \
-	core/mps_installer.o \
 	core/object.o \
 	core/pack.o \
 	core/pack_dcl.o \
@@ -80,6 +79,7 @@ MODULE_OBJS := \
 	nebular/mac_nebular.o \
 	nebular/mac_resources.o \
 	nebular/menus.o \
+	nebular/mps_installer.o \
 	nebular/popup.o \
 	nebular/mads/mads.o \
 	nebular/rooms/room101.o \
diff --git a/engines/mads/core/mps_installer.cpp b/engines/mads/nebular/mps_installer.cpp
similarity index 98%
rename from engines/mads/core/mps_installer.cpp
rename to engines/mads/nebular/mps_installer.cpp
index 60c7170e827..1cbb8f103f6 100644
--- a/engines/mads/core/mps_installer.cpp
+++ b/engines/mads/nebular/mps_installer.cpp
@@ -26,9 +26,10 @@
 #include "common/util.h"
 #include "common/memstream.h"
 #include "common/compression/dcl.h"
-#include "mads/core/mps_installer.h"
+#include "mads/nebular/mps_installer.h"
 
 namespace MADS {
+namespace RexNebular {
 
 MpsInstaller *MpsInstaller::open(const Common::Path &baseName) {
 	Common::File indexFile;
@@ -154,4 +155,5 @@ Common::SharedArchiveContents MpsInstaller::readContentsForPath(const Common::Pa
 	return Common::SharedArchiveContents(uncompressedBuf, desc._uncompressedSize);
 }
 
+} // namespace RexNebular
 } // namespace MADS
diff --git a/engines/mads/core/mps_installer.h b/engines/mads/nebular/mps_installer.h
similarity index 95%
rename from engines/mads/core/mps_installer.h
rename to engines/mads/nebular/mps_installer.h
index 7b603ac590a..9cdfb8a48dd 100644
--- a/engines/mads/core/mps_installer.h
+++ b/engines/mads/nebular/mps_installer.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef MADS_CORE_INSTALLER_H
-#define MADS_CORE_INSTALLER_H
+#ifndef MADS_NEBULAR_MPS_INSTALLER_H
+#define MADS_NEBULAR_MPS_INSTALLER_H
 
 #include "common/archive.h"
 #include "common/ptr.h"
@@ -29,6 +29,7 @@
 #include "common/hash-str.h"
 
 namespace MADS {
+namespace RexNebular {
 
 class MpsInstaller : public Common::MemcachingCaseInsensitiveArchive {
 public:
@@ -85,6 +86,7 @@ private:
 	Common::Path _baseName;
 };
 
+} // namespace RexNebular
 } // namespace MADS
 
 #endif
diff --git a/engines/mads/nebular/nebular.cpp b/engines/mads/nebular/nebular.cpp
index 72b42b4307e..54e07232a71 100644
--- a/engines/mads/nebular/nebular.cpp
+++ b/engines/mads/nebular/nebular.cpp
@@ -21,7 +21,6 @@
 
 #include "engines/util.h"
 #include "common/config-manager.h"
-#include "mads/core/mps_installer.h"
 #include "mads/core/attr.h"
 #include "mads/core/config.h"
 #include "mads/core/conv.h"
@@ -42,6 +41,7 @@
 #include "mads/nebular/global.h"
 #include "mads/nebular/main.h"
 #include "mads/nebular/mac_nebular.h"
+#include "mads/nebular/mps_installer.h"
 #include "mads/nebular/popup.h"
 #include "mads/nebular/mads/inventory.h"
 #include "mads/nebular/mads/words.h"