[Scummvm-git-logs] scummvm master -> 6b82e0bc2fb7d74eeae460f57afb568ebd9a026e
elasota
noreply at scummvm.org
Wed Aug 14 03:27:11 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
647bedb2b8 MTROPOLIS: Remove obsolete SPQR plug-in
6b82e0bc2f MTROPOLIS: Fix up bad comment
Commit: 647bedb2b8ce178bb230960b1f4701709bd9ea4b
https://github.com/scummvm/scummvm/commit/647bedb2b8ce178bb230960b1f4701709bd9ea4b
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-08-13T23:26:19-04:00
Commit Message:
MTROPOLIS: Remove obsolete SPQR plug-in
All modifiers from it have been moved to the Standard plug-in already
Changed paths:
R engines/mtropolis/plugin/spqr.cpp
R engines/mtropolis/plugin/spqr.h
R engines/mtropolis/plugin/spqr_data.cpp
R engines/mtropolis/plugin/spqr_data.h
engines/mtropolis/boot.cpp
engines/mtropolis/module.mk
engines/mtropolis/plugins.h
diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index c549242bf58..0fb98902754 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -40,7 +40,6 @@
#include "mtropolis/plugin/mti.h"
#include "mtropolis/plugin/obsidian.h"
-#include "mtropolis/plugin/spqr.h"
#include "mtropolis/plugin/standard.h"
#include "mtropolis/plugins.h"
@@ -1076,7 +1075,6 @@ class BootScriptContext {
public:
enum PlugIn {
kPlugInMTI,
- kPlugInSPQR,
kPlugInStandard,
kPlugInObsidian,
kPlugInMIDI,
@@ -1380,7 +1378,6 @@ void BootScriptContext::bootMTIRetailWinRu() {
}
void BootScriptContext::bootSPQRMac() {
- addPlugIn(kPlugInSPQR);
addPlugIn(kPlugInStandard);
addArchive(kArchiveTypeMacVISE, "installer", "fs:Install.vct");
@@ -1390,7 +1387,6 @@ void BootScriptContext::bootSPQRMac() {
}
void BootScriptContext::bootSPQRWin() {
- addPlugIn(kPlugInSPQR);
addPlugIn(kPlugInStandard);
}
@@ -1452,7 +1448,6 @@ void BootScriptContext::executeFunction(const Common::String &functionName, cons
const EnumBinding plugInEnum[] = {ENUM_BINDING(kPlugInMTI),
ENUM_BINDING(kPlugInStandard),
ENUM_BINDING(kPlugInObsidian),
- ENUM_BINDING(kPlugInSPQR),
ENUM_BINDING(kPlugInMIDI)};
const EnumBinding bitDepthEnum[] = {ENUM_BINDING(kBitDepthAuto),
@@ -2073,11 +2068,6 @@ Common::SharedPtr<MTropolis::PlugIn> loadMTIPlugIn(const MTropolisGameDescriptio
return mtiPlugIn;
}
-Common::SharedPtr<MTropolis::PlugIn> loadSPQRPlugIn(const MTropolisGameDescription &gameDesc) {
- Common::SharedPtr<MTropolis::PlugIn> spqrPlugIn(PlugIns::createSPQR());
- return spqrPlugIn;
-}
-
enum PlayerType {
kPlayerTypeNone,
@@ -2795,9 +2785,6 @@ BootConfiguration bootProject(const MTropolisGameDescription &gameDesc) {
case Boot::BootScriptContext::kPlugInMTI:
plugIns.push_back(Boot::loadMTIPlugIn(gameDesc));
break;
- case Boot::BootScriptContext::kPlugInSPQR:
- plugIns.push_back(Boot::loadSPQRPlugIn(gameDesc));
- break;
default:
error("Unknown plug-in ID");
}
diff --git a/engines/mtropolis/module.mk b/engines/mtropolis/module.mk
index 7adee786548..3266383c95d 100644
--- a/engines/mtropolis/module.mk
+++ b/engines/mtropolis/module.mk
@@ -22,8 +22,6 @@ MODULE_OBJS = \
plugin/mti_data.o \
plugin/obsidian.o \
plugin/obsidian_data.o \
- plugin/spqr.o \
- plugin/spqr_data.o \
plugin/standard.o \
plugin/standard_data.o \
render.o \
diff --git a/engines/mtropolis/plugin/spqr.cpp b/engines/mtropolis/plugin/spqr.cpp
deleted file mode 100644
index cc98028445a..00000000000
--- a/engines/mtropolis/plugin/spqr.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "mtropolis/plugin/spqr.h"
-#include "mtropolis/plugins.h"
-
-namespace MTropolis {
-
-namespace SPQR {
-
-SPQRPlugIn::SPQRPlugIn() {
-}
-
-void SPQRPlugIn::registerModifiers(IPlugInModifierRegistrar *registrar) const {
-}
-
-} // namespace SPQR
-
-namespace PlugIns {
-
-Common::SharedPtr<PlugIn> createSPQR() {
- return Common::SharedPtr<PlugIn>(new SPQR::SPQRPlugIn());
-}
-
-} // End of namespace PlugIns
-
-} // End of namespace MTropolis
diff --git a/engines/mtropolis/plugin/spqr.h b/engines/mtropolis/plugin/spqr.h
deleted file mode 100644
index 54d9d0ded58..00000000000
--- a/engines/mtropolis/plugin/spqr.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef MTROPOLIS_PLUGIN_SPQR_H
-#define MTROPOLIS_PLUGIN_SPQR_H
-
-#include "mtropolis/modifier_factory.h"
-#include "mtropolis/modifiers.h"
-#include "mtropolis/plugin/spqr_data.h"
-#include "mtropolis/runtime.h"
-
-namespace MTropolis {
-
-namespace SPQR {
-
-class SPQRPlugIn;
-
-class SPQRPlugIn : public MTropolis::PlugIn {
-public:
- SPQRPlugIn();
-
- void registerModifiers(IPlugInModifierRegistrar *registrar) const override;
-
-private:
-};
-
-} // End of namespace SPQR
-
-} // End of namespace MTropolis
-
-#endif
diff --git a/engines/mtropolis/plugin/spqr_data.cpp b/engines/mtropolis/plugin/spqr_data.cpp
deleted file mode 100644
index b3b04029009..00000000000
--- a/engines/mtropolis/plugin/spqr_data.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "mtropolis/plugin/spqr_data.h"
-
-namespace MTropolis {
-
-namespace Data {
-
-namespace SPQR {
-
-} // End of namespace SPQR
-
-} // End of namespace Data
-
-} // End of namespace MTropolis
diff --git a/engines/mtropolis/plugin/spqr_data.h b/engines/mtropolis/plugin/spqr_data.h
deleted file mode 100644
index 76d67f99d9b..00000000000
--- a/engines/mtropolis/plugin/spqr_data.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef MTROPOLIS_PLUGIN_SPQR_DATA_H
-#define MTROPOLIS_PLUGIN_SPQR_DATA_H
-
-#include "mtropolis/data.h"
-
-namespace MTropolis {
-
-namespace Data {
-
-namespace SPQR {
-
-// Known SPQR - The Empire's Darkest Hour custom modifiers:
-
-} // End of namespace SPQR
-
-} // End of namespace Data
-
-} // End of namespace MTropolis
-
-#endif
diff --git a/engines/mtropolis/plugins.h b/engines/mtropolis/plugins.h
index 415c42d620a..bf009bea769 100644
--- a/engines/mtropolis/plugins.h
+++ b/engines/mtropolis/plugins.h
@@ -42,7 +42,6 @@ Common::SharedPtr<PlugIn> createMIDI();
Common::SharedPtr<PlugIn> createStandard();
Common::SharedPtr<PlugIn> createObsidian(const Common::SharedPtr<Obsidian::WordGameData> &wgData);
Common::SharedPtr<PlugIn> createMTI();
-Common::SharedPtr<PlugIn> createSPQR();
} // End of namespace PlugIns
Commit: 6b82e0bc2fb7d74eeae460f57afb568ebd9a026e
https://github.com/scummvm/scummvm/commit/6b82e0bc2fb7d74eeae460f57afb568ebd9a026e
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-08-13T23:26:19-04:00
Commit Message:
MTROPOLIS: Fix up bad comment
Changed paths:
engines/mtropolis/runtime.cpp
diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 1e4fd566bba..890f46c02ce 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -5715,7 +5715,8 @@ void Runtime::executeHighLevelSceneTransition(const HighLevelSceneTransition &tr
// This check may not be accurate, but we need to avoid adding the existing scene to the return list.
// SPQR depends on this behavior: Hitting Esc while in the menu will fire off another transition to
- // the menu scene with addToReturnList set. We want to avoid returning back to
+ // the menu scene with addToReturnList set. We want to avoid adding the menu to the return list
+ // multiple times since it will prevent the exit button from working properly.
if ((transition.addToDestinationScene || transition.addToReturnList) && targetScene != _activeMainScene) {
SceneReturnListEntry returnListEntry;
returnListEntry.isAddToDestinationSceneTransition = transition.addToDestinationScene;
More information about the Scummvm-git-logs
mailing list