[Scummvm-git-logs] scummvm master -> e82dedb825c8c59e44eca5614853c85afca0943c
dreammaster
noreply at scummvm.org
Tue Feb 14 06:28:44 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:
a5d06949dc MM: MM1: Allow Space & Enter to close message dialogs
65e89b9309 MM: MM1: Don't try viewing char info for empty party slots
e82dedb825 MM: MM1: Fix button text in Char Info
Commit: a5d06949dc0c87daef1dca85d3c79c7d3328e63f
https://github.com/scummvm/scummvm/commit/a5d06949dc0c87daef1dca85d3c79c7d3328e63f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-13T22:06:16-08:00
Commit Message:
MM: MM1: Allow Space & Enter to close message dialogs
Changed paths:
engines/mm/mm1/game/view_base.cpp
engines/mm/mm1/metaengine.cpp
diff --git a/engines/mm/mm1/game/view_base.cpp b/engines/mm/mm1/game/view_base.cpp
index 3e95d229c87..3225cdf8375 100644
--- a/engines/mm/mm1/game/view_base.cpp
+++ b/engines/mm/mm1/game/view_base.cpp
@@ -78,6 +78,10 @@ darkness:
bool ViewBase::msgAction(const ActionMessage &msg) {
switch (msg._action) {
+ case KEYBIND_SELECT:
+ // Shortcut for closing messages
+ g_events->redraw();
+ break;
case KEYBIND_FORWARDS:
case KEYBIND_STRAFE_LEFT:
case KEYBIND_STRAFE_RIGHT:
diff --git a/engines/mm/mm1/metaengine.cpp b/engines/mm/mm1/metaengine.cpp
index ba1c694382f..f1a5f6fe142 100644
--- a/engines/mm/mm1/metaengine.cpp
+++ b/engines/mm/mm1/metaengine.cpp
@@ -69,6 +69,7 @@ static const KeybindingRecord COMBAT_KEYS[] = {
};
static const KeybindingRecord NORMAL_KEYS[] = {
+ { KEYBIND_SELECT, "SELECT", "Select", "RETURN", nullptr },
{ KEYBIND_FORWARDS, "FORWARDS", "Forwards", "UP", nullptr },
{ KEYBIND_BACKWARDS, "BACKWARDS", "Backwards", "DOWN", nullptr },
{ KEYBIND_TURN_LEFT, "TURN_LEFT", "Turn Left", "LEFT", nullptr },
@@ -150,6 +151,8 @@ Common::KeymapArray MetaEngine::initKeymaps(KeybindingMode mode) {
act->addDefaultInputMapping(r->_key);
if (r->_joy)
act->addDefaultInputMapping(r->_joy);
+ if (r->_action == KEYBIND_SELECT)
+ act->addDefaultInputMapping("SPACE");
if (r->_action == KEYBIND_FORWARDS || r->_action == KEYBIND_BACKWARDS ||
r->_action == KEYBIND_TURN_LEFT || r->_action == KEYBIND_TURN_RIGHT ||
Commit: 65e89b9309e5e46b14e0194807fce76f0d5707a6
https://github.com/scummvm/scummvm/commit/65e89b9309e5e46b14e0194807fce76f0d5707a6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-13T22:15:23-08:00
Commit Message:
MM: MM1: Don't try viewing char info for empty party slots
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/views_enh/character_info.cpp
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index e6737d300ad..01ddcfce923 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -430,51 +430,51 @@ enhdialogs:
west: "West"
character:
stats:
- might: "mgt"
- intelligence: "int"
- personality: "per"
- endurance: "end"
- speed: "spd"
- accuracy: "acy"
- luck: "luc"
- age: "age"
- level: "lvl"
- ac: "ac"
- hp: "h.p."
- sp: "s.p."
- spells: "spells"
- condition: "condition"
- experience: "experience"
- gold: "gold"
- gems: "gems"
- food: "food"
- days: "days"
- day: "day"
+ might: "Mgt"
+ intelligence: "Int"
+ personality: "Per"
+ endurance: "End"
+ speed: "Spd"
+ accuracy: "Acy"
+ luck: "Luc"
+ age: "Age"
+ level: "Lvl"
+ ac: "AC"
+ hp: "H.P."
+ sp: "S.P."
+ spells: "Spells"
+ condition: "Condition"
+ experience: "Experience"
+ gold: "Gold"
+ gems: "Gems"
+ food: "Food"
+ days: "Days"
+ day: "Day"
long:
- current: "current"
- base: "base"
- might: "might"
- intelligence: "intelligence"
- personality: "personality"
- endurance: "endurance"
- speed: "speed"
- accuracy: "accuracy"
- luck: "luck"
- age: "age"
- level: "level"
- ac: "armor class"
- hp: "hit points"
- sp: "spell points"
- spells: "active spells"
- next_level: "next level"
- eligible: "eligible"
- ineligible: "ineligible"
- on_hand: "on hand"
+ current: "Current"
+ base: "Base"
+ might: "Might"
+ intelligence: "Intelligence"
+ personality: "Personality"
+ endurance: "Endurance"
+ speed: "Speed"
+ accuracy: "Accuracy"
+ luck: "Luck"
+ age: "Age"
+ level: "Level"
+ ac: "Armor Class"
+ hp: "Hit Points"
+ sp: "Spell Points"
+ spells: "Active Spells"
+ next_level: "Next Level"
+ eligible: "Eligible"
+ ineligible: "Ineligible"
+ on_hand: "On Hand"
item: "\x01""37item"
quick: "\x01""37quick"
exchange: "\x01""37exch"
conditions:
- good: "good"
+ good: "Good"
location:
store: "store"
options: "options"
diff --git a/engines/mm/mm1/views_enh/character_info.cpp b/engines/mm/mm1/views_enh/character_info.cpp
index 4da2e5313c0..6eb5498649f 100644
--- a/engines/mm/mm1/views_enh/character_info.cpp
+++ b/engines/mm/mm1/views_enh/character_info.cpp
@@ -149,10 +149,14 @@ bool CharacterInfo::msgAction(const ActionMessage &msg) {
return true;
} else if (msg._action >= KEYBIND_VIEW_PARTY1 &&
msg._action <= KEYBIND_VIEW_PARTY6) {
- g_globals->_currCharacter = &g_globals->_party[
+ uint charNum = msg._action - KEYBIND_VIEW_PARTY1;
+ if (charNum < g_globals->_party.size()) {
+ g_globals->_currCharacter = &g_globals->_party[
msg._action - KEYBIND_VIEW_PARTY1];
- g_events->findView("GameParty")->draw();
- redraw();
+ g_events->findView("GameParty")->draw();
+ redraw();
+ }
+
return true;
}
Commit: e82dedb825c8c59e44eca5614853c85afca0943c
https://github.com/scummvm/scummvm/commit/e82dedb825c8c59e44eca5614853c85afca0943c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-13T22:28:33-08:00
Commit Message:
MM: MM1: Fix button text in Char Info
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/shared/utils/strings_data.cpp
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 01ddcfce923..5caf8d03fa4 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -470,9 +470,9 @@ enhdialogs:
eligible: "Eligible"
ineligible: "Ineligible"
on_hand: "On Hand"
- item: "\x01""37item"
- quick: "\x01""37quick"
- exchange: "\x01""37exch"
+ item: "\x01""37Item"
+ quick: "\x01""37Quick"
+ exchange: "\x01""37Exch"
conditions:
good: "Good"
location:
@@ -485,7 +485,7 @@ enhdialogs:
thankyou: "thank you,\ncome again!"
no_gold: "no gold,\nno food!"
misc:
- exit: "exit"
+ exit: "Exit"
quickref:
title: "Quick Reference Chart"
headers:
diff --git a/engines/mm/shared/utils/strings_data.cpp b/engines/mm/shared/utils/strings_data.cpp
index efd6473d5f0..eac84a94baa 100644
--- a/engines/mm/shared/utils/strings_data.cpp
+++ b/engines/mm/shared/utils/strings_data.cpp
@@ -62,11 +62,15 @@ bool StringsData::load(const Common::String &filename) {
key.trim();
value.trim();
+ if (value.contains("quick")) {
+ warning("%s", value.c_str());
+ }
+
// Strip quotes from start and end of string
if (value.hasPrefix("\"") && value.hasSuffix("\"")) {
value.deleteChar(0);
value.deleteLastChar();
- value = searchAndReplace(value, "\"\"", "\"");
+ value = searchAndReplace(value, "\"\"", "");
}
// Replace any sequences
More information about the Scummvm-git-logs
mailing list