thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix Blue's Birthday Macintosh

Browse source
This commit is contained in:
Matthew Hoops 2011-07-02 14:54:45 -04:00
parent a5b0792295
commit 58356843ee
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/scumm/detection.cpp
View file

@ -142,6 +142,14 @@ Common::String ScummEngine_v70he::generateFilename(const int room) const {
Common::String result; Common::String result;
char id = 0; char id = 0;
Common::String bPattern = _filenamePattern.pattern;
// Special cases for Blue's games, which share common (b) files
if (_game.id == GID_BIRTHDAY && !(_game.features & GF_DEMO))
bPattern = "Blue'sBirthday";
else if (_game.id == GID_TREASUREHUNT)
bPattern = "Blue'sTreasureHunt";
switch (_filenamePattern.genMethod) { switch (_filenamePattern.genMethod) {
case kGenHEMac: case kGenHEMac:
case kGenHEMacNoParens: case kGenHEMacNoParens:
@ -154,13 +162,7 @@ Common::String ScummEngine_v70he::generateFilename(const int room) const {
switch (disk) { switch (disk) {
case 2: case 2:
id = 'b'; id = 'b';
// Special cases for Blue's games, which share common (b) files result = bPattern + ".(b)";
if (_game.id == GID_BIRTHDAY && !(_game.features & GF_DEMO))
result = "Blue'sBirthday.(b)";
else if (_game.id == GID_TREASUREHUNT)
result = "Blue'sTreasureHunt.(b)";
else
result = Common::String::format("%s.(b)", _filenamePattern.pattern);
break; break;
case 1: case 1:
id = 'a'; id = 'a';
@ -185,10 +187,11 @@ Common::String ScummEngine_v70he::generateFilename(const int room) const {
// For mac they're stored in game binary // For mac they're stored in game binary
result = _filenamePattern.pattern; result = _filenamePattern.pattern;
} else { } else {
Common::String pattern = id == 'b' ? bPattern : _filenamePattern.pattern;
if (_filenamePattern.genMethod == kGenHEMac) if (_filenamePattern.genMethod == kGenHEMac)
result = Common::String::format("%s (%c)", _filenamePattern.pattern, id); result = Common::String::format("%s (%c)", pattern.c_str(), id);
else else
result = Common::String::format("%s %c", _filenamePattern.pattern, id); result = Common::String::format("%s %c", pattern.c_str(), id);
} }
} }