[Scummvm-git-logs] scummvm master -> 7781b50ddc0fff0b6024ee5d8630454a079ac702
dreammaster
noreply at scummvm.org
Sun Apr 9 04:18:49 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:
38d26b8c81 MM: MM1: Added WonGame view
425b04bd5a MM: MM1: Map 19 fixes
7781b50ddc MM: MM1: Map 20 fixes
Commit: 38d26b8c817f035df0fab2a5d21fc13b454e808a
https://github.com/scummvm/scummvm/commit/38d26b8c817f035df0fab2a5d21fc13b454e808a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-08T21:10:52-07:00
Commit Message:
MM: MM1: Added WonGame view
Changed paths:
A engines/mm/mm1/views_enh/won_game.cpp
A engines/mm/mm1/views_enh/won_game.h
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/maps/map18.cpp
engines/mm/mm1/views/maps/won_game.cpp
engines/mm/mm1/views/maps/won_game.h
engines/mm/mm1/views_enh/dialogs.h
engines/mm/module.mk
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 0cf33a2e8b2..bb34111d60b 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1250,14 +1250,19 @@ maps:
map18:
passage: "Cavernous passage to Erliquin,\ntake it (Y/N)?"
cave: "A cave, enter (Y/N)?"
- castle_north: "Castle blackridge north, enter (Y/N)?"
- castle_south: "Castle blackridge south, enter (Y/N)?"
+ castle_north: "Castle Blackridge North, enter (Y/N)?"
+ castle_south: "Castle Blackridge South, enter (Y/N)?"
ruins: "Ancient ruins of a deserted wizards lair\nshow signs of recent use, enter (Y/N)?"
- gates: "The gates to another world!\n"
- congratulations: "Congratulations distinguished \ntravelers! The gates are now\nopen to you, in order to pass\nthrough you must first find\n<ight and Magic Book Two !!!"
+ gates: "The Gates to Another World!\n"
+ congratulations: "Congratulations distinguished \ntravelers! The gates are now\nopen to you, in order to pass\nthrough you must first find\nMight and Magic Book Two !!!"
sign1: "A sign pointing S. reads: Blackridge N."
sign2: "A sign pointing E. reads: Blackridge S."
sign3: "A sign pointing E. reads: Erliquin"
+ emap18:
+ ruins: "Ancient ruins of a deserted wizard's lair show signs of recent use, enter (Y/N)?"
+ sign1: "A sign pointing S. reads:\nBlackridge N."
+ sign2: "A sign pointing E. reads:\nBlackridge S."
+ congratulations: "Congratulations distinguished \ntravelers! The gates are now\nopen to you. In order to pass\nthrough you must first find\nMight and Magic Book Two !!!"
map19:
ice_princess: "An a throne adorned with precious gems\nthe ice princess speaks,\n\"Conqueror of worlds, maker of dreams\nThe greatest force of all, yet elusive\nit seems.\"\n\nAnswer:> "
diff --git a/engines/mm/mm1/maps/map18.cpp b/engines/mm/mm1/maps/map18.cpp
index a63e790b6e9..b674e086259 100644
--- a/engines/mm/mm1/maps/map18.cpp
+++ b/engines/mm/mm1/maps/map18.cpp
@@ -140,19 +140,16 @@ void Map18::special06() {
}
void Map18::special07() {
- send(SoundMessage(STRING["maps.map18.gates"]));
-
bool hasWonGame = false;
for (uint i = 0; i < g_globals->_party.size(); ++i) {
- Character &c = g_globals->_party[i];
- g_globals->_currCharacter = &c;
-
- if (c._flags[13] & CHARFLAG13_80)
- hasWonGame = true;
+ const Character &c = g_globals->_party[i];
+ hasWonGame |= (c._flags[13] & CHARFLAG13_80) != 0;
}
if (hasWonGame)
g_events->addView("WonGame");
+ else
+ send(SoundMessage(STRING["maps.map18.gates"]));
}
void Map18::special08() {
diff --git a/engines/mm/mm1/views/maps/won_game.cpp b/engines/mm/mm1/views/maps/won_game.cpp
index 4f0951c79bf..05f994380d0 100644
--- a/engines/mm/mm1/views/maps/won_game.cpp
+++ b/engines/mm/mm1/views/maps/won_game.cpp
@@ -36,6 +36,7 @@ WonGame::WonGame() : TextView("WonGame") {
void WonGame::draw() {
clearSurface();
+ writeString(0, 0, STRING["maps.map18.gates"]);
writeString(0, 1, STRING["maps.map18.congratulations"]);
Sound::sound(SOUND_3);
}
@@ -45,6 +46,11 @@ bool WonGame::msgKeypress(const KeypressMessage &msg) {
return true;
}
+bool WonGame::msgAction(const ActionMessage &msg) {
+ close();
+ return true;
+}
+
} // namespace Maps
} // namespace Views
} // namespace MM1
diff --git a/engines/mm/mm1/views/maps/won_game.h b/engines/mm/mm1/views/maps/won_game.h
index acea9889520..c8b11febde5 100644
--- a/engines/mm/mm1/views/maps/won_game.h
+++ b/engines/mm/mm1/views/maps/won_game.h
@@ -36,6 +36,7 @@ public:
void draw() override;
bool msgKeypress(const KeypressMessage &msg) override;
+ bool msgAction(const ActionMessage &msg) override;
};
} // namespace Maps
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index 279fef4c34b..58f8a08f7b8 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -52,6 +52,7 @@
#include "mm/mm1/views_enh/which_character.h"
#include "mm/mm1/views_enh/which_item.h"
#include "mm/mm1/views_enh/who_will_try.h"
+#include "mm/mm1/views_enh/won_game.h"
#include "mm/mm1/views_enh/interactions/access_code.h"
#include "mm/mm1/views_enh/interactions/arrested.h"
#include "mm/mm1/views_enh/interactions/prisoners.h"
@@ -125,6 +126,7 @@ private:
ViewsEnh::WhichCharacter _whichCharacter;
ViewsEnh::WhichItem _whichItem;
ViewsEnh::WhoWillTry _whoWillTry;
+ ViewsEnh::WonGame _wonGame;
Views::Bash _bash;
public:
Dialogs() {}
diff --git a/engines/mm/mm1/views_enh/won_game.cpp b/engines/mm/mm1/views_enh/won_game.cpp
new file mode 100644
index 00000000000..acc895f6a41
--- /dev/null
+++ b/engines/mm/mm1/views_enh/won_game.cpp
@@ -0,0 +1,53 @@
+/* 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 "mm/mm1/views_enh/won_game.h"
+#include "mm/mm1/globals.h"
+#include "mm/mm1/sound.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+
+WonGame::WonGame() : ScrollView("WonGame") {
+ setBounds(Common::Rect(0, 0, 234, 144));
+}
+
+void WonGame::draw() {
+ ScrollView::draw();
+ writeLine(0, STRING["maps.map18.gates"], ALIGN_MIDDLE);
+ writeLine(1, STRING["maps.map18.congratulations"], ALIGN_MIDDLE);
+ Sound::sound(SOUND_3);
+}
+
+bool WonGame::msgKeypress(const KeypressMessage &msg) {
+ close();
+ return true;
+}
+
+bool WonGame::msgAction(const ActionMessage &msg) {
+ close();
+ return true;
+}
+
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/won_game.h b/engines/mm/mm1/views_enh/won_game.h
new file mode 100644
index 00000000000..19870b2f2e4
--- /dev/null
+++ b/engines/mm/mm1/views_enh/won_game.h
@@ -0,0 +1,45 @@
+/* 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 MM1_VIEWS_ENH_WON_GAME_H
+#define MM1_VIEWS_ENH_WON_GAME_H
+
+#include "mm/mm1/views_enh/scroll_view.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+
+class WonGame : public ScrollView {
+public:
+ WonGame();
+ virtual ~WonGame() {}
+
+ void draw() override;
+ bool msgKeypress(const KeypressMessage &msg) override;
+ bool msgAction(const ActionMessage &msg) override;
+};
+
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index e738bcce6b2..4cc733689b6 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -174,6 +174,7 @@ MODULE_OBJS += \
mm1/views_enh/which_character.o \
mm1/views_enh/which_item.o \
mm1/views_enh/who_will_try.o \
+ mm1/views_enh/won_game.o \
mm1/views_enh/yes_no.o \
mm1/views_enh/interactions/access_code.o \
mm1/views_enh/interactions/arrested.o \
Commit: 425b04bd5ac25c199dc511195c9e652b4f8a486a
https://github.com/scummvm/scummvm/commit/425b04bd5ac25c199dc511195c9e652b4f8a486a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-08T21:15:10-07:00
Commit Message:
MM: MM1: Map 19 fixes
Changed paths:
A engines/mm/mm1/views_enh/interactions/ice_princess.cpp
A engines/mm/mm1/views_enh/interactions/ice_princess.h
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/maps/map19.cpp
engines/mm/mm1/maps/map19.h
engines/mm/mm1/views/maps/ice_princess.cpp
engines/mm/mm1/views_enh/dialogs.h
engines/mm/mm1/views_enh/interactions/interaction.cpp
engines/mm/mm1/views_enh/interactions/interaction_query.cpp
engines/mm/module.mk
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index bb34111d60b..26b7a8ec9ca 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1265,12 +1265,16 @@ maps:
congratulations: "Congratulations distinguished \ntravelers! The gates are now\nopen to you. In order to pass\nthrough you must first find\nMight and Magic Book Two !!!"
map19:
- ice_princess: "An a throne adorned with precious gems\nthe ice princess speaks,\n\"Conqueror of worlds, maker of dreams\nThe greatest force of all, yet elusive\nit seems.\"\n\nAnswer:> "
+ ice_princess: "On a throne adorned with precious gems\nthe ice princess speaks,\n\"Conqueror of worlds, maker of dreams\nThe greatest force of all, yet elusive\nit seems.\"\n\nAnswer:> "
incorrect: "Wrong, you're too young to understand."
correct: "Correct!"
carving: "Carved on a tree: \"9-9 Raven's Lair\""
cave: "There's a cave here, enter (Y/N)?"
stairs_down: "A descending staircase is the entrance\nto a warriors stronghold, go in (Y/N)?"
+ emap19:
+ title: "Ice Princess"
+ ice_princess: "On a throne adorned with precious gems\nthe ice princess speaks,\n\"Conqueror of worlds, maker of dreams\nThe greatest force of all, yet elusive\nit seems.\""
+ stairs_down: "A descending staircase is the entrance to a warrior's stronghold, go in (Y/N)?"
map20:
passage: "Passage to Portsmith, take it (Y/N)?"
diff --git a/engines/mm/mm1/maps/map19.cpp b/engines/mm/mm1/maps/map19.cpp
index b2f11b72558..775fe322435 100644
--- a/engines/mm/mm1/maps/map19.cpp
+++ b/engines/mm/mm1/maps/map19.cpp
@@ -36,6 +36,7 @@ namespace Maps {
#define VAL5 164
#define VAL6 165
#define VAL7 166
+#define ANSWER_OFFSET 167
void Map19::special() {
// Scan for special actions on the map cell
@@ -125,6 +126,42 @@ void Map19::encounter() {
enc.execute();
}
+void Map19::riddleAnswer(const Common::String &answer) {
+ Common::String properAnswer;
+ _data[VAL1] = answer.size();
+
+ for (int i = 0; i < 4; ++i)
+ properAnswer += (_data[ANSWER_OFFSET + i] & 0x7f) + 64;
+
+ if (answer.equalsIgnoreCase(properAnswer)) {
+ InfoMessage msg(
+ 16, 2, STRING["maps.map19.correct"],
+ []() {
+ g_maps->clearSpecial();
+
+ if (g_globals->_party.hasItem(DIAMOND_KEY_ID)) {
+ g_globals->_treasure._items[2] = BRONZE_KEY_ID;
+ g_events->addAction(KEYBIND_SEARCH);
+ return;
+ }
+
+ g_globals->_treasure._items[2] = DIAMOND_KEY_ID;
+ g_events->addAction(KEYBIND_SEARCH);
+ }
+ );
+
+ msg._delaySeconds = 2;
+ send(msg);
+ Sound::sound(SOUND_3);
+ Sound::sound(SOUND_3);
+
+ } else {
+ g_maps->_mapPos.x = 15;
+ updateGame();
+ send(SoundMessage(STRING["maps.map19.incorrect"]));
+ }
+}
+
} // namespace Maps
} // namespace MM1
} // namespace MM
diff --git a/engines/mm/mm1/maps/map19.h b/engines/mm/mm1/maps/map19.h
index a3fa999b2af..98a69e8e84a 100644
--- a/engines/mm/mm1/maps/map19.h
+++ b/engines/mm/mm1/maps/map19.h
@@ -54,6 +54,11 @@ public:
* Handles all special stuff that happens on the map
*/
void special() override;
+
+ /**
+ * Ice Princess riddle answer
+ */
+ void riddleAnswer(const Common::String &answer);
};
} // namespace Maps
diff --git a/engines/mm/mm1/views/maps/ice_princess.cpp b/engines/mm/mm1/views/maps/ice_princess.cpp
index ebe41fc7345..4b177669425 100644
--- a/engines/mm/mm1/views/maps/ice_princess.cpp
+++ b/engines/mm/mm1/views/maps/ice_princess.cpp
@@ -29,9 +29,6 @@ namespace MM1 {
namespace Views {
namespace Maps {
-#define VAL1 123
-#define ANSWER_OFFSET 167
-
IcePrincess::IcePrincess() :
AnswerEntry("IcePrincess", Common::Point(9, 7), 10) {
_bounds = getLineBounds(17, 24);
@@ -44,44 +41,8 @@ void IcePrincess::draw() {
}
void IcePrincess::answerEntered() {
- MM1::Maps::Map &map = *g_maps->_currentMap;
- Common::String properAnswer;
- map[VAL1] = _answer.size();
- close();
-
- for (int i = 0; i < 4; ++i)
- properAnswer += (map[ANSWER_OFFSET + i] & 0x7f) + 64;
-
- if (_answer.equalsIgnoreCase(properAnswer)) {
- InfoMessage msg(
- 16, 2, STRING["maps.map19.correct"],
- []() {
- g_maps->clearSpecial();
-
- for (uint i = 0; i < g_globals->_party.size(); ++i) {
- g_globals->_currCharacter = &g_globals->_party[i];
- if (g_globals->_currCharacter->_backpack.indexOf(DIAMOND_KEY_ID) != -1) {
- g_globals->_treasure._items[2] = 237;
- g_events->addAction(KEYBIND_SEARCH);
- return;
- }
- }
-
- g_globals->_treasure._items[2] = 240;
- g_events->addAction(KEYBIND_SEARCH);
- }
- );
-
- msg._delaySeconds = 2;
- send(msg);
- Sound::sound(SOUND_3);
- Sound::sound(SOUND_3);
-
- } else {
- g_maps->_mapPos.x = 15;
- g_events->send("Game", GameMessage("UPDATE"));
- send(SoundMessage(STRING["maps.map19.incorrect"]));
- }
+ MM1::Maps::Map19 &map = *static_cast<MM1::Maps::Map19 *>(g_maps->_currentMap);
+ map.riddleAnswer(_answer);
}
} // namespace Maps
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index 58f8a08f7b8..eacd4e5254b 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -55,6 +55,7 @@
#include "mm/mm1/views_enh/won_game.h"
#include "mm/mm1/views_enh/interactions/access_code.h"
#include "mm/mm1/views_enh/interactions/arrested.h"
+#include "mm/mm1/views_enh/interactions/ice_princess.h"
#include "mm/mm1/views_enh/interactions/prisoners.h"
#include "mm/mm1/views_enh/interactions/resistances.h"
#include "mm/mm1/views_enh/interactions/statue.h"
@@ -77,6 +78,7 @@ struct Dialogs {
private:
ViewsEnh::Interactions::AccessCode _accessCode;
ViewsEnh::Interactions::Arrested _arrested;
+ ViewsEnh::Interactions::IcePrincess _icePrincess;
ViewsEnh::Interactions::Resistances _resistances;
ViewsEnh::Interactions::Statue _statue;
ViewsEnh::Interactions::VolcanoGod _volcanoGod;
diff --git a/engines/mm/mm1/views_enh/interactions/ice_princess.cpp b/engines/mm/mm1/views_enh/interactions/ice_princess.cpp
new file mode 100644
index 00000000000..a7404108c71
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/ice_princess.cpp
@@ -0,0 +1,44 @@
+/* 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 "mm/mm1/views_enh/interactions/ice_princess.h"
+#include "mm/mm1/maps/map19.h"
+#include "mm/mm1/globals.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+IcePrincess::IcePrincess() : InteractionQuery("IcePrincess", 10, 19) {
+ _title = STRING["maps.emap19.title"];
+ addText(STRING["maps.emap19.ice_princess"]);
+}
+
+void IcePrincess::answerEntered() {
+ MM1::Maps::Map19 &map = *static_cast<MM1::Maps::Map19 *>(g_maps->_currentMap);
+ map.riddleAnswer(_answer);
+}
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/interactions/ice_princess.h b/engines/mm/mm1/views_enh/interactions/ice_princess.h
new file mode 100644
index 00000000000..623f90a616a
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/ice_princess.h
@@ -0,0 +1,51 @@
+/* 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 MM1_VIEWS_ENH_INTERACTIONS_ICE_PRINCESS_H
+#define MM1_VIEWS_ENH_INTERACTIONS_ICE_PRINCESS_H
+
+#include "mm/mm1/views_enh/interactions/interaction_query.h"
+#include "mm/mm1/data/character.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+class IcePrincess : public InteractionQuery {
+private:
+protected:
+ /**
+ * Answer entered
+ */
+ void answerEntered() override;
+
+public:
+ IcePrincess();
+ virtual ~IcePrincess() {}
+};
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif
diff --git a/engines/mm/mm1/views_enh/interactions/interaction.cpp b/engines/mm/mm1/views_enh/interactions/interaction.cpp
index d0f194f6b1e..5f019c50117 100644
--- a/engines/mm/mm1/views_enh/interactions/interaction.cpp
+++ b/engines/mm/mm1/views_enh/interactions/interaction.cpp
@@ -77,7 +77,7 @@ void Interaction::draw() {
// Write any text lines
for (uint i = 0; i < _lines.size(); ++i) {
- writeLine(i, _lines[i], ALIGN_MIDDLE);
+ writeString(0, (6 + i) * 9 - 5, _lines[i], ALIGN_MIDDLE);
}
// Write out any buttons
diff --git a/engines/mm/mm1/views_enh/interactions/interaction_query.cpp b/engines/mm/mm1/views_enh/interactions/interaction_query.cpp
index e94c9c0c7ed..8a305a36fc8 100644
--- a/engines/mm/mm1/views_enh/interactions/interaction_query.cpp
+++ b/engines/mm/mm1/views_enh/interactions/interaction_query.cpp
@@ -45,10 +45,9 @@ void InteractionQuery::draw() {
assert(_buttons.empty());
int xp = (_innerBounds.width() / 2) - (_maxChars * 8 / 2);
- int yp = (8 + _lines.size()) * 8;
+ int yp = (8 + _lines.size()) * 9 - 5;
- _textEntry.display(xp + _innerBounds.left, yp + _innerBounds.top,
- _maxChars, false,
+ _textEntry.display(xp, yp, _maxChars, false,
[]() {
auto *view = static_cast<InteractionQuery *>(g_events->focusedView());
view->answerEntry("");
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 4cc733689b6..d6b1e02869d 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -178,6 +178,7 @@ MODULE_OBJS += \
mm1/views_enh/yes_no.o \
mm1/views_enh/interactions/access_code.o \
mm1/views_enh/interactions/arrested.o \
+ mm1/views_enh/interactions/ice_princess.o \
mm1/views_enh/interactions/interaction.o \
mm1/views_enh/interactions/interaction_query.o \
mm1/views_enh/interactions/prisoners.o \
Commit: 7781b50ddc0fff0b6024ee5d8630454a079ac702
https://github.com/scummvm/scummvm/commit/7781b50ddc0fff0b6024ee5d8630454a079ac702
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-08T21:18:38-07:00
Commit Message:
MM: MM1: Map 20 fixes
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 26b7a8ec9ca..cf5766747ca 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1279,13 +1279,15 @@ maps:
map20:
passage: "Passage to Portsmith, take it (Y/N)?"
cave: "A cave, enter (Y/N)?"
- castle: "Castle white wolf, enter (Y/N)?"
+ castle: "Castle White Wolf, enter (Y/N)?"
whistle: "Your ruby whistle begins to glow,\nblow it (0-9 times)?"
stairs_down: "Stairs going down, enter (Y/N)?"
temple: "An ancient temple converted to a\nstronghold has no apparent entrance."
peak: "Atop this peak looking:\n\nN= A cave beyond white wolf.\nE= Large beasts above wyvern peaks!\nS= Distant uncharted isles.\nW= A pirate ship beyond korin bluffs."
sign1: "A sign pointing N. reads: White Wolf"
sign2: "A sign pointing S. reads: Portsmith"
+ emap20:
+ peak: "Atop this peak looking:\n\nN= A cave beyond White Wolf.\nE= Large beasts above Wyvern Peaks!\nS= Distant uncharted isles.\nW= A pirate ship beyond Korin Bluffs."
map21:
trivia_island: "Trivia Island! 500 gold, enter (Y/N)?"
More information about the Scummvm-git-logs
mailing list