diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/cycle.cpp | 32 | ||||
-rw-r--r-- | engines/agi/preagi.cpp | 54 | ||||
-rw-r--r-- | engines/agi/preagi_mickey.cpp | 17 | ||||
-rw-r--r-- | engines/agi/predictive.cpp | 32 |
4 files changed, 68 insertions, 67 deletions
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp index 1460632777..db188aef44 100644 --- a/engines/agi/cycle.cpp +++ b/engines/agi/cycle.cpp @@ -367,22 +367,22 @@ int AgiEngine::runGame() { // Set computer type (v20 i.e. vComputer) switch (getPlatform()) { - case Common::kPlatformAtariST: - setvar(vComputer, kAgiComputerAtariST); - break; - case Common::kPlatformAmiga: - if (getFeatures() & GF_OLDAMIGAV20) - setvar(vComputer, kAgiComputerAmigaOld); - else - setvar(vComputer, kAgiComputerAmiga); - break; - case Common::kPlatformApple2GS: - setvar(vComputer, kAgiComputerApple2GS); - break; - case Common::kPlatformPC: - default: - setvar(vComputer, kAgiComputerPC); - break; + case Common::kPlatformAtariST: + setvar(vComputer, kAgiComputerAtariST); + break; + case Common::kPlatformAmiga: + if (getFeatures() & GF_OLDAMIGAV20) + setvar(vComputer, kAgiComputerAmigaOld); + else + setvar(vComputer, kAgiComputerAmiga); + break; + case Common::kPlatformApple2GS: + setvar(vComputer, kAgiComputerApple2GS); + break; + case Common::kPlatformPC: + default: + setvar(vComputer, kAgiComputerPC); + break; } setvar(vSoundgen, 1); /* IBM PC SOUND */ diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index 5bdab8a801..d8a304c001 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -204,33 +204,33 @@ FIXME (Fingolfin asks): Why are Mickey, Winnie and Troll standalone classes // run preagi engine main loop switch (getGameID()) { - case GID_MICKEY: - { - Mickey *mickey = new Mickey(this); - mickey->init(); - mickey->run(); - delete mickey; - } - break; - case GID_WINNIE: - { - Winnie *winnie = new Winnie(this); - winnie->init(); - winnie->run(); - delete winnie; - } - break; - case GID_TROLL: - { - Troll *troll = new Troll(this); - troll->init(); - troll->run(); - delete troll; - } - break; - default: - error("Unknown preagi engine"); - break; + case GID_MICKEY: + { + Mickey *mickey = new Mickey(this); + mickey->init(); + mickey->run(); + delete mickey; + } + break; + case GID_WINNIE: + { + Winnie *winnie = new Winnie(this); + winnie->init(); + winnie->run(); + delete winnie; + } + break; + case GID_TROLL: + { + Troll *troll = new Troll(this); + troll->init(); + troll->run(); + delete troll; + } + break; + default: + error("Unknown preagi engine"); + break; } return 0; } diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 8987310340..faf46f5a93 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -104,14 +104,15 @@ bool Mickey::chooseY_N(int ofsPrompt, bool fErrorMsg) { for (;;) { switch (_vm->getSelection(kSelYesNo)) { - case 0: return false; - case 1: return true; - default: if (fErrorMsg) { - printExeStr(IDO_MSA_PRESS_YES_OR_NO); - waitAnyKey(); - printExeStr(ofsPrompt); - } - break; + case 0: return false; + case 1: return true; + default: + if (fErrorMsg) { + printExeStr(IDO_MSA_PRESS_YES_OR_NO); + waitAnyKey(); + printExeStr(ofsPrompt); + } + break; } } } diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index 5ffa3d159f..94b2581ae3 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -394,22 +394,22 @@ bool AgiEngine::predictiveDialog(void) { } switch (mode) { - case kModeNum: - _currentWord = _currentCode; - break; - case kModePre: - if (!matchWord() && _currentCode.size()) { - _currentCode.deleteLastChar(); - matchWord(); - } - numMatchingWords = countWordsInString(_predictiveDictActLine); - break; - case kModeAbc: - for (x = 0; x < _currentCode.size(); x++) - if (_currentCode[x] >= '1') - temp[x] = buttons[_currentCode[x] - '1'][3 + repeatcount[x]]; - temp[_currentCode.size()] = 0; - _currentWord = temp; + case kModeNum: + _currentWord = _currentCode; + break; + case kModePre: + if (!matchWord() && _currentCode.size()) { + _currentCode.deleteLastChar(); + matchWord(); + } + numMatchingWords = countWordsInString(_predictiveDictActLine); + break; + case kModeAbc: + for (x = 0; x < _currentCode.size(); x++) + if (_currentCode[x] >= '1') + temp[x] = buttons[_currentCode[x] - '1'][3 + repeatcount[x]]; + temp[_currentCode.size()] = 0; + _currentWord = temp; } } else if (active == 9) { // next if (mode == kModePre) { |