aboutsummaryrefslogtreecommitdiff
path: root/engines/dm
diff options
context:
space:
mode:
authorStrangerke2016-10-11 21:41:21 +0200
committerStrangerke2016-10-11 21:44:03 +0200
commit86e525c1ad917ecfd9a6b59d79c63c6cc1c7eec0 (patch)
tree070eb248418bb465d76890e0e4bc249cf377720c /engines/dm
parent7c138231e034f7434ee3968ca777b515666fb5c1 (diff)
downloadscummvm-rg350-86e525c1ad917ecfd9a6b59d79c63c6cc1c7eec0.tar.gz
scummvm-rg350-86e525c1ad917ecfd9a6b59d79c63c6cc1c7eec0.tar.bz2
scummvm-rg350-86e525c1ad917ecfd9a6b59d79c63c6cc1c7eec0.zip
DM: Fix isSquareACorridorTeleporterPitOrDoor for the demo, set version of demo to 2.0
Diffstat (limited to 'engines/dm')
-rw-r--r--engines/dm/detection.cpp5
-rw-r--r--engines/dm/group.cpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
index e8ec79a176..a8f44acdba 100644
--- a/engines/dm/detection.cpp
+++ b/engines/dm/detection.cpp
@@ -71,7 +71,8 @@ static const DMADGameDescription gameDescriptions[] = {
{ kDMSavePlatformAcceptAny }
},
{
- {"dm", "Amiga Demo v??? English",
+ // Added by Strangerke
+ {"dm", "Amiga Demo v2.0 English",
{
{"graphics.dat", 0, "3932c8359bb36c24291b09e915114d38", 192421},
{"DemoDun.dat", 0, "78848e1a2d3d5a11e5954deb8c7b772b", 1209},
@@ -90,12 +91,10 @@ static const DMADGameDescription gameDescriptions[] = {
}
};
-
static const ADExtraGuiOptionsMap optionsList[] = {
AD_EXTRA_GUI_OPTIONS_TERMINATOR
};
-
class DMMetaEngine : public AdvancedMetaEngine {
public:
DMMetaEngine() : AdvancedMetaEngine(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) {
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index b1d9766912..cf748ffa41 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -1832,6 +1832,9 @@ Thing GroupMan::groupGetGenerated(CreatureType creatureType, int16 healthMultipl
}
bool GroupMan::isSquareACorridorTeleporterPitOrDoor(int16 mapX, int16 mapY) {
+ if (_vm->isDemo())
+ return false;
+
int16 squareType = Square(_vm->_dungeonMan->getSquare(mapX, mapY)).getType();
return ((squareType == kDMElementTypeCorridor) || (squareType == kDMElementTypeTeleporter)