[Scummvm-git-logs] scummvm master -> de0d4310743037a917c697daa3548f773d0e3100
dreammaster
noreply at scummvm.org
Mon May 22 03:23:23 UTC 2023
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
33b452a3a0 MM: MM1: Added F5/F7 keys to open save/load dialog
4713caa3fa MM: MM1: Setting up interface buttons
de0d431074 MM: MM1: Remove debug code for cycling interaction portraits
Commit: 33b452a3a0cfc6ea3b99c307e1e927731cfb7e3e
https://github.com/scummvm/scummvm/commit/33b452a3a0cfc6ea3b99c307e1e927731cfb7e3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-21T19:29:46-07:00
Commit Message:
MM: MM1: Added F5/F7 keys to open save/load dialog
Changed paths:
engines/mm/mm1/views_enh/game.cpp
diff --git a/engines/mm/mm1/views_enh/game.cpp b/engines/mm/mm1/views_enh/game.cpp
index 27ea2942650..79e573757a5 100644
--- a/engines/mm/mm1/views_enh/game.cpp
+++ b/engines/mm/mm1/views_enh/game.cpp
@@ -54,6 +54,19 @@ void Game::draw() {
}
bool Game::msgKeypress(const KeypressMessage &msg) {
+ switch (msg.keycode) {
+ case Common::KEYCODE_F5:
+ if (g_engine->canSaveGameStateCurrently())
+ g_engine->saveGameDialog();
+ break;
+ case Common::KEYCODE_F7:
+ if (g_engine->canLoadGameStateCurrently())
+ g_engine->loadGameDialog();
+ break;
+ default:
+ break;
+ }
+
return true;
}
Commit: 4713caa3fa5f740bbb8004e2f61360a1e973b49d
https://github.com/scummvm/scummvm/commit/4713caa3fa5f740bbb8004e2f61360a1e973b49d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-21T19:29:47-07:00
Commit Message:
MM: MM1: Setting up interface buttons
Changed paths:
engines/mm/mm1/views_enh/game.cpp
engines/mm/mm1/views_enh/game.h
engines/mm/mm1/views_enh/game_commands.cpp
engines/mm/mm1/views_enh/game_commands.h
diff --git a/engines/mm/mm1/views_enh/game.cpp b/engines/mm/mm1/views_enh/game.cpp
index 79e573757a5..352a2380553 100644
--- a/engines/mm/mm1/views_enh/game.cpp
+++ b/engines/mm/mm1/views_enh/game.cpp
@@ -70,16 +70,6 @@ bool Game::msgKeypress(const KeypressMessage &msg) {
return true;
}
-bool Game::msgMouseDown(const MouseDownMessage &msg) {
- if (Common::Rect(109, 137, 122, 147).contains(msg._pos) &&
- msg._button == MouseDownMessage::MB_LEFT) {
- g_engine->openMainMenuDialog();
- return true;
- } else {
- return Views::TextView::msgMouseDown(msg);
- }
-}
-
bool Game::msgAction(const ActionMessage &msg) {
switch (msg._action) {
case KEYBIND_BASH:
@@ -88,6 +78,9 @@ bool Game::msgAction(const ActionMessage &msg) {
case KEYBIND_MAP:
addView("MapPopup");
return true;
+ case KEYBIND_MENU:
+ g_engine->openMainMenuDialog();
+ return true;
case KEYBIND_PROTECT:
addView("Protect");
return true;
diff --git a/engines/mm/mm1/views_enh/game.h b/engines/mm/mm1/views_enh/game.h
index e331a015cb2..7a6c4a69a4b 100644
--- a/engines/mm/mm1/views_enh/game.h
+++ b/engines/mm/mm1/views_enh/game.h
@@ -46,7 +46,6 @@ public:
bool msgUnfocus(const UnfocusMessage &msg) override;
void draw() override;
bool msgKeypress(const KeypressMessage &msg) override;
- bool msgMouseDown(const MouseDownMessage &msg) override;
bool msgAction(const ActionMessage &msg) override;
bool msgGame(const GameMessage &msg) override;
};
diff --git a/engines/mm/mm1/views_enh/game_commands.cpp b/engines/mm/mm1/views_enh/game_commands.cpp
index a8d3f3712e5..80791eb1517 100644
--- a/engines/mm/mm1/views_enh/game_commands.cpp
+++ b/engines/mm/mm1/views_enh/game_commands.cpp
@@ -30,19 +30,21 @@ GameCommands::GameCommands(UIElement *owner) :
ButtonContainer("GameCommands", owner),
_minimap(this) {
Shared::Xeen::SpriteResource *spr = &g_globals->_mainIcons;
- addButton(Common::Rect(286, 75, 310, 95), KEYBIND_NONE, spr); // Unlock
- addButton(Common::Rect(235, 75, 259, 95), KEYBIND_PROTECT, spr); // Protect
- addButton(Common::Rect(260, 75, 284, 95), KEYBIND_REST, spr); // Rest
+ _iconSprites.load("view.icn");
- addButton(Common::Rect(235, 96, 259, 116), KEYBIND_BASH, spr); // Bash
- addButton(Common::Rect(260, 96, 284, 116), KEYBIND_ORDER, spr); // Order
- addButton(Common::Rect(286, 96, 310, 116), KEYBIND_SEARCH, spr); // Quest items
+ addButton(Common::Rect(235, 75, 259, 95), KEYBIND_SPELL, 2, spr);
+ addButton(Common::Rect(260, 75, 284, 95), KEYBIND_PROTECT, 10, spr);
+ addButton(Common::Rect(286, 75, 310, 95), KEYBIND_REST, 4, spr);
- addButton(Common::Rect(235, 117, 259, 137), KEYBIND_MAP, spr); // Large map
- addButton(Common::Rect(260, 117, 284, 137), KEYBIND_VERSION, spr); // Info
- addButton(Common::Rect(286, 117, 310, 137), KEYBIND_QUICKREF, spr); // quickref
- addButton(Common::Rect(109, 137, 122, 147), KEYBIND_MENU, spr); // menu
+ addButton(Common::Rect(235, 96, 259, 116), KEYBIND_BASH, 6, spr);
+ addButton(Common::Rect(260, 96, 284, 116), KEYBIND_SEARCH, 40, &_iconSprites);
+ addButton(Common::Rect(286, 96, 310, 116), KEYBIND_ORDER, 44, &_iconSprites);
+ addButton(Common::Rect(235, 117, 259, 137), KEYBIND_MAP, 12, spr);
+ addButton(Common::Rect(260, 117, 284, 137), KEYBIND_UNLOCK, 14, spr);
+ addButton(Common::Rect(286, 117, 310, 137), KEYBIND_QUICKREF, 16, spr);
+
+ addButton(Common::Rect(109, 137, 122, 147), KEYBIND_MENU, 18, spr);
addButton(Common::Rect(235, 148, 259, 168), KEYBIND_TURN_LEFT, spr);
addButton(Common::Rect(260, 148, 284, 168), KEYBIND_FORWARDS, spr);
addButton(Common::Rect(286, 148, 310, 168), KEYBIND_TURN_RIGHT, spr);
@@ -59,6 +61,7 @@ bool GameCommands::msgAction(const ActionMessage & msg) {
_minimap.toggleMinimap();
return true;
default:
+ // Other button actions are handled by outer Game view
break;
}
diff --git a/engines/mm/mm1/views_enh/game_commands.h b/engines/mm/mm1/views_enh/game_commands.h
index 5d247b100a5..6cebc36d033 100644
--- a/engines/mm/mm1/views_enh/game_commands.h
+++ b/engines/mm/mm1/views_enh/game_commands.h
@@ -24,6 +24,7 @@
#include "mm/mm1/views_enh/button_container.h"
#include "mm/mm1/views_enh/map.h"
+#include "mm/shared/xeen/sprites.h"
namespace MM {
namespace MM1 {
@@ -49,6 +50,7 @@ class GameCommands : public ButtonContainer {
private:
Minimap _minimap;
+ Shared::Xeen::SpriteResource _iconSprites;
public:
GameCommands(UIElement *owner);
virtual ~GameCommands() {}
Commit: de0d4310743037a917c697daa3548f773d0e3100
https://github.com/scummvm/scummvm/commit/de0d4310743037a917c697daa3548f773d0e3100
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-21T19:29:48-07:00
Commit Message:
MM: MM1: Remove debug code for cycling interaction portraits
Changed paths:
engines/mm/mm1/views_enh/interactions/interaction.cpp
diff --git a/engines/mm/mm1/views_enh/interactions/interaction.cpp b/engines/mm/mm1/views_enh/interactions/interaction.cpp
index 2bfd9f9bf1a..5e7f7ca5725 100644
--- a/engines/mm/mm1/views_enh/interactions/interaction.cpp
+++ b/engines/mm/mm1/views_enh/interactions/interaction.cpp
@@ -146,16 +146,6 @@ bool Interaction::msgAction(const ActionMessage &msg) {
if (msg._action == KEYBIND_ESCAPE) {
leave();
- } else if (msg._action == KEYBIND_SELECT) {
- // ***DEBUG*** - Used for cycling through portraits.
- // To let me pick good portraits from Xeen
- _lines.clear();
- ++_portraitNum;
- _portrait.load(Common::String::format("face%02d.fac", _portraitNum));
-
- Interaction::draw();
- writeNumber(20, 70, _portraitNum);
-
} else if (!PartyView::msgAction(msg)) {
viewAction();
}
More information about the Scummvm-git-logs
mailing list