diff options
| author | Travis Howell | 2005-11-01 11:18:50 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-11-01 11:18:50 +0000 |
| commit | 9b1c0e3326efa80f1935bcacc059dd6783dd99f0 (patch) | |
| tree | d2b99447b2d3144d40aefd0956dd66e29b2265f4 | |
| parent | 8eaa89863aafae3b76f50c2ec319c1998ab71773 (diff) | |
| download | scummvm-rg350-9b1c0e3326efa80f1935bcacc059dd6783dd99f0.tar.gz scummvm-rg350-9b1c0e3326efa80f1935bcacc059dd6783dd99f0.tar.bz2 scummvm-rg350-9b1c0e3326efa80f1935bcacc059dd6783dd99f0.zip | |
Add cd check to gobliins engine.
svn-id: r19381
| -rw-r--r-- | gob/gob.cpp | 8 | ||||
| -rw-r--r-- | gob/gob.h | 3 | ||||
| -rw-r--r-- | gob/module.mk | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gob/gob.cpp b/gob/gob.cpp index 9a08dc58be..e304563c3d 100644 --- a/gob/gob.cpp +++ b/gob/gob.cpp @@ -58,9 +58,9 @@ static const GobGameSettings gob_games[] = { {"gob1", "Gobliiins (DOS VGA)", GF_GOB1, "a5e232fcd02733c7dffff107d22d36eb"}, // CD 1.000 version. Multilingual - {"gob1", "Gobliiins (CD)", GF_GOB1, "037db48ebce94bdfe42e2c9510da9211"}, + {"gob1", "Gobliiins (CD)", GF_GOB1 | GF_CD, "037db48ebce94bdfe42e2c9510da9211"}, // CD 1.02 version. Multilingual - {"gob1", "Gobliiins (CD)", GF_GOB1, "45f9c1162dd7040fd05fd013ccc176e2"}, + {"gob1", "Gobliiins (CD)", GF_GOB1 | GF_CD, "45f9c1162dd7040fd05fd013ccc176e2"}, {"gob1", "Gobliiins (Amiga)", GF_GOB1, "d9f8736b7dc0ea891cd06592a72e8a72"}, {"gob1", "Gobliiins (Amiga)", GF_GOB1, "69f9ae85252271e7dfa62883e581e5e9"}, @@ -244,6 +244,10 @@ int GobEngine::init(GameDetector &detector) { _system->initSize(320, 200); _system->endGFXTransaction(); + // On some systems it's not safe to run CD audio games from the CD. + if (_features & GF_CD) + checkCD(); + int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) _system->openCD(cd_num); @@ -42,7 +42,8 @@ enum { GF_GOB1 = 1 << 0, GF_GOB2 = 1 << 1, GF_GOB3 = 1 << 2, - GF_WOODRUFF = 1 << 3 + GF_WOODRUFF = 1 << 3, + GF_CD = 1 << 4 }; namespace Gob { diff --git a/gob/module.mk b/gob/module.mk index 5089182fb2..6d2acac63c 100644 --- a/gob/module.mk +++ b/gob/module.mk @@ -8,6 +8,7 @@ MODULE_OBJS := \ gob/driver_vga.o \ gob/game.o \ gob/global.o \ + gob/gob.o \ gob/goblin.o \ gob/init.o \ gob/inter.o \ @@ -17,11 +18,10 @@ MODULE_OBJS := \ gob/palanim.o \ gob/parse.o \ gob/scenery.o \ - gob/util.o \ - gob/video.o \ gob/sound.o \ gob/timer.o \ - gob/gob.o + gob/util.o \ + gob/video.o MODULE_DIRS += \ gob |