[Scummvm-git-logs] scummvm master -> 2e5c4da1dc04acf42b82ca43b48e192ae99f0ec4
sluicebox
noreply at scummvm.org
Sat Oct 26 20:38:19 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:
c1a31b97bc ENGINES: Add newline at EOF
2e5c4da1dc AGI: Cleanup mouse config
Commit: c1a31b97bcf7ef506a3d960d55f353ed9cbf9ac4
https://github.com/scummvm/scummvm/commit/c1a31b97bcf7ef506a3d960d55f353ed9cbf9ac4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-10-26T13:37:20-07:00
Commit Message:
ENGINES: Add newline at EOF
Changed paths:
engines/enhancements.h
diff --git a/engines/enhancements.h b/engines/enhancements.h
index 8f00860ccd4..4e2aa04489c 100644
--- a/engines/enhancements.h
+++ b/engines/enhancements.h
@@ -170,4 +170,4 @@ enum {
kEnhGrp4 = (kEnhUIUX)
};
-#endif
\ No newline at end of file
+#endif
Commit: 2e5c4da1dc04acf42b82ca43b48e192ae99f0ec4
https://github.com/scummvm/scummvm/commit/2e5c4da1dc04acf42b82ca43b48e192ae99f0ec4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-10-26T13:37:20-07:00
Commit Message:
AGI: Cleanup mouse config
Changed paths:
engines/agi/agi.cpp
engines/agi/detection.h
engines/agi/detection_tables.h
engines/agi/metaengine.cpp
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index abcc40af76a..e49ad5960d6 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -416,21 +416,10 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
memset(&_debug, 0, sizeof(struct AgiDebug));
- _game.mouseEnabled = true;
- _game.mouseHidden = false;
- _game.predictiveDlgOnMouseClick = false;
-
- // don't check for Amiga, Amiga doesn't allow disabling mouse support. It's mandatory.
- if (!ConfMan.getBool("mousesupport")) {
- // we effectively disable the mouse for games, that explicitly do not want mouse support to be enabled
- _game.mouseEnabled = false;
- _game.mouseHidden = true;
- }
+ _game.mouseEnabled = ConfMan.getBool("mousesupport");
+ _game.mouseHidden = !_game.mouseEnabled;
- ConfMan.registerDefault("predictivedlgonmouseclick", false);
- if (ConfMan.getBool("predictivedlgonmouseclick")) {
- _game.predictiveDlgOnMouseClick = true;
- }
+ _game.predictiveDlgOnMouseClick = ConfMan.getBool("predictivedlgonmouseclick");
_game._vm = this;
diff --git a/engines/agi/detection.h b/engines/agi/detection.h
index d7f652bff2a..d1d7f7a53ba 100644
--- a/engines/agi/detection.h
+++ b/engines/agi/detection.h
@@ -39,13 +39,12 @@ struct AGIGameDescription {
#define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
#define GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE GUIO_GAMEOPTIONS2
-#define GAMEOPTION_DISABLE_MOUSE GUIO_GAMEOPTIONS3
+#define GAMEOPTION_ENABLE_MOUSE GUIO_GAMEOPTIONS3
#define GAMEOPTION_USE_HERCULES_FONT GUIO_GAMEOPTIONS4
#define GAMEOPTION_COMMAND_PROMPT_WINDOW GUIO_GAMEOPTIONS5
#define GAMEOPTION_APPLE2GS_ADD_SPEED_MENU GUIO_GAMEOPTIONS6
#define GAMEOPTION_COPY_PROTECTION GUIO_GAMEOPTIONS7
#define GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE GUIO_GAMEOPTIONS8
- // TODO: properly implement GAMEOPTIONs
} // End of namespace Agi
diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h
index 0fa0197f824..7c89d847f8f 100644
--- a/engines/agi/detection_tables.h
+++ b/engines/agi/detection_tables.h
@@ -23,13 +23,13 @@
namespace Agi {
-#define GAMEOPTIONS_DEFAULT GUIO5(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW)
-#define GAMEOPTIONS_DEFAULT_CP GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GAMEOPTION_COPY_PROTECTION)
+#define GAMEOPTIONS_DEFAULT GUIO5(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW)
+#define GAMEOPTIONS_DEFAULT_CP GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GAMEOPTION_COPY_PROTECTION)
#define GAMEOPTIONS_AMIGA GUIO5(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW)
#define GAMEOPTIONS_AMIGA_CP GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GAMEOPTION_COPY_PROTECTION)
-#define GAMEOPTIONS_APPLE2GS GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW, GAMEOPTION_APPLE2GS_ADD_SPEED_MENU)
-#define GAMEOPTIONS_APPLE2GS_CP GUIO7(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW, GAMEOPTION_APPLE2GS_ADD_SPEED_MENU, GAMEOPTION_COPY_PROTECTION)
-#define GAMEOPTIONS_VGA GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GUIO_RENDERVGA)
+#define GAMEOPTIONS_APPLE2GS GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW, GAMEOPTION_APPLE2GS_ADD_SPEED_MENU)
+#define GAMEOPTIONS_APPLE2GS_CP GUIO7(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW, GAMEOPTION_APPLE2GS_ADD_SPEED_MENU, GAMEOPTION_COPY_PROTECTION)
+#define GAMEOPTIONS_VGA GUIO6(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_MOUSE,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GUIO_RENDERVGA)
#define GAMEOPTIONS_FANMADE_MOUSE GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW)
#define GAMEOPTIONS_FANMADE_MOUSE_VGA GUIO5(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW,GUIO_RENDERVGA)
diff --git a/engines/agi/metaengine.cpp b/engines/agi/metaengine.cpp
index 9cff4d49e56..4bf41a0b7b0 100644
--- a/engines/agi/metaengine.cpp
+++ b/engines/agi/metaengine.cpp
@@ -130,7 +130,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
},
{
- GAMEOPTION_DISABLE_MOUSE,
+ GAMEOPTION_ENABLE_MOUSE,
{
_s("Mouse support"),
_s("Enables mouse support. Allows to use mouse for movement and in game menus."),
@@ -144,8 +144,8 @@ static const ADExtraGuiOptionsMap optionsList[] = {
{
GAMEOPTION_ENABLE_PREDICTIVE_FOR_MOUSE,
{
- _s("Predictive Input Dialogue on mouse click"),
- _s("Enables the assistive Predictive Input Dialogue specifically for when clicking the left mouse button within text input fields.\nThe Predictive Input Dialogue can still be activated on demand if there's a specified key mapping for it"),
+ _s("Predictive Input Dialog on mouse click"),
+ _s("Enables the assistive Predictive Input Dialog specifically for when clicking the left mouse button within text input fields.\nThe Predictive Input Dialog can still be activated on demand if there's a specified key mapping for it"),
"predictivedlgonmouseclick",
false,
0,
More information about the Scummvm-git-logs
mailing list