[Scummvm-git-logs] scummvm master -> 305ec4f1875436ce9e17d5f79dce8994580ef2b2

[dreammaster]

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:
bc58b0e83a MM: MM1: Change Views::Maps to Views::Interactions
305ec4f187 MM: MM1: Clicking on options button shows GMM


Commit: bc58b0e83a39920f1c9f4c4fcbcb05b8701bceab
    https://github.com/scummvm/scummvm/commit/bc58b0e83a39920f1c9f4c4fcbcb05b8701bceab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-20T21:22:48-07:00

Commit Message:
MM: MM1: Change Views::Maps to Views::Interactions

This is for consistency with the ViewsEnh namespace

Changed paths:
  A engines/mm/mm1/views/interactions/access_code.cpp
  A engines/mm/mm1/views/interactions/access_code.h
  A engines/mm/mm1/views/interactions/alamar.cpp
  A engines/mm/mm1/views/interactions/alamar.h
  A engines/mm/mm1/views/interactions/alien.cpp
  A engines/mm/mm1/views/interactions/alien.h
  A engines/mm/mm1/views/interactions/answer_entry.cpp
  A engines/mm/mm1/views/interactions/answer_entry.h
  A engines/mm/mm1/views/interactions/arenko.cpp
  A engines/mm/mm1/views/interactions/arenko.h
  A engines/mm/mm1/views/interactions/arrested.cpp
  A engines/mm/mm1/views/interactions/arrested.h
  A engines/mm/mm1/views/interactions/chess.cpp
  A engines/mm/mm1/views/interactions/chess.h
  A engines/mm/mm1/views/interactions/dog_statue.cpp
  A engines/mm/mm1/views/interactions/dog_statue.h
  A engines/mm/mm1/views/interactions/ghost.cpp
  A engines/mm/mm1/views/interactions/ghost.h
  A engines/mm/mm1/views/interactions/giant.cpp
  A engines/mm/mm1/views/interactions/giant.h
  A engines/mm/mm1/views/interactions/gypsy.cpp
  A engines/mm/mm1/views/interactions/gypsy.h
  A engines/mm/mm1/views/interactions/hacker.cpp
  A engines/mm/mm1/views/interactions/hacker.h
  A engines/mm/mm1/views/interactions/ice_princess.cpp
  A engines/mm/mm1/views/interactions/ice_princess.h
  A engines/mm/mm1/views/interactions/inspectron.cpp
  A engines/mm/mm1/views/interactions/inspectron.h
  A engines/mm/mm1/views/interactions/keeper.cpp
  A engines/mm/mm1/views/interactions/keeper.h
  A engines/mm/mm1/views/interactions/leprechaun.cpp
  A engines/mm/mm1/views/interactions/leprechaun.h
  A engines/mm/mm1/views/interactions/lion.cpp
  A engines/mm/mm1/views/interactions/lion.h
  A engines/mm/mm1/views/interactions/lord_archer.cpp
  A engines/mm/mm1/views/interactions/lord_archer.h
  A engines/mm/mm1/views/interactions/lord_ironfist.cpp
  A engines/mm/mm1/views/interactions/lord_ironfist.h
  A engines/mm/mm1/views/interactions/orango.cpp
  A engines/mm/mm1/views/interactions/orango.h
  A engines/mm/mm1/views/interactions/prisoners.cpp
  A engines/mm/mm1/views/interactions/prisoners.h
  A engines/mm/mm1/views/interactions/resistances.cpp
  A engines/mm/mm1/views/interactions/resistances.h
  A engines/mm/mm1/views/interactions/ruby.cpp
  A engines/mm/mm1/views/interactions/ruby.h
  A engines/mm/mm1/views/interactions/trivia.cpp
  A engines/mm/mm1/views/interactions/trivia.h
  A engines/mm/mm1/views/interactions/volcano_god.cpp
  A engines/mm/mm1/views/interactions/volcano_god.h
  A engines/mm/mm1/views/interactions/won_game.cpp
  A engines/mm/mm1/views/interactions/won_game.h
  R engines/mm/mm1/views/maps/access_code.cpp
  R engines/mm/mm1/views/maps/access_code.h
  R engines/mm/mm1/views/maps/alamar.cpp
  R engines/mm/mm1/views/maps/alamar.h
  R engines/mm/mm1/views/maps/alien.cpp
  R engines/mm/mm1/views/maps/alien.h
  R engines/mm/mm1/views/maps/answer_entry.cpp
  R engines/mm/mm1/views/maps/answer_entry.h
  R engines/mm/mm1/views/maps/arenko.cpp
  R engines/mm/mm1/views/maps/arenko.h
  R engines/mm/mm1/views/maps/arrested.cpp
  R engines/mm/mm1/views/maps/arrested.h
  R engines/mm/mm1/views/maps/chess.cpp
  R engines/mm/mm1/views/maps/chess.h
  R engines/mm/mm1/views/maps/dog_statue.cpp
  R engines/mm/mm1/views/maps/dog_statue.h
  R engines/mm/mm1/views/maps/ghost.cpp
  R engines/mm/mm1/views/maps/ghost.h
  R engines/mm/mm1/views/maps/giant.cpp
  R engines/mm/mm1/views/maps/giant.h
  R engines/mm/mm1/views/maps/gypsy.cpp
  R engines/mm/mm1/views/maps/gypsy.h
  R engines/mm/mm1/views/maps/hacker.cpp
  R engines/mm/mm1/views/maps/hacker.h
  R engines/mm/mm1/views/maps/ice_princess.cpp
  R engines/mm/mm1/views/maps/ice_princess.h
  R engines/mm/mm1/views/maps/inspectron.cpp
  R engines/mm/mm1/views/maps/inspectron.h
  R engines/mm/mm1/views/maps/keeper.cpp
  R engines/mm/mm1/views/maps/keeper.h
  R engines/mm/mm1/views/maps/leprechaun.cpp
  R engines/mm/mm1/views/maps/leprechaun.h
  R engines/mm/mm1/views/maps/lion.cpp
  R engines/mm/mm1/views/maps/lion.h
  R engines/mm/mm1/views/maps/lord_archer.cpp
  R engines/mm/mm1/views/maps/lord_archer.h
  R engines/mm/mm1/views/maps/lord_ironfist.cpp
  R engines/mm/mm1/views/maps/lord_ironfist.h
  R engines/mm/mm1/views/maps/orango.cpp
  R engines/mm/mm1/views/maps/orango.h
  R engines/mm/mm1/views/maps/prisoners.cpp
  R engines/mm/mm1/views/maps/prisoners.h
  R engines/mm/mm1/views/maps/resistances.cpp
  R engines/mm/mm1/views/maps/resistances.h
  R engines/mm/mm1/views/maps/ruby.cpp
  R engines/mm/mm1/views/maps/ruby.h
  R engines/mm/mm1/views/maps/trivia.cpp
  R engines/mm/mm1/views/maps/trivia.h
  R engines/mm/mm1/views/maps/volcano_god.cpp
  R engines/mm/mm1/views/maps/volcano_god.h
  R engines/mm/mm1/views/maps/won_game.cpp
  R engines/mm/mm1/views/maps/won_game.h
    engines/mm/mm1/views/dialogs.h
    engines/mm/module.mk


diff --git a/engines/mm/mm1/views/dialogs.h b/engines/mm/mm1/views/dialogs.h
index 0f4427f4cb3..44b5a192c65 100644
--- a/engines/mm/mm1/views/dialogs.h
+++ b/engines/mm/mm1/views/dialogs.h
@@ -53,31 +53,31 @@
 #include "mm/mm1/views/locations/tavern.h"
 #include "mm/mm1/views/locations/temple.h"
 #include "mm/mm1/views/locations/training.h"
-#include "mm/mm1/views/maps/access_code.h"
-#include "mm/mm1/views/maps/alamar.h"
-#include "mm/mm1/views/maps/alien.h"
-#include "mm/mm1/views/maps/arenko.h"
-#include "mm/mm1/views/maps/arrested.h"
-#include "mm/mm1/views/maps/chess.h"
-#include "mm/mm1/views/maps/dog_statue.h"
-#include "mm/mm1/views/maps/ghost.h"
-#include "mm/mm1/views/maps/giant.h"
-#include "mm/mm1/views/maps/gypsy.h"
-#include "mm/mm1/views/maps/hacker.h"
-#include "mm/mm1/views/maps/ice_princess.h"
-#include "mm/mm1/views/maps/inspectron.h"
-#include "mm/mm1/views/maps/keeper.h"
-#include "mm/mm1/views/maps/leprechaun.h"
-#include "mm/mm1/views/maps/lion.h"
-#include "mm/mm1/views/maps/lord_archer.h"
-#include "mm/mm1/views/maps/lord_ironfist.h"
-#include "mm/mm1/views/maps/orango.h"
-#include "mm/mm1/views/maps/prisoners.h"
-#include "mm/mm1/views/maps/resistances.h"
-#include "mm/mm1/views/maps/ruby.h"
-#include "mm/mm1/views/maps/trivia.h"
-#include "mm/mm1/views/maps/volcano_god.h"
-#include "mm/mm1/views/maps/won_game.h"
+#include "mm/mm1/views/interactions/access_code.h"
+#include "mm/mm1/views/interactions/alamar.h"
+#include "mm/mm1/views/interactions/alien.h"
+#include "mm/mm1/views/interactions/arenko.h"
+#include "mm/mm1/views/interactions/arrested.h"
+#include "mm/mm1/views/interactions/chess.h"
+#include "mm/mm1/views/interactions/dog_statue.h"
+#include "mm/mm1/views/interactions/ghost.h"
+#include "mm/mm1/views/interactions/giant.h"
+#include "mm/mm1/views/interactions/gypsy.h"
+#include "mm/mm1/views/interactions/hacker.h"
+#include "mm/mm1/views/interactions/ice_princess.h"
+#include "mm/mm1/views/interactions/inspectron.h"
+#include "mm/mm1/views/interactions/keeper.h"
+#include "mm/mm1/views/interactions/leprechaun.h"
+#include "mm/mm1/views/interactions/lion.h"
+#include "mm/mm1/views/interactions/lord_archer.h"
+#include "mm/mm1/views/interactions/lord_ironfist.h"
+#include "mm/mm1/views/interactions/orango.h"
+#include "mm/mm1/views/interactions/prisoners.h"
+#include "mm/mm1/views/interactions/resistances.h"
+#include "mm/mm1/views/interactions/ruby.h"
+#include "mm/mm1/views/interactions/trivia.h"
+#include "mm/mm1/views/interactions/volcano_god.h"
+#include "mm/mm1/views/interactions/won_game.h"
 #include "mm/mm1/views/spells/cast_spell.h"
 #include "mm/mm1/views/spells/detect_magic.h"
 #include "mm/mm1/views/spells/duplication.h"
@@ -122,37 +122,37 @@ private:
 	Views::Locations::Temple _temple;
 	Views::Locations::Training _training;
 
-	Views::Maps::AccessCode _accessCode;
-	Views::Maps::Alamar _alamar;
-	Views::Maps::Alien _alien;
-	Views::Maps::Arenko _arenko;
-	Views::Maps::Arrested _arrested;
-	Views::Maps::Chess _chess;
-	Views::Maps::ChildPrisoner _childPrisoner;
-	Views::Maps::CloakedPrisoner _cloakedPrisoner;
-	Views::Maps::DemonPrisoner _demonPrisoner;
-	Views::Maps::MaidenPrisoner _maidenPrisoner;
-	Views::Maps::ManPrisoner _manPrisoner;
-	Views::Maps::MutatedPrisoner _mutatedPrisoner;
-	Views::Maps::VirginPrisoner _virginPrisoner;
-	Views::Maps::DogStatue _dogStatue;
-	Views::Maps::Ghost _ghost;
-	Views::Maps::Giant _giant;
-	Views::Maps::Gypsy _gypsy;
-	Views::Maps::Hacker _hacker;
-	Views::Maps::IcePrincess _icePrincess;
-	Views::Maps::Inspectron _inspectron;
-	Views::Maps::Keeper _keeper;
-	Views::Maps::Leprechaun _leprechaun;
-	Views::Maps::Lion _lion;
-	Views::Maps::LordArcher _lordArcher;
-	Views::Maps::LordIronfist _lordIronfist;
-	Views::Maps::Orango _orango;
-	Views::Maps::Resistances _resistances;
-	Views::Maps::Ruby _ruby;
-	Views::Maps::Trivia _trivia;
-	Views::Maps::VolcanoGod _volcanoGod;
-	Views::Maps::WonGame _wonGame;
+	Views::Interactions::AccessCode _accessCode;
+	Views::Interactions::Alamar _alamar;
+	Views::Interactions::Alien _alien;
+	Views::Interactions::Arenko _arenko;
+	Views::Interactions::Arrested _arrested;
+	Views::Interactions::Chess _chess;
+	Views::Interactions::ChildPrisoner _childPrisoner;
+	Views::Interactions::CloakedPrisoner _cloakedPrisoner;
+	Views::Interactions::DemonPrisoner _demonPrisoner;
+	Views::Interactions::MaidenPrisoner _maidenPrisoner;
+	Views::Interactions::ManPrisoner _manPrisoner;
+	Views::Interactions::MutatedPrisoner _mutatedPrisoner;
+	Views::Interactions::VirginPrisoner _virginPrisoner;
+	Views::Interactions::DogStatue _dogStatue;
+	Views::Interactions::Ghost _ghost;
+	Views::Interactions::Giant _giant;
+	Views::Interactions::Gypsy _gypsy;
+	Views::Interactions::Hacker _hacker;
+	Views::Interactions::IcePrincess _icePrincess;
+	Views::Interactions::Inspectron _inspectron;
+	Views::Interactions::Keeper _keeper;
+	Views::Interactions::Leprechaun _leprechaun;
+	Views::Interactions::Lion _lion;
+	Views::Interactions::LordArcher _lordArcher;
+	Views::Interactions::LordIronfist _lordIronfist;
+	Views::Interactions::Orango _orango;
+	Views::Interactions::Resistances _resistances;
+	Views::Interactions::Ruby _ruby;
+	Views::Interactions::Trivia _trivia;
+	Views::Interactions::VolcanoGod _volcanoGod;
+	Views::Interactions::WonGame _wonGame;
 
 	Views::Spells::CastSpell _castSpell;
 	Views::Spells::DetectMagic _detectMagicSpell;
diff --git a/engines/mm/mm1/views/maps/access_code.cpp b/engines/mm/mm1/views/interactions/access_code.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/access_code.cpp
rename to engines/mm/mm1/views/interactions/access_code.cpp
index 2ef8252441d..cbd7f0eb88d 100644
--- a/engines/mm/mm1/views/maps/access_code.cpp
+++ b/engines/mm/mm1/views/interactions/access_code.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/access_code.h"
+#include "mm/mm1/views/interactions/access_code.h"
 #include "mm/mm1/maps/map08.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 AccessCode::AccessCode() :
 		AnswerEntry("AccessCode", Common::Point(16, 3), 8) {
@@ -45,7 +45,7 @@ void AccessCode::answerEntered() {
 	map.codeEntered(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/access_code.h b/engines/mm/mm1/views/interactions/access_code.h
similarity index 92%
rename from engines/mm/mm1/views/maps/access_code.h
rename to engines/mm/mm1/views/interactions/access_code.h
index 9f5f780dfe0..1badc6953a8 100644
--- a/engines/mm/mm1/views/maps/access_code.h
+++ b/engines/mm/mm1/views/interactions/access_code.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_ACCESS_CODE_H
 #define MM1_VIEWS_MAPS_ACCESS_CODE_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class AccessCode : public AnswerEntry {
 protected:
@@ -42,7 +42,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/alamar.cpp b/engines/mm/mm1/views/interactions/alamar.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/alamar.cpp
rename to engines/mm/mm1/views/interactions/alamar.cpp
index 0cbdb89fa20..cc3e012ddc7 100644
--- a/engines/mm/mm1/views/maps/alamar.cpp
+++ b/engines/mm/mm1/views/interactions/alamar.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/alamar.h"
+#include "mm/mm1/views/interactions/alamar.h"
 #include "mm/mm1/maps/map49.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 #define VAL1 952
 #define HAS_EYE 154
@@ -95,7 +95,7 @@ bool Alamar::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/alamar.h b/engines/mm/mm1/views/interactions/alamar.h
similarity index 96%
rename from engines/mm/mm1/views/maps/alamar.h
rename to engines/mm/mm1/views/interactions/alamar.h
index 762a4804ec1..f0628fd78c7 100644
--- a/engines/mm/mm1/views/maps/alamar.h
+++ b/engines/mm/mm1/views/interactions/alamar.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Alamar : public TextView {
 private:
@@ -41,7 +41,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/alien.cpp b/engines/mm/mm1/views/interactions/alien.cpp
similarity index 94%
rename from engines/mm/mm1/views/maps/alien.cpp
rename to engines/mm/mm1/views/interactions/alien.cpp
index dadc911d784..dba9d46b08b 100644
--- a/engines/mm/mm1/views/maps/alien.cpp
+++ b/engines/mm/mm1/views/interactions/alien.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "mm/mm1/views/maps/alien.h"
+#include "mm/mm1/views/interactions/alien.h"
 #include "mm/mm1/maps/map31.h"
 #include "mm/mm1/globals.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Alien::Alien() : TextView("Alien") {
 	_bounds = getLineBounds(20, 24);
@@ -61,7 +61,7 @@ bool Alien::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/alien.h b/engines/mm/mm1/views/interactions/alien.h
similarity index 95%
rename from engines/mm/mm1/views/maps/alien.h
rename to engines/mm/mm1/views/interactions/alien.h
index e14bcd63bf3..04d56092939 100644
--- a/engines/mm/mm1/views/maps/alien.h
+++ b/engines/mm/mm1/views/interactions/alien.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Alien : public TextView {
 public:
@@ -38,7 +38,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/answer_entry.cpp b/engines/mm/mm1/views/interactions/answer_entry.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/answer_entry.cpp
rename to engines/mm/mm1/views/interactions/answer_entry.cpp
index f2cb70148ee..f393da3e2c7 100644
--- a/engines/mm/mm1/views/maps/answer_entry.cpp
+++ b/engines/mm/mm1/views/interactions/answer_entry.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 AnswerEntry::AnswerEntry(const Common::String &name,
 	const Common::Point &pos, size_t maxLength) :
@@ -74,7 +74,7 @@ bool AnswerEntry::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/answer_entry.h b/engines/mm/mm1/views/interactions/answer_entry.h
similarity index 96%
rename from engines/mm/mm1/views/maps/answer_entry.h
rename to engines/mm/mm1/views/interactions/answer_entry.h
index fc49354478f..1764449253c 100644
--- a/engines/mm/mm1/views/maps/answer_entry.h
+++ b/engines/mm/mm1/views/interactions/answer_entry.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class AnswerEntry : public TextView {
 private:
@@ -52,7 +52,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/arenko.cpp b/engines/mm/mm1/views/interactions/arenko.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/arenko.cpp
rename to engines/mm/mm1/views/interactions/arenko.cpp
index 021e0c7b2ee..3ec90b5fbeb 100644
--- a/engines/mm/mm1/views/maps/arenko.cpp
+++ b/engines/mm/mm1/views/interactions/arenko.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/arenko.h"
+#include "mm/mm1/views/interactions/arenko.h"
 #include "mm/mm1/maps/map28.h"
 #include "mm/mm1/globals.h"
 
@@ -29,7 +29,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Arenko::Arenko() : TextView("Arenko") {
 	_bounds = getLineBounds(20, 24);
@@ -92,7 +92,7 @@ bool Arenko::msgAction(const ActionMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/arenko.h b/engines/mm/mm1/views/interactions/arenko.h
similarity index 96%
rename from engines/mm/mm1/views/maps/arenko.h
rename to engines/mm/mm1/views/interactions/arenko.h
index d37ac9b0149..5bde4a7d7f3 100644
--- a/engines/mm/mm1/views/maps/arenko.h
+++ b/engines/mm/mm1/views/interactions/arenko.h
@@ -28,7 +28,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Arenko : public TextView, public MM1::Game::Arenko {
 private:
@@ -43,7 +43,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/arrested.cpp b/engines/mm/mm1/views/interactions/arrested.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/arrested.cpp
rename to engines/mm/mm1/views/interactions/arrested.cpp
index f2f05200490..f669f4c97b5 100644
--- a/engines/mm/mm1/views/maps/arrested.cpp
+++ b/engines/mm/mm1/views/interactions/arrested.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/arrested.h"
+#include "mm/mm1/views/interactions/arrested.h"
 #include "mm/mm1/maps/map04.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Arrested::Arrested() : TextView("Arrested") {
 	_bounds = getLineBounds(20, 24);
@@ -80,7 +80,7 @@ void Arrested::surrender(int numYears) {
 	delaySeconds(3);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/arrested.h b/engines/mm/mm1/views/interactions/arrested.h
similarity index 96%
rename from engines/mm/mm1/views/maps/arrested.h
rename to engines/mm/mm1/views/interactions/arrested.h
index 09fa53c994b..b241e0967ed 100644
--- a/engines/mm/mm1/views/maps/arrested.h
+++ b/engines/mm/mm1/views/interactions/arrested.h
@@ -28,7 +28,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Arrested : public TextView, public MM1::Game::Arrested {
 private:
@@ -43,7 +43,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/chess.cpp b/engines/mm/mm1/views/interactions/chess.cpp
similarity index 94%
rename from engines/mm/mm1/views/maps/chess.cpp
rename to engines/mm/mm1/views/interactions/chess.cpp
index 1adb3ff5299..50022469bce 100644
--- a/engines/mm/mm1/views/maps/chess.cpp
+++ b/engines/mm/mm1/views/interactions/chess.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/chess.h"
+#include "mm/mm1/views/interactions/chess.h"
 #include "mm/mm1/maps/map29.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Chess::Chess() :
 		AnswerEntry("Chess", Common::Point(10, 6), 23) {
@@ -52,7 +52,7 @@ void Chess::answerEntered() {
 	map.chessAnswer(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/chess.h b/engines/mm/mm1/views/interactions/chess.h
similarity index 92%
rename from engines/mm/mm1/views/maps/chess.h
rename to engines/mm/mm1/views/interactions/chess.h
index 7d4702a2f06..11e2bb0b997 100644
--- a/engines/mm/mm1/views/maps/chess.h
+++ b/engines/mm/mm1/views/interactions/chess.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_CHESS_H
 #define MM1_VIEWS_MAPS_CHESS_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Chess : public AnswerEntry {
 protected:
@@ -41,7 +41,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/dog_statue.cpp b/engines/mm/mm1/views/interactions/dog_statue.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/dog_statue.cpp
rename to engines/mm/mm1/views/interactions/dog_statue.cpp
index bb71443a676..7d7c0a87ad3 100644
--- a/engines/mm/mm1/views/maps/dog_statue.cpp
+++ b/engines/mm/mm1/views/interactions/dog_statue.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/dog_statue.h"
+#include "mm/mm1/views/interactions/dog_statue.h"
 #include "mm/mm1/maps/map42.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 DogStatue::DogStatue() : TextView("DogStatue") {
 	_bounds = getLineBounds(17, 24);
@@ -92,7 +92,7 @@ bool DogStatue::msgAction(const ActionMessage &msg) {
 }
 
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/dog_statue.h b/engines/mm/mm1/views/interactions/dog_statue.h
similarity index 96%
rename from engines/mm/mm1/views/maps/dog_statue.h
rename to engines/mm/mm1/views/interactions/dog_statue.h
index 74ce5192ace..4bbac672312 100644
--- a/engines/mm/mm1/views/maps/dog_statue.h
+++ b/engines/mm/mm1/views/interactions/dog_statue.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class DogStatue : public TextView {
 private:
@@ -42,7 +42,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ghost.cpp b/engines/mm/mm1/views/interactions/ghost.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/ghost.cpp
rename to engines/mm/mm1/views/interactions/ghost.cpp
index 47872527b73..7981db3f2a2 100644
--- a/engines/mm/mm1/views/maps/ghost.cpp
+++ b/engines/mm/mm1/views/interactions/ghost.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/ghost.h"
+#include "mm/mm1/views/interactions/ghost.h"
 #include "mm/mm1/maps/map37.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Ghost::Ghost() : TextView("Ghost") {
 	_bounds = getLineBounds(20, 24);
@@ -62,7 +62,7 @@ bool Ghost::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ghost.h b/engines/mm/mm1/views/interactions/ghost.h
similarity index 95%
rename from engines/mm/mm1/views/maps/ghost.h
rename to engines/mm/mm1/views/interactions/ghost.h
index 23f17cdaef6..b47c585c033 100644
--- a/engines/mm/mm1/views/maps/ghost.h
+++ b/engines/mm/mm1/views/interactions/ghost.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Ghost : public TextView {
 public:
@@ -38,7 +38,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/giant.cpp b/engines/mm/mm1/views/interactions/giant.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/giant.cpp
rename to engines/mm/mm1/views/interactions/giant.cpp
index 752b4984602..2ae907ce8e2 100644
--- a/engines/mm/mm1/views/maps/giant.cpp
+++ b/engines/mm/mm1/views/interactions/giant.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/giant.h"
+#include "mm/mm1/views/interactions/giant.h"
 #include "mm/mm1/maps/map30.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Giant::Giant() : TextView("Giant") {
 	_bounds = getLineBounds(20, 24);
@@ -96,7 +96,7 @@ void Giant::timeout() {
 	redraw();
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/giant.h b/engines/mm/mm1/views/interactions/giant.h
similarity index 96%
rename from engines/mm/mm1/views/maps/giant.h
rename to engines/mm/mm1/views/interactions/giant.h
index f6608c49257..142a3484543 100644
--- a/engines/mm/mm1/views/maps/giant.h
+++ b/engines/mm/mm1/views/interactions/giant.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Giant : public TextView {
 private:
@@ -45,7 +45,7 @@ public:
 	void timeout() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/gypsy.cpp b/engines/mm/mm1/views/interactions/gypsy.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/gypsy.cpp
rename to engines/mm/mm1/views/interactions/gypsy.cpp
index d073e18b030..61e03aa6303 100644
--- a/engines/mm/mm1/views/maps/gypsy.cpp
+++ b/engines/mm/mm1/views/interactions/gypsy.cpp
@@ -19,13 +19,13 @@
  *
  */
 
-#include "mm/mm1/views/maps/gypsy.h"
+#include "mm/mm1/views/interactions/gypsy.h"
 #include "mm/mm1/globals.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 #define VAL1 123
 #define ANSWER_OFFSET 167
@@ -106,7 +106,7 @@ bool Gypsy::msgAction(const ActionMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/gypsy.h b/engines/mm/mm1/views/interactions/gypsy.h
similarity index 96%
rename from engines/mm/mm1/views/maps/gypsy.h
rename to engines/mm/mm1/views/interactions/gypsy.h
index 1904a286403..f08e883bf80 100644
--- a/engines/mm/mm1/views/maps/gypsy.h
+++ b/engines/mm/mm1/views/interactions/gypsy.h
@@ -28,7 +28,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Gypsy : public TextView {
 private:
@@ -47,7 +47,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/hacker.cpp b/engines/mm/mm1/views/interactions/hacker.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/hacker.cpp
rename to engines/mm/mm1/views/interactions/hacker.cpp
index 0cf1036d1e1..a8fe1310947 100644
--- a/engines/mm/mm1/views/maps/hacker.cpp
+++ b/engines/mm/mm1/views/interactions/hacker.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/hacker.h"
+#include "mm/mm1/views/interactions/hacker.h"
 #include "mm/mm1/maps/map36.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Hacker::Hacker() : TextView("Hacker") {
 	_bounds = getLineBounds(20, 24);
@@ -103,7 +103,7 @@ bool Hacker::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/hacker.h b/engines/mm/mm1/views/interactions/hacker.h
similarity index 96%
rename from engines/mm/mm1/views/maps/hacker.h
rename to engines/mm/mm1/views/interactions/hacker.h
index 34452f0a525..8af9969f3fe 100644
--- a/engines/mm/mm1/views/maps/hacker.h
+++ b/engines/mm/mm1/views/interactions/hacker.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Hacker : public TextView {
 private:
@@ -41,7 +41,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ice_princess.cpp b/engines/mm/mm1/views/interactions/ice_princess.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/ice_princess.cpp
rename to engines/mm/mm1/views/interactions/ice_princess.cpp
index 4b177669425..697be5806ab 100644
--- a/engines/mm/mm1/views/maps/ice_princess.cpp
+++ b/engines/mm/mm1/views/interactions/ice_princess.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/ice_princess.h"
+#include "mm/mm1/views/interactions/ice_princess.h"
 #include "mm/mm1/maps/map19.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 IcePrincess::IcePrincess() :
 		AnswerEntry("IcePrincess", Common::Point(9, 7), 10) {
@@ -45,7 +45,7 @@ void IcePrincess::answerEntered() {
 	map.riddleAnswer(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ice_princess.h b/engines/mm/mm1/views/interactions/ice_princess.h
similarity index 92%
rename from engines/mm/mm1/views/maps/ice_princess.h
rename to engines/mm/mm1/views/interactions/ice_princess.h
index 87a005ca537..14fa5e5d1b5 100644
--- a/engines/mm/mm1/views/maps/ice_princess.h
+++ b/engines/mm/mm1/views/interactions/ice_princess.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_ICE_PRINCESS_H
 #define MM1_VIEWS_MAPS_ICE_PRINCESS_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class IcePrincess : public AnswerEntry {
 protected:
@@ -40,7 +40,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/inspectron.cpp b/engines/mm/mm1/views/interactions/inspectron.cpp
similarity index 96%
rename from engines/mm/mm1/views/maps/inspectron.cpp
rename to engines/mm/mm1/views/interactions/inspectron.cpp
index 706bbb8c568..4abe339748e 100644
--- a/engines/mm/mm1/views/maps/inspectron.cpp
+++ b/engines/mm/mm1/views/interactions/inspectron.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/inspectron.h"
+#include "mm/mm1/views/interactions/inspectron.h"
 #include "mm/mm1/maps/map35.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 #define VAL1 123
 #define ANSWER_OFFSET 167
@@ -101,7 +101,7 @@ bool Inspectron::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/inspectron.h b/engines/mm/mm1/views/interactions/inspectron.h
similarity index 96%
rename from engines/mm/mm1/views/maps/inspectron.h
rename to engines/mm/mm1/views/interactions/inspectron.h
index e951267f3e3..318efef07b6 100644
--- a/engines/mm/mm1/views/maps/inspectron.h
+++ b/engines/mm/mm1/views/interactions/inspectron.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Inspectron : public TextView {
 private:
@@ -41,7 +41,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/keeper.cpp b/engines/mm/mm1/views/interactions/keeper.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/keeper.cpp
rename to engines/mm/mm1/views/interactions/keeper.cpp
index 64207df5bf5..2bbac2aaee8 100644
--- a/engines/mm/mm1/views/maps/keeper.cpp
+++ b/engines/mm/mm1/views/interactions/keeper.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/keeper.h"
+#include "mm/mm1/views/interactions/keeper.h"
 #include "mm/mm1/maps/map54.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Keeper::Keeper() : TextView("Keeper") {
 	_bounds = getLineBounds(20, 24);
@@ -82,7 +82,7 @@ bool Keeper::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/keeper.h b/engines/mm/mm1/views/interactions/keeper.h
similarity index 96%
rename from engines/mm/mm1/views/maps/keeper.h
rename to engines/mm/mm1/views/interactions/keeper.h
index 212051f648b..177e96f48dd 100644
--- a/engines/mm/mm1/views/maps/keeper.h
+++ b/engines/mm/mm1/views/interactions/keeper.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Keeper : public TextView {
 private:
@@ -41,7 +41,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/leprechaun.cpp b/engines/mm/mm1/views/interactions/leprechaun.cpp
similarity index 94%
rename from engines/mm/mm1/views/maps/leprechaun.cpp
rename to engines/mm/mm1/views/interactions/leprechaun.cpp
index f4f2b04d5aa..39382a6a34a 100644
--- a/engines/mm/mm1/views/maps/leprechaun.cpp
+++ b/engines/mm/mm1/views/interactions/leprechaun.cpp
@@ -19,13 +19,13 @@
  *
  */
 
-#include "mm/mm1/views/maps/leprechaun.h"
+#include "mm/mm1/views/interactions/leprechaun.h"
 #include "mm/mm1/globals.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Leprechaun::Leprechaun() : TextView("Leprechaun") {
 	_bounds = getLineBounds(17, 24);
@@ -61,7 +61,7 @@ bool Leprechaun::msgAction(const ActionMessage &msg) {
 	return false;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/leprechaun.h b/engines/mm/mm1/views/interactions/leprechaun.h
similarity index 96%
rename from engines/mm/mm1/views/maps/leprechaun.h
rename to engines/mm/mm1/views/interactions/leprechaun.h
index 267b26771f9..ba669653ebd 100644
--- a/engines/mm/mm1/views/maps/leprechaun.h
+++ b/engines/mm/mm1/views/interactions/leprechaun.h
@@ -28,7 +28,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Leprechaun : public TextView, public MM1::Game::Leprechaun {
 private:
@@ -44,7 +44,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lion.cpp b/engines/mm/mm1/views/interactions/lion.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/lion.cpp
rename to engines/mm/mm1/views/interactions/lion.cpp
index 20cdae91e70..3bd7d51174c 100644
--- a/engines/mm/mm1/views/maps/lion.cpp
+++ b/engines/mm/mm1/views/interactions/lion.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/lion.h"
+#include "mm/mm1/views/interactions/lion.h"
 #include "mm/mm1/maps/map32.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 #define PASSWORD_INDEX 393
 
@@ -46,7 +46,7 @@ void Lion::answerEntered() {
 	map.passwordEntered(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lion.h b/engines/mm/mm1/views/interactions/lion.h
similarity index 91%
rename from engines/mm/mm1/views/maps/lion.h
rename to engines/mm/mm1/views/interactions/lion.h
index 99665d28276..2b05f255b5d 100644
--- a/engines/mm/mm1/views/maps/lion.h
+++ b/engines/mm/mm1/views/interactions/lion.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_LION_H
 #define MM1_VIEWS_MAPS_LION_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Lion : public AnswerEntry {
 protected:
@@ -40,7 +40,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lord_archer.cpp b/engines/mm/mm1/views/interactions/lord_archer.cpp
similarity index 94%
rename from engines/mm/mm1/views/maps/lord_archer.cpp
rename to engines/mm/mm1/views/interactions/lord_archer.cpp
index 6cbe886b10e..a0c902f2152 100644
--- a/engines/mm/mm1/views/maps/lord_archer.cpp
+++ b/engines/mm/mm1/views/interactions/lord_archer.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/lord_archer.h"
+#include "mm/mm1/views/interactions/lord_archer.h"
 #include "mm/mm1/maps/map40.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 LordArcher::LordArcher() : TextView("LordArcher") {
 	_bounds = getLineBounds(20, 24);
@@ -58,7 +58,7 @@ bool LordArcher::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lord_archer.h b/engines/mm/mm1/views/interactions/lord_archer.h
similarity index 96%
rename from engines/mm/mm1/views/maps/lord_archer.h
rename to engines/mm/mm1/views/interactions/lord_archer.h
index 7d8bbc5d2e0..3389b97d9b3 100644
--- a/engines/mm/mm1/views/maps/lord_archer.h
+++ b/engines/mm/mm1/views/interactions/lord_archer.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class LordArcher : public TextView {
 public:
@@ -39,7 +39,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lord_ironfist.cpp b/engines/mm/mm1/views/interactions/lord_ironfist.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/lord_ironfist.cpp
rename to engines/mm/mm1/views/interactions/lord_ironfist.cpp
index 4b9ed7a34fe..987da0f36ed 100644
--- a/engines/mm/mm1/views/maps/lord_ironfist.cpp
+++ b/engines/mm/mm1/views/interactions/lord_ironfist.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/lord_ironfist.h"
+#include "mm/mm1/views/interactions/lord_ironfist.h"
 #include "mm/mm1/maps/map43.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 LordIronfist::LordIronfist() : TextView("LordIronfist") {
 	_bounds = getLineBounds(20, 24);
@@ -94,7 +94,7 @@ bool LordIronfist::msgKeypress(const KeypressMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/lord_ironfist.h b/engines/mm/mm1/views/interactions/lord_ironfist.h
similarity index 96%
rename from engines/mm/mm1/views/maps/lord_ironfist.h
rename to engines/mm/mm1/views/interactions/lord_ironfist.h
index 08912808737..a403ce3e5af 100644
--- a/engines/mm/mm1/views/maps/lord_ironfist.h
+++ b/engines/mm/mm1/views/interactions/lord_ironfist.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class LordIronfist : public TextView {
 private:
@@ -41,7 +41,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/orango.cpp b/engines/mm/mm1/views/interactions/orango.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/orango.cpp
rename to engines/mm/mm1/views/interactions/orango.cpp
index 6f1cd35fb84..fb6946c306a 100644
--- a/engines/mm/mm1/views/maps/orango.cpp
+++ b/engines/mm/mm1/views/interactions/orango.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/orango.h"
+#include "mm/mm1/views/interactions/orango.h"
 #include "mm/mm1/maps/map48.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Orango::Orango() :
 		AnswerEntry("Orango", Common::Point(9, 7), 15) {
@@ -46,7 +46,7 @@ void Orango::answerEntered() {
 	map.orangoAnswer(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/orango.h b/engines/mm/mm1/views/interactions/orango.h
similarity index 92%
rename from engines/mm/mm1/views/maps/orango.h
rename to engines/mm/mm1/views/interactions/orango.h
index 527be8630f3..57ffee48562 100644
--- a/engines/mm/mm1/views/maps/orango.h
+++ b/engines/mm/mm1/views/interactions/orango.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_ORANGO_H
 #define MM1_VIEWS_MAPS_ORANGO_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Orango : public AnswerEntry {
 protected:
@@ -40,7 +40,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/prisoners.cpp b/engines/mm/mm1/views/interactions/prisoners.cpp
similarity index 97%
rename from engines/mm/mm1/views/maps/prisoners.cpp
rename to engines/mm/mm1/views/interactions/prisoners.cpp
index fe873ae4e0f..b2e079b7e5b 100644
--- a/engines/mm/mm1/views/maps/prisoners.cpp
+++ b/engines/mm/mm1/views/interactions/prisoners.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/prisoners.h"
+#include "mm/mm1/views/interactions/prisoners.h"
 #include "mm/mm1/maps/map11.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Prisoner::Prisoner(const Common::String &name, const Common::String &line1,
 		byte flag, Alignment freeAlignment, Alignment leaveAlignment) :
@@ -177,7 +177,7 @@ bool VirginPrisoner::msgAction(const ActionMessage &msg) {
 	}
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/prisoners.h b/engines/mm/mm1/views/interactions/prisoners.h
similarity index 97%
rename from engines/mm/mm1/views/maps/prisoners.h
rename to engines/mm/mm1/views/interactions/prisoners.h
index 9f7dd9ff0b8..63fbe26abf1 100644
--- a/engines/mm/mm1/views/maps/prisoners.h
+++ b/engines/mm/mm1/views/interactions/prisoners.h
@@ -28,7 +28,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Prisoner : public TextView {
 private:
@@ -100,7 +100,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/resistances.cpp b/engines/mm/mm1/views/interactions/resistances.cpp
similarity index 97%
rename from engines/mm/mm1/views/maps/resistances.cpp
rename to engines/mm/mm1/views/interactions/resistances.cpp
index b4801423874..4e90b480bc6 100644
--- a/engines/mm/mm1/views/maps/resistances.cpp
+++ b/engines/mm/mm1/views/interactions/resistances.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "mm/mm1/views/maps/resistances.h"
+#include "mm/mm1/views/interactions/resistances.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Resistances::Resistances() : TextView("Resistances") {
 	_bounds = getLineBounds(20, 24);
diff --git a/engines/mm/mm1/views/maps/resistances.h b/engines/mm/mm1/views/interactions/resistances.h
similarity index 96%
rename from engines/mm/mm1/views/maps/resistances.h
rename to engines/mm/mm1/views/interactions/resistances.h
index 0dbfb684db6..84f61bc021a 100644
--- a/engines/mm/mm1/views/maps/resistances.h
+++ b/engines/mm/mm1/views/interactions/resistances.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Resistances : public TextView {
 private:
@@ -44,7 +44,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ruby.cpp b/engines/mm/mm1/views/interactions/ruby.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/ruby.cpp
rename to engines/mm/mm1/views/interactions/ruby.cpp
index f33e188299e..c116e659bb0 100644
--- a/engines/mm/mm1/views/maps/ruby.cpp
+++ b/engines/mm/mm1/views/interactions/ruby.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/ruby.h"
+#include "mm/mm1/views/interactions/ruby.h"
 #include "mm/mm1/maps/map39.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Ruby::Ruby() : AnswerEntry("Ruby", Common::Point(14, 7), 12) {
 	_bounds = getLineBounds(17, 24);
@@ -45,7 +45,7 @@ void Ruby::answerEntered() {
 	map.riddleAnswered(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/ruby.h b/engines/mm/mm1/views/interactions/ruby.h
similarity index 91%
rename from engines/mm/mm1/views/maps/ruby.h
rename to engines/mm/mm1/views/interactions/ruby.h
index dbf3d0acfdc..c584695bbba 100644
--- a/engines/mm/mm1/views/maps/ruby.h
+++ b/engines/mm/mm1/views/interactions/ruby.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_RUBY_H
 #define MM1_VIEWS_MAPS_RUBY_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Ruby : public AnswerEntry {
 protected:
@@ -40,7 +40,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/trivia.cpp b/engines/mm/mm1/views/interactions/trivia.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/trivia.cpp
rename to engines/mm/mm1/views/interactions/trivia.cpp
index 0f09dbbf8a6..2d1423e275b 100644
--- a/engines/mm/mm1/views/maps/trivia.cpp
+++ b/engines/mm/mm1/views/interactions/trivia.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/trivia.h"
+#include "mm/mm1/views/interactions/trivia.h"
 #include "mm/mm1/maps/map21.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 Trivia::Trivia() :
 		AnswerEntry("Trivia", Common::Point(9, 7), 14) {
@@ -70,7 +70,7 @@ void Trivia::answerEntered() {
 	}
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/trivia.h b/engines/mm/mm1/views/interactions/trivia.h
similarity index 92%
rename from engines/mm/mm1/views/maps/trivia.h
rename to engines/mm/mm1/views/interactions/trivia.h
index 437de84d516..302a76e29a4 100644
--- a/engines/mm/mm1/views/maps/trivia.h
+++ b/engines/mm/mm1/views/interactions/trivia.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_TRIVIA_H
 #define MM1_VIEWS_MAPS_TRIVIA_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class Trivia : public AnswerEntry {
 private:
@@ -43,7 +43,7 @@ public:
 	void draw() override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/volcano_god.cpp b/engines/mm/mm1/views/interactions/volcano_god.cpp
similarity index 95%
rename from engines/mm/mm1/views/maps/volcano_god.cpp
rename to engines/mm/mm1/views/interactions/volcano_god.cpp
index a2b2f537e18..d5ee0a62f1e 100644
--- a/engines/mm/mm1/views/maps/volcano_god.cpp
+++ b/engines/mm/mm1/views/interactions/volcano_god.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/views/maps/volcano_god.h"
+#include "mm/mm1/views/interactions/volcano_god.h"
 #include "mm/mm1/maps/map11.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 VolcanoGod::VolcanoGod() :
 		AnswerEntry("VolcanoGod", Common::Point(9, 3), 8) {
@@ -102,7 +102,7 @@ void VolcanoGod::answerEntered() {
 	map.riddleAnswer(_answer);
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/volcano_god.h b/engines/mm/mm1/views/interactions/volcano_god.h
similarity index 93%
rename from engines/mm/mm1/views/maps/volcano_god.h
rename to engines/mm/mm1/views/interactions/volcano_god.h
index e82fc6efd6b..5feabbf5cce 100644
--- a/engines/mm/mm1/views/maps/volcano_god.h
+++ b/engines/mm/mm1/views/interactions/volcano_god.h
@@ -22,12 +22,12 @@
 #ifndef MM1_VIEWS_MAPS_VOLCANO_GOD_H
 #define MM1_VIEWS_MAPS_VOLCANO_GOD_H
 
-#include "mm/mm1/views/maps/answer_entry.h"
+#include "mm/mm1/views/interactions/answer_entry.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class VolcanoGod : public AnswerEntry {
 private:
@@ -49,7 +49,7 @@ public:
 	bool msgKeypress(const KeypressMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/won_game.cpp b/engines/mm/mm1/views/interactions/won_game.cpp
similarity index 93%
rename from engines/mm/mm1/views/maps/won_game.cpp
rename to engines/mm/mm1/views/interactions/won_game.cpp
index 05f994380d0..0d721581eb8 100644
--- a/engines/mm/mm1/views/maps/won_game.cpp
+++ b/engines/mm/mm1/views/interactions/won_game.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "mm/mm1/views/maps/won_game.h"
+#include "mm/mm1/views/interactions/won_game.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
 
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 WonGame::WonGame() : TextView("WonGame") {
 	Common::Rect r = getLineBounds(5, 11);
@@ -51,7 +51,7 @@ bool WonGame::msgAction(const ActionMessage &msg) {
 	return true;
 }
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/maps/won_game.h b/engines/mm/mm1/views/interactions/won_game.h
similarity index 96%
rename from engines/mm/mm1/views/maps/won_game.h
rename to engines/mm/mm1/views/interactions/won_game.h
index c8b11febde5..a2e8bd02937 100644
--- a/engines/mm/mm1/views/maps/won_game.h
+++ b/engines/mm/mm1/views/interactions/won_game.h
@@ -27,7 +27,7 @@
 namespace MM {
 namespace MM1 {
 namespace Views {
-namespace Maps {
+namespace Interactions {
 
 class WonGame : public TextView {
 public:
@@ -39,7 +39,7 @@ public:
 	bool msgAction(const ActionMessage &msg) override;
 };
 
-} // namespace Maps
+} // namespace Interactions
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 1dc2fc93a7a..798c1978c90 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -69,32 +69,32 @@ MODULE_OBJS += \
 	mm1/views/locations/tavern.o \
 	mm1/views/locations/temple.o \
 	mm1/views/locations/training.o \
-	mm1/views/maps/access_code.o \
-	mm1/views/maps/alamar.o \
-	mm1/views/maps/alien.o \
-	mm1/views/maps/answer_entry.o \
-	mm1/views/maps/arenko.o \
-	mm1/views/maps/arrested.o \
-	mm1/views/maps/chess.o \
-	mm1/views/maps/dog_statue.o \
-	mm1/views/maps/ghost.o \
-	mm1/views/maps/giant.o \
-	mm1/views/maps/gypsy.o \
-	mm1/views/maps/hacker.o \
-	mm1/views/maps/ice_princess.o \
-	mm1/views/maps/inspectron.o \
-	mm1/views/maps/keeper.o \
-	mm1/views/maps/leprechaun.o \
-	mm1/views/maps/lion.o \
-	mm1/views/maps/lord_archer.o \
-	mm1/views/maps/lord_ironfist.o \
-	mm1/views/maps/orango.o \
-	mm1/views/maps/prisoners.o \
-	mm1/views/maps/resistances.o \
-	mm1/views/maps/ruby.o \
-	mm1/views/maps/trivia.o \
-	mm1/views/maps/volcano_god.o \
-	mm1/views/maps/won_game.o \
+	mm1/views/interactions/access_code.o \
+	mm1/views/interactions/alamar.o \
+	mm1/views/interactions/alien.o \
+	mm1/views/interactions/answer_entry.o \
+	mm1/views/interactions/arenko.o \
+	mm1/views/interactions/arrested.o \
+	mm1/views/interactions/chess.o \
+	mm1/views/interactions/dog_statue.o \
+	mm1/views/interactions/ghost.o \
+	mm1/views/interactions/giant.o \
+	mm1/views/interactions/gypsy.o \
+	mm1/views/interactions/hacker.o \
+	mm1/views/interactions/ice_princess.o \
+	mm1/views/interactions/inspectron.o \
+	mm1/views/interactions/keeper.o \
+	mm1/views/interactions/leprechaun.o \
+	mm1/views/interactions/lion.o \
+	mm1/views/interactions/lord_archer.o \
+	mm1/views/interactions/lord_ironfist.o \
+	mm1/views/interactions/orango.o \
+	mm1/views/interactions/prisoners.o \
+	mm1/views/interactions/resistances.o \
+	mm1/views/interactions/ruby.o \
+	mm1/views/interactions/trivia.o \
+	mm1/views/interactions/volcano_god.o \
+	mm1/views/interactions/won_game.o \
 	mm1/views/spells/spell_view.o \
 	mm1/views/spells/cast_spell.o \
 	mm1/views/spells/detect_magic.o \


Commit: 305ec4f1875436ce9e17d5f79dce8994580ef2b2
    https://github.com/scummvm/scummvm/commit/305ec4f1875436ce9e17d5f79dce8994580ef2b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-20T22:00:31-07:00

Commit Message:
MM: MM1: Clicking on options button shows GMM

Changed paths:
    engines/mm/mm1/events.cpp
    engines/mm/mm1/events.h
    engines/mm/mm1/mm1.h
    engines/mm/mm1/views_enh/game.cpp
    engines/mm/mm1/views_enh/game.h


diff --git a/engines/mm/mm1/events.cpp b/engines/mm/mm1/events.cpp
index 205cda2e8e5..75518c0ea86 100644
--- a/engines/mm/mm1/events.cpp
+++ b/engines/mm/mm1/events.cpp
@@ -75,6 +75,8 @@ void Events::runGame() {
 			drawElements();
 			_screen->update();
 		}
+
+		quitFlag |= shouldQuit();
 	}
 
 	delete _screen;
diff --git a/engines/mm/mm1/events.h b/engines/mm/mm1/events.h
index 4edaae9c72f..778c0157764 100644
--- a/engines/mm/mm1/events.h
+++ b/engines/mm/mm1/events.h
@@ -269,6 +269,11 @@ protected:
 	 */
 	void processEvent(Common::Event &ev);
 
+	/**
+	 * Returns true if the game should quit
+	 */
+	virtual bool shouldQuit() const = 0;
+
 	/**
 	 * Overrides events we want to only go to the focused view
 	 */
diff --git a/engines/mm/mm1/mm1.h b/engines/mm/mm1/mm1.h
index 25e91422cf7..ef78570fda4 100644
--- a/engines/mm/mm1/mm1.h
+++ b/engines/mm/mm1/mm1.h
@@ -43,6 +43,14 @@ private:
 
 	void setupNormal();
 	bool setupEnhanced();
+protected:
+	/**
+	 * Returns true if the game should quit
+	 */
+	bool shouldQuit() const override {
+		return MMEngine::shouldQuit();
+	}
+
 public:
 	Globals _globals;
 	Sound *_sound = nullptr;
diff --git a/engines/mm/mm1/views_enh/game.cpp b/engines/mm/mm1/views_enh/game.cpp
index 98fdcbab12d..27ea2942650 100644
--- a/engines/mm/mm1/views_enh/game.cpp
+++ b/engines/mm/mm1/views_enh/game.cpp
@@ -23,6 +23,7 @@
 #include "mm/mm1/views_enh/game.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/metaengine.h"
+#include "mm/mm1/mm1.h"
 
 namespace MM {
 namespace MM1 {
@@ -56,6 +57,16 @@ 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:
diff --git a/engines/mm/mm1/views_enh/game.h b/engines/mm/mm1/views_enh/game.h
index 7a6c4a69a4b..e331a015cb2 100644
--- a/engines/mm/mm1/views_enh/game.h
+++ b/engines/mm/mm1/views_enh/game.h
@@ -46,6 +46,7 @@ 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;
 };