[Scummvm-git-logs] scummvm master -> d4af61685055174114b38ecbf963422e71b89089
dreammaster
noreply at scummvm.org
Mon Apr 10 05:18:08 UTC 2023
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:
50eaeda2ce MM: MM1: Added map 31 alien
d4af616850 MM: MM1: Added map 32 lion
Commit: 50eaeda2ce4c885bdbb075f48214cc8fe5065709
https://github.com/scummvm/scummvm/commit/50eaeda2ce4c885bdbb075f48214cc8fe5065709
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-09T21:34:28-07:00
Commit Message:
MM: MM1: Added map 31 alien
Changed paths:
A engines/mm/mm1/views_enh/interactions/alien.cpp
A engines/mm/mm1/views_enh/interactions/alien.h
devtools/create_mm/files/mm1/strings_en.yml
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 e516e5cd341..3e3ce6e8ae0 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1438,6 +1438,12 @@ maps:
flash: "A bright flash!"
varnlings: "\"Varnlings take heed! our prisoner has\nescaped and may be disguised as a noble.\nFind his counterpart to expose him!\""
poof: "Poof!"
+ emap31:
+ alien_title: "Alien"
+ alien: "Scattered remains of a metallic craft!\nAn alien grunts, \"Eep op oop!\"\nReaction?"
+ option_a: "Hostile"
+ option_b: "Neutral"
+ option_c: "Friendly"
map32:
castle: "King alamar's castle, enter (Y/N)?"
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index 278167714fa..d927392e223 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -54,6 +54,7 @@
#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/alien.h"
#include "mm/mm1/views_enh/interactions/arenko.h"
#include "mm/mm1/views_enh/interactions/arrested.h"
#include "mm/mm1/views_enh/interactions/chess.h"
@@ -82,6 +83,7 @@ namespace ViewsEnh {
struct Dialogs {
private:
ViewsEnh::Interactions::AccessCode _accessCode;
+ ViewsEnh::Interactions::Alien _alien;
ViewsEnh::Interactions::Arenko _arenko;
ViewsEnh::Interactions::Arrested _arrested;
ViewsEnh::Interactions::Chess _chess;
diff --git a/engines/mm/mm1/views_enh/interactions/alien.cpp b/engines/mm/mm1/views_enh/interactions/alien.cpp
new file mode 100644
index 00000000000..66919cc99fa
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/alien.cpp
@@ -0,0 +1,67 @@
+/* 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/alien.h"
+#include "mm/mm1/maps/map31.h"
+#include "mm/mm1/globals.h"
+
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+Alien::Alien() : Interaction("Alien", 37) {
+ _title = STRING["maps.emap31.alien_title"];
+ addText(STRING["maps.emap31.alien"]);
+ addButton(STRING["maps.emap31.option_a"], 'A');
+ addButton(STRING["maps.emap31.option_b"], 'B');
+ addButton(STRING["maps.emap31.option_c"], 'C');
+}
+
+bool Alien::msgKeypress(const KeypressMessage &msg) {
+ MM1::Maps::Map31 &map = *static_cast<MM1::Maps::Map31 *>(
+ g_maps->_currentMap);
+
+ switch (msg.keycode) {
+ case Common::KEYCODE_a:
+ close();
+ map.hostile();
+ break;
+ case Common::KEYCODE_b:
+ close();
+ map.neutral();
+ break;
+ case Common::KEYCODE_c:
+ close();
+ map.friendly();
+ break;
+ default:
+ break;
+ }
+
+ return true;
+}
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/interactions/alien.h b/engines/mm/mm1/views_enh/interactions/alien.h
new file mode 100644
index 00000000000..a259042355f
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/alien.h
@@ -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/>.
+ *
+ */
+
+#ifndef MM1_VIEWS_ENH_INTERACTIONS_ALIEN_H
+#define MM1_VIEWS_ENH_INTERACTIONS_ALIEN_H
+
+#include "mm/mm1/views_enh/interactions/interaction.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+class Alien : public Interaction {
+public:
+ Alien();
+
+ bool msgKeypress(const KeypressMessage &msg) override;
+};
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 1726d964979..5ce4d6dd62e 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -179,6 +179,7 @@ MODULE_OBJS += \
mm1/views_enh/won_game.o \
mm1/views_enh/yes_no.o \
mm1/views_enh/interactions/access_code.o \
+ mm1/views_enh/interactions/alien.o \
mm1/views_enh/interactions/arenko.o \
mm1/views_enh/interactions/arrested.o \
mm1/views_enh/interactions/chess.o \
Commit: d4af61685055174114b38ecbf963422e71b89089
https://github.com/scummvm/scummvm/commit/d4af61685055174114b38ecbf963422e71b89089
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-04-09T21:49:05-07:00
Commit Message:
MM: MM1: Added map 32 lion
Changed paths:
A engines/mm/mm1/views_enh/interactions/lion.cpp
A engines/mm/mm1/views_enh/interactions/lion.h
devtools/create_mm/files/mm1/strings_en.yml
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 3e3ce6e8ae0..b78e20a300c 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1448,21 +1448,24 @@ maps:
map32:
castle: "King alamar's castle, enter (Y/N)?"
door: "A diamond door!"
- key: " Use your key (Y/N)?"
+ key: "Use your key (Y/N)?"
statue: "Statue of a lion growls, \"Password?\"\nResponse:> .........."
password: "is the password for today,\nleave the area and change it i may!\""
heratio: "Heratio harper sings:"
music: "Distant harp music..."
passwords:
- 0: "musical"
- 1: "tones"
- 2: "together"
- 3: "clerics"
- 4: "south"
- 5: "deem"
- 6: "worthy"
+ 0: "Musical"
+ 1: "Tones"
+ 2: "Together"
+ 3: "Clerics"
+ 4: "South"
+ 5: "Deem"
+ 6: "Worthy"
trespassing: "Trespassing!"
correct: "Correct! you may pass."
+ emap32:
+ statue: "Statue of a lion growls, \"Password?\"\n"
+ statue_title: "Lion Statue"
map33:
building: "The fabled building of gold,\nenter (Y/N)?"
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index d927392e223..6299c393370 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -61,6 +61,7 @@
#include "mm/mm1/views_enh/interactions/giant.h"
#include "mm/mm1/views_enh/interactions/gypsy.h"
#include "mm/mm1/views_enh/interactions/ice_princess.h"
+#include "mm/mm1/views_enh/interactions/lion.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"
@@ -90,6 +91,7 @@ private:
ViewsEnh::Interactions::Giant _giant;
ViewsEnh::Interactions::Gypsy _gypsy;
ViewsEnh::Interactions::IcePrincess _icePrincess;
+ ViewsEnh::Interactions::Lion _lion;
ViewsEnh::Interactions::Resistances _resistances;
ViewsEnh::Interactions::Statue _statue;
ViewsEnh::Interactions::Trivia _trivia;
diff --git a/engines/mm/mm1/views_enh/interactions/lion.cpp b/engines/mm/mm1/views_enh/interactions/lion.cpp
new file mode 100644
index 00000000000..d77b942301c
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/lion.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/lion.h"
+#include "mm/mm1/maps/map32.h"
+#include "mm/mm1/globals.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+namespace Interactions {
+
+Lion::Lion() : InteractionQuery("Lion", 10) {
+ _title = STRING["maps.emap32.statue_title"];
+ addText(STRING["maps.emap32.statue"]);
+}
+
+void Lion::answerEntered() {
+ MM1::Maps::Map32 &map = *static_cast<MM1::Maps::Map32 *>(g_maps->_currentMap);
+ map.passwordEntered(_answer);
+}
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
diff --git a/engines/mm/mm1/views_enh/interactions/lion.h b/engines/mm/mm1/views_enh/interactions/lion.h
new file mode 100644
index 00000000000..953abf6395e
--- /dev/null
+++ b/engines/mm/mm1/views_enh/interactions/lion.h
@@ -0,0 +1,50 @@
+/* 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_LION_H
+#define MM1_VIEWS_ENH_INTERACTIONS_LION_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 Lion : public InteractionQuery {
+protected:
+ /**
+ * Answer entered
+ */
+ void answerEntered() override;
+
+public:
+ Lion();
+ virtual ~Lion() {}
+};
+
+} // namespace Interactions
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 5ce4d6dd62e..6abecad7af6 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -188,6 +188,7 @@ MODULE_OBJS += \
mm1/views_enh/interactions/ice_princess.o \
mm1/views_enh/interactions/interaction.o \
mm1/views_enh/interactions/interaction_query.o \
+ mm1/views_enh/interactions/lion.o \
mm1/views_enh/interactions/prisoners.o \
mm1/views_enh/interactions/resistances.o \
mm1/views_enh/interactions/statue.o \
More information about the Scummvm-git-logs
mailing list