[Scummvm-git-logs] scummvm master -> 5cff6a9fac36edf399b814b41d69aa467a87fd6c
dreammaster
noreply at scummvm.org
Sun Mar 1 03:02:57 UTC 2026
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:
cb8b72072c MADS: PHANTOM: Main menu buttons displaying
5cff6a9fac MADS: PHANTOM: Set Phantom intro resource name
Commit: cb8b72072cf4f84fc9e3b479a410cee09dbcc735
https://github.com/scummvm/scummvm/commit/cb8b72072cf4f84fc9e3b479a410cee09dbcc735
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-03-01T12:46:56+11:00
Commit Message:
MADS: PHANTOM: Main menu buttons displaying
Changed paths:
engines/mads/dialogs.cpp
engines/mads/mads.h
engines/mads/phantom/menu_phantom.cpp
engines/mads/phantom/menu_phantom.h
diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index d83e8c2945f..fe103e75438 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -26,7 +26,7 @@
#include "mads/screen.h"
#include "mads/msurface.h"
#include "mads/nebular/dialogs_nebular.h"
-#ifdef MADSV2
+#ifdef ENABLE_MADSV2
#include "mads/phantom/dialogs_phantom.h"
#endif
@@ -457,7 +457,7 @@ Dialogs *Dialogs::init(MADSEngine *vm) {
switch (vm->getGameID()) {
case GType_RexNebular:
return new Nebular::DialogsNebular(vm);
-#ifdef MADSV2
+#ifdef ENABLE_MADSV2
case GType_Phantom:
return new Phantom::DialogsPhantom(vm);
case GType_Dragonsphere:
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 1f923da9545..d11e45e2f77 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -41,14 +41,6 @@
#include "mads/sound.h"
#include "mads/detection.h"
-/**
- * This is the namespace of the MADS engine.
- *
- * Status of this engine: In Development
- *
- * Games using this engine:
- * - Rex Nebular and the Cosmic Gender Bender
- */
namespace MADS {
#define DEBUG_BASIC 1
diff --git a/engines/mads/phantom/menu_phantom.cpp b/engines/mads/phantom/menu_phantom.cpp
index 521aa5fefb6..3aa14509ad3 100644
--- a/engines/mads/phantom/menu_phantom.cpp
+++ b/engines/mads/phantom/menu_phantom.cpp
@@ -32,7 +32,7 @@
namespace MADS {
namespace Phantom {
-#define NEBULAR_MENUSCREEN 990
+//#define PHANTOM_MENUSCREEN 990
#define MADS_MENU_Y ((MADS_SCREEN_HEIGHT - MADS_SCENE_HEIGHT) / 2)
#define MADS_MENU_ANIM_DELAY 70
@@ -62,10 +62,6 @@ MainMenu::~MainMenu() {
scene._spriteSlots.reset();
}
-bool MainMenu::shouldShowQuotes() {
- return ConfMan.hasKey("ShowQuotes") && ConfMan.getBool("ShowQuotes");
-}
-
void MainMenu::display() {
MenuView::display();
Scene &scene = _vm->_game->_scene;
@@ -74,8 +70,7 @@ void MainMenu::display() {
// Load each of the menu item assets and add to the scene sprites list
for (int i = 0; i < 7; ++i) {
- Common::Path spritesName = Resources::formatName(NEBULAR_MENUSCREEN,
- 'A', i + 1, EXT_SS, "");
+ Common::Path spritesName(Common::String::format("*MAIN%d.SS", i));
_menuItems[i] = new SpriteAsset(_vm, spritesName, 0);
_menuItemIndexes[i] = scene._sprites.add(_menuItems[i]);
@@ -105,9 +100,6 @@ void MainMenu::doFrame() {
handleAction((MADSGameAction)_selectedIndex);
} else {
for (_menuItemIndex = 0; _menuItemIndex < 6; ++_menuItemIndex) {
- if (_menuItemIndex == 4 && !shouldShowQuotes())
- continue;
-
if (_menuItemIndex != _selectedIndex) {
addSpriteSlot();
}
@@ -127,26 +119,20 @@ void MainMenu::doFrame() {
if (_skipFlag && _menuItemIndex >= 0) {
// Quickly loop through all the menu items to display each's final frame
for (; _menuItemIndex < 6; ++_menuItemIndex) {
- if (_menuItemIndex == 4 && !shouldShowQuotes())
- continue;
-
// Draw the final frame of the menuitem
_frameIndex = 0;
addSpriteSlot();
}
_vm->_events->showCursor();
- showBonusItems();
+
} else {
if ((_menuItemIndex == -1) || (_frameIndex == 0)) {
if (++_menuItemIndex == 6) {
// Reached end of display animation
_vm->_events->showCursor();
- showBonusItems();
return;
- } else if (_menuItemIndex == 4 && !shouldShowQuotes()) {
- ++_menuItemIndex;
}
_frameIndex = _menuItems[_menuItemIndex]->getCount() - 1;
@@ -181,17 +167,6 @@ void MainMenu::addSpriteSlot() {
_redrawFlag = true;
}
-void MainMenu::showBonusItems() {
- Scene &scene = _vm->_game->_scene;
- _showEvolve = Common::File::exists("SECTION0.HAG") && Common::File::exists("evolve.res");
- _showSets = Common::File::exists("SECTION0.HAG") && Common::File::exists("sets.res");
-
- if (_showSets)
- scene._kernelMessages.add(Common::Point(290, 143), 0x4140, 0, 0, 0, "S");
- if (_showEvolve)
- scene._kernelMessages.add(Common::Point(305, 143), 0x4140, 0, 0, 0, "E");
-}
-
bool MainMenu::onEvent(Common::Event &event) {
Scene &scene = _vm->_game->_scene;
if (_selectedIndex != -1)
@@ -220,22 +195,6 @@ bool MainMenu::onEvent(Common::Event &event) {
handleAction(CREDITS);
break;
- case kActionQuotes:
- handleAction(QUOTES);
- break;
-
- case kActionRestartAnimation: {
- // Goodness knows why, but Rex has a key to restart the menuitem animations
- // Restart the animation
- _menuItemIndex = -1;
- for (int i = 0; i < 6; ++i)
- scene._spriteSlots.deleteTimer(i);
-
- _skipFlag = false;
- _vm->_events->hideCursor();
- break;
- }
-
default:
_skipFlag = true;
return false;
@@ -294,10 +253,6 @@ bool MainMenu::onEvent(Common::Event &event) {
_selectedIndex = _highlightedIndex;
unhighlightItem();
_frameIndex = 0;
- } else if (_showSets && Common::Rect(290, 165, 300, 185).contains(event.mouse)) {
- handleAction(SETS);
- } else if (_showEvolve && Common::Rect(305, 165, 315, 185).contains(event.mouse)) {
- handleAction(EVOLVE);
}
return true;
@@ -348,18 +303,6 @@ void MainMenu::handleAction(MADSGameAction action) {
TextView::execute(_vm, "credits");
return;
- case QUOTES:
- TextView::execute(_vm, "quotes");
- return;
-
- case SETS:
- AnimationView::execute(_vm, "sets");
- break;
-
- case EVOLVE:
- AnimationView::execute(_vm, "evolve");
- break;
-
case EXIT:
_vm->_dialogs->_pendingDialog = DIALOG_ADVERT;
break;
diff --git a/engines/mads/phantom/menu_phantom.h b/engines/mads/phantom/menu_phantom.h
index d68a960514c..8f818d8c5cc 100644
--- a/engines/mads/phantom/menu_phantom.h
+++ b/engines/mads/phantom/menu_phantom.h
@@ -35,8 +35,7 @@ class MADSEngine;
namespace Phantom {
enum MADSGameAction {
- START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT,
- SETS, EVOLVE
+ START_GAME, RESUME_GAME, RESTORE_GAME, SHOW_INTRO, EXIT, CREDITS
};
class MainMenu: public MenuView {
@@ -84,16 +83,6 @@ private:
*/
void addSpriteSlot();
- /**
- * Returns true if the Quotes item should be shown.
- * i.e. if the player has completed the game
- */
- bool shouldShowQuotes();
-
- /**
- * Show the bonus item icons, if available
- */
- void showBonusItems();
protected:
/**
* Display the menu
Commit: 5cff6a9fac36edf399b814b41d69aa467a87fd6c
https://github.com/scummvm/scummvm/commit/5cff6a9fac36edf399b814b41d69aa467a87fd6c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-03-01T14:02:46+11:00
Commit Message:
MADS: PHANTOM: Set Phantom intro resource name
Changed paths:
engines/mads/phantom/menu_phantom.cpp
diff --git a/engines/mads/phantom/menu_phantom.cpp b/engines/mads/phantom/menu_phantom.cpp
index 3aa14509ad3..1fe11cc9428 100644
--- a/engines/mads/phantom/menu_phantom.cpp
+++ b/engines/mads/phantom/menu_phantom.cpp
@@ -32,7 +32,6 @@
namespace MADS {
namespace Phantom {
-//#define PHANTOM_MENUSCREEN 990
#define MADS_MENU_Y ((MADS_SCREEN_HEIGHT - MADS_SCENE_HEIGHT) / 2)
#define MADS_MENU_ANIM_DELAY 70
@@ -296,7 +295,7 @@ void MainMenu::handleAction(MADSGameAction action) {
return;
case SHOW_INTRO:
- AnimationView::execute(_vm, "rexopen");
+ AnimationView::execute(_vm, "phantom");
break;
case CREDITS:
More information about the Scummvm-git-logs
mailing list