[Scummvm-git-logs] scummvm master -> 9841e90372bc620aa8f175d4ef6b208a48931581
dreammaster
noreply at scummvm.org
Wed May 24 03:16:49 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:
bbe41fab0f MM: MM1: Added remaining map descriptions
9841e90372 MM: MM1: Disable mapping in desert without in-game map
Commit: bbe41fab0fb98ae8f76f50d6456090f721140401
https://github.com/scummvm/scummvm/commit/bbe41fab0fb98ae8f76f50d6456090f721140401
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-23T19:40:14-07:00
Commit Message:
MM: MM1: Added remaining map descriptions
Changed paths:
engines/mm/mm1/maps/map37.h
engines/mm/mm1/maps/map38.h
engines/mm/mm1/maps/map39.h
engines/mm/mm1/maps/map40.h
engines/mm/mm1/maps/map41.h
engines/mm/mm1/maps/map42.h
engines/mm/mm1/maps/map43.h
engines/mm/mm1/maps/map44.h
engines/mm/mm1/maps/map45.h
engines/mm/mm1/maps/map46.h
engines/mm/mm1/maps/map47.h
engines/mm/mm1/maps/map48.h
engines/mm/mm1/maps/map49.h
engines/mm/mm1/maps/map50.h
engines/mm/mm1/maps/map51.h
engines/mm/mm1/maps/map52.h
engines/mm/mm1/maps/map53.h
diff --git a/engines/mm/mm1/maps/map37.h b/engines/mm/mm1/maps/map37.h
index 105c40622fb..299a3b49193 100644
--- a/engines/mm/mm1/maps/map37.h
+++ b/engines/mm/mm1/maps/map37.h
@@ -73,7 +73,7 @@ private:
&Map37::special19
};
public:
- Map37() : Map(37, "qvl1", 0xf03, 3) {}
+ Map37() : Map(37, "qvl1", 0xf03, 3, "Wizard's Lair 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map38.h b/engines/mm/mm1/maps/map38.h
index b52accf79dd..44026cb5702 100644
--- a/engines/mm/mm1/maps/map38.h
+++ b/engines/mm/mm1/maps/map38.h
@@ -73,7 +73,7 @@ private:
&Map38::special18
};
public:
- Map38() : Map(38, "qvl2", 0x703, 3) {}
+ Map38() : Map(38, "qvl2", 0x703, 3, "Wizard's Lair 2") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map39.h b/engines/mm/mm1/maps/map39.h
index f86204c6202..de9f242f7d2 100644
--- a/engines/mm/mm1/maps/map39.h
+++ b/engines/mm/mm1/maps/map39.h
@@ -70,7 +70,7 @@ private:
&Map39::special18
};
public:
- Map39() : Map(39, "rwl1", 0xf02, 3) {}
+ Map39() : Map(39, "rwl1", 0xf02, 3, "Warrior's Stronghold 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map40.h b/engines/mm/mm1/maps/map40.h
index f404755ab25..1973c07662b 100644
--- a/engines/mm/mm1/maps/map40.h
+++ b/engines/mm/mm1/maps/map40.h
@@ -79,7 +79,7 @@ private:
&Map40::special02
};
public:
- Map40() : Map(40, "rwl2", 0x702, 3) {}
+ Map40() : Map(40, "rwl2", 0x702, 3, "Warrior's Stronghold 2") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map41.h b/engines/mm/mm1/maps/map41.h
index d4fdab9d3e3..003dbcc0f75 100644
--- a/engines/mm/mm1/maps/map41.h
+++ b/engines/mm/mm1/maps/map41.h
@@ -84,7 +84,7 @@ private:
&Map41::special04
};
public:
- Map41() : Map(41, "enf1", 0xf04, 3) {}
+ Map41() : Map(41, "enf1", 0xf04, 3, "Minotaur Stronghold 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map42.h b/engines/mm/mm1/maps/map42.h
index 9dd61da4d1c..7c6a66ddaf7 100644
--- a/engines/mm/mm1/maps/map42.h
+++ b/engines/mm/mm1/maps/map42.h
@@ -77,7 +77,7 @@ private:
&Map42::special04
};
public:
- Map42() : Map(42, "enf2", 0x704, 3) {}
+ Map42() : Map(42, "enf2", 0x704, 3, "Minotaur Stronghold 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map43.h b/engines/mm/mm1/maps/map43.h
index feb5ae0f746..b6ee4ed7a00 100644
--- a/engines/mm/mm1/maps/map43.h
+++ b/engines/mm/mm1/maps/map43.h
@@ -54,7 +54,7 @@ private:
&Map43::special08
};
public:
- Map43() : Map(43, "whitew", 0xa11, 3) {}
+ Map43() : Map(43, "whitew", 0xa11, 3, "Castle White Wolf") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map44.h b/engines/mm/mm1/maps/map44.h
index 6ea00fa9516..affcf81d3fd 100644
--- a/engines/mm/mm1/maps/map44.h
+++ b/engines/mm/mm1/maps/map44.h
@@ -54,7 +54,7 @@ private:
&Map44::special07
};
public:
- Map44() : Map(44, "dragad", 0x107, 3) {}
+ Map44() : Map(44, "dragad", 0x107, 3, "Dragadune Ruins 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map45.h b/engines/mm/mm1/maps/map45.h
index 188b585c417..aa173345fef 100644
--- a/engines/mm/mm1/maps/map45.h
+++ b/engines/mm/mm1/maps/map45.h
@@ -79,7 +79,7 @@ private:
&Map45::special21
};
public:
- Map45() : Map(45, "udrag1", 0xf05, 3) {}
+ Map45() : Map(45, "udrag1", 0xf05, 3, "Dragadune Ruins 2") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map46.h b/engines/mm/mm1/maps/map46.h
index f0c4df7b16e..50753a97f75 100644
--- a/engines/mm/mm1/maps/map46.h
+++ b/engines/mm/mm1/maps/map46.h
@@ -49,7 +49,7 @@ private:
&Map46::special06
};
public:
- Map46() : Map(46, "udrag2", 0xa00, 3) {}
+ Map46() : Map(46, "udrag2", 0xa00, 3, "Dragadune Ruins 3") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map47.h b/engines/mm/mm1/maps/map47.h
index 15081d0c382..15a7a3b042d 100644
--- a/engines/mm/mm1/maps/map47.h
+++ b/engines/mm/mm1/maps/map47.h
@@ -80,7 +80,7 @@ private:
&Map47::special23
};
public:
- Map47() : Map(47, "udrag3", 0x705, 3) {}
+ Map47() : Map(47, "udrag3", 0x705, 3, "Dragadune Ruins 4") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map48.h b/engines/mm/mm1/maps/map48.h
index 268c3668ed6..4dccd967a7b 100644
--- a/engines/mm/mm1/maps/map48.h
+++ b/engines/mm/mm1/maps/map48.h
@@ -31,7 +31,7 @@ namespace Maps {
class Map48 : public Map {
typedef void (Map48:: *SpecialFn)();
public:
- Map48() : Map(48, "demon", 0x412, 3) {}
+ Map48() : Map(48, "demon", 0x412, 3, "Soul Maze") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map49.h b/engines/mm/mm1/maps/map49.h
index 5c9eeed46c2..4d8e7ecae20 100644
--- a/engines/mm/mm1/maps/map49.h
+++ b/engines/mm/mm1/maps/map49.h
@@ -72,7 +72,7 @@ private:
&Map49::special22
};
public:
- Map49() : Map(49, "alamar", 0xb07, 3) {}
+ Map49() : Map(49, "alamar", 0xb07, 3, "Castle Alamar") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map50.h b/engines/mm/mm1/maps/map50.h
index 38c98ca65fc..da8e18e0192 100644
--- a/engines/mm/mm1/maps/map50.h
+++ b/engines/mm/mm1/maps/map50.h
@@ -83,7 +83,7 @@ private:
&Map50::special23
};
public:
- Map50() : Map(50, "pp1", 0xf01, 3) {}
+ Map50() : Map(50, "pp1", 0xf01, 3, "Building of Gold 1") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map51.h b/engines/mm/mm1/maps/map51.h
index 337b308e81d..3ae17ffaa84 100644
--- a/engines/mm/mm1/maps/map51.h
+++ b/engines/mm/mm1/maps/map51.h
@@ -72,7 +72,7 @@ private:
&Map51::special19
};
public:
- Map51() : Map(51, "pp2", 0x701, 3) {}
+ Map51() : Map(51, "pp2", 0x701, 3, "Building of Gold 2") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map52.h b/engines/mm/mm1/maps/map52.h
index 35210a2ea72..32fefbe2309 100644
--- a/engines/mm/mm1/maps/map52.h
+++ b/engines/mm/mm1/maps/map52.h
@@ -47,7 +47,7 @@ private:
&Map52::special06
};
public:
- Map52() : Map(52, "pp3", 0xe00, 3) {}
+ Map52() : Map(52, "pp3", 0xe00, 3, "Building of Gold 3") {}
/**
* Handles all special stuff that happens on the map
diff --git a/engines/mm/mm1/maps/map53.h b/engines/mm/mm1/maps/map53.h
index 0fa80022fdf..f1d329e816a 100644
--- a/engines/mm/mm1/maps/map53.h
+++ b/engines/mm/mm1/maps/map53.h
@@ -64,7 +64,7 @@ private:
&Map53::special14
};
public:
- Map53() : Map(53, "pp4", 0x201, 3) {}
+ Map53() : Map(53, "pp4", 0x201, 3, "Building of Gold 4") {}
/**
* Handles all special stuff that happens on the map
Commit: 9841e90372bc620aa8f175d4ef6b208a48931581
https://github.com/scummvm/scummvm/commit/9841e90372bc620aa8f175d4ef6b208a48931581
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-23T19:40:14-07:00
Commit Message:
MM: MM1: Disable mapping in desert without in-game map
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/maps/map37.h
engines/mm/mm1/views_enh/game.cpp
engines/mm/mm1/views_enh/game_commands.cpp
engines/mm/mm1/views_enh/game_commands.h
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 830c4bce461..3ac9a8ba4b6 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -587,6 +587,7 @@ enhdialogs:
south: "South"
east: "East"
west: "West"
+ disabled: "Mapping is currently unavailable here"
market:
title: "Market"
buy_food: "Buy food"
diff --git a/engines/mm/mm1/maps/map37.h b/engines/mm/mm1/maps/map37.h
index 299a3b49193..4e411751af0 100644
--- a/engines/mm/mm1/maps/map37.h
+++ b/engines/mm/mm1/maps/map37.h
@@ -79,13 +79,6 @@ public:
* Handles all special stuff that happens on the map
*/
void special() override;
-
- /**
- * This map has some random spinners, so we want to
- * disable mapping in enhanced mode to avoid spoiling
- * the surprise
- */
- bool mappingAllowed() const override { return false; }
};
} // namespace Maps
diff --git a/engines/mm/mm1/views_enh/game.cpp b/engines/mm/mm1/views_enh/game.cpp
index 352a2380553..052d277bdbe 100644
--- a/engines/mm/mm1/views_enh/game.cpp
+++ b/engines/mm/mm1/views_enh/game.cpp
@@ -76,7 +76,10 @@ bool Game::msgAction(const ActionMessage &msg) {
send("Bash", GameMessage("SHOW"));
break;
case KEYBIND_MAP:
- addView("MapPopup");
+ if (g_maps->_currentMap->mappingAllowed())
+ addView("MapPopup");
+ else
+ send(InfoMessage(STRING["enhdialogs.map.disabled"]));
return true;
case KEYBIND_MENU:
g_engine->openMainMenuDialog();
diff --git a/engines/mm/mm1/views_enh/game_commands.cpp b/engines/mm/mm1/views_enh/game_commands.cpp
index 949a02a9e6e..f6786dc4cc2 100644
--- a/engines/mm/mm1/views_enh/game_commands.cpp
+++ b/engines/mm/mm1/views_enh/game_commands.cpp
@@ -67,6 +67,11 @@ bool GameCommands::msgAction(const ActionMessage & msg) {
return false;
}
+void GameCommands::Minimap::draw() {
+ if (_minimapOn && g_maps->_currentMap->mappingAllowed())
+ Map::draw();
+}
+
} // namespace ViewsEnh
} // namespace MM1
} // namespace MM
diff --git a/engines/mm/mm1/views_enh/game_commands.h b/engines/mm/mm1/views_enh/game_commands.h
index 6cebc36d033..a5c8e366d73 100644
--- a/engines/mm/mm1/views_enh/game_commands.h
+++ b/engines/mm/mm1/views_enh/game_commands.h
@@ -42,10 +42,7 @@ class GameCommands : public ButtonContainer {
_minimapOn = !_minimapOn;
g_events->redraw();
}
- void draw() override {
- if (_minimapOn)
- Map::draw();
- }
+ void draw() override;
};
private:
More information about the Scummvm-git-logs
mailing list