diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/drascula/converse.cpp | 154 | ||||
| -rw-r--r-- | engines/drascula/drascula.cpp | 2 | ||||
| -rw-r--r-- | engines/drascula/graphics.cpp | 18 | ||||
| -rw-r--r-- | engines/drascula/interface.cpp | 14 |
4 files changed, 94 insertions, 94 deletions
diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp index 41898be7f4..cef1a17486 100644 --- a/engines/drascula/converse.cpp +++ b/engines/drascula/converse.cpp @@ -43,83 +43,83 @@ void DrasculaEngine::playTalkSequence(int sequence) { void DrasculaEngine::doTalkSequenceCommand(TalkSequenceCommand cmd) { switch (cmd.commandType) { - case kPause: - pause(cmd.action); - break; - case kSetFlag: - flags[cmd.action] = 1; - break; - case kClearFlag: - flags[cmd.action] = 0; - break; - case kPickObject: - pickObject(cmd.action); - break; - case kAddObject: - addObject(cmd.action); - break; - case kBreakOut: - breakOut = 1; - break; - case kConverse: - converse(cmd.action); - break; - case kPlaceVB: - placeVonBraun(cmd.action); - break; - case kUpdateRoom: - updateRoom(); - break; - case kUpdateScreen: - updateScreen(); - break; - case kTrackProtagonist: - trackProtagonist = cmd.action; - break; - case kPlaySound: - playSound(cmd.action); - break; - case kFinishSound: - finishSound(); - break; - case kTalkerGeneral: - talk(cmd.action); - break; - case kTalkerDrunk: - talk_drunk(cmd.action); - break; - case kTalkerPianist: - talk_pianist(cmd.action); - break; - case kTalkerBJ: - talk_bj(cmd.action); - break; - case kTalkerVBNormal: - talk_vonBraun(cmd.action, kVonBraunNormal); - break; - case kTalkerVBDoor: - talk_vonBraun(cmd.action, kVonBraunDoor); - break; - case kTalkerIgorSeated: - talk_igor(cmd.action, kIgorSeated); - break; - case kTalkerWerewolf: - talk_werewolf(cmd.action); - break; - case kTalkerMus: - talk_mus(cmd.action); - break; - case kTalkerDrascula: - talk_drascula(cmd.action, 1); - break; - case kTalkerBartender0: - talk_bartender(cmd.action, 0); - break; - case kTalkerBartender1: - talk_bartender(cmd.action, 1); - break; - default: - error("doTalkSequenceCommand: Unknown command: %d", cmd.commandType); + case kPause: + pause(cmd.action); + break; + case kSetFlag: + flags[cmd.action] = 1; + break; + case kClearFlag: + flags[cmd.action] = 0; + break; + case kPickObject: + pickObject(cmd.action); + break; + case kAddObject: + addObject(cmd.action); + break; + case kBreakOut: + breakOut = 1; + break; + case kConverse: + converse(cmd.action); + break; + case kPlaceVB: + placeVonBraun(cmd.action); + break; + case kUpdateRoom: + updateRoom(); + break; + case kUpdateScreen: + updateScreen(); + break; + case kTrackProtagonist: + trackProtagonist = cmd.action; + break; + case kPlaySound: + playSound(cmd.action); + break; + case kFinishSound: + finishSound(); + break; + case kTalkerGeneral: + talk(cmd.action); + break; + case kTalkerDrunk: + talk_drunk(cmd.action); + break; + case kTalkerPianist: + talk_pianist(cmd.action); + break; + case kTalkerBJ: + talk_bj(cmd.action); + break; + case kTalkerVBNormal: + talk_vonBraun(cmd.action, kVonBraunNormal); + break; + case kTalkerVBDoor: + talk_vonBraun(cmd.action, kVonBraunDoor); + break; + case kTalkerIgorSeated: + talk_igor(cmd.action, kIgorSeated); + break; + case kTalkerWerewolf: + talk_werewolf(cmd.action); + break; + case kTalkerMus: + talk_mus(cmd.action); + break; + case kTalkerDrascula: + talk_drascula(cmd.action, 1); + break; + case kTalkerBartender0: + talk_bartender(cmd.action, 0); + break; + case kTalkerBartender1: + talk_bartender(cmd.action, 1); + break; + default: + error("doTalkSequenceCommand: Unknown command: %d", cmd.commandType); } } diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 367b13892b..af32a0c2e5 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -714,7 +714,7 @@ void DrasculaEngine::updateEvents() { #else while (eventMan->pollEvent(event)) { #endif - switch (event.type) { + switch (event.type) { case Common::EVENT_KEYDOWN: _keyPressed = event.kbd; break; diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 75017383ac..cebd186a7c 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -228,15 +228,15 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) { letterX = _charMap[i].mappedChar; switch (_charMap[i].charType) { - case 0: // letters - letterY = (_lang == kSpanish) ? 149 : 158; - break; - case 1: // signs - letterY = (_lang == kSpanish) ? 160 : 169; - break; - case 2: // accented - letterY = 180; - break; + case 0: // letters + letterY = (_lang == kSpanish) ? 149 : 158; + break; + case 1: // signs + letterY = (_lang == kSpanish) ? 160 : 169; + break; + case 2: // accented + letterY = 180; + break; } // switch break; } // if diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp index 4268878fbd..06c5f3dc87 100644 --- a/engines/drascula/interface.cpp +++ b/engines/drascula/interface.cpp @@ -30,13 +30,13 @@ namespace Drascula { void DrasculaEngine::setCursor(int cursor) { switch (cursor) { - case kCursorCrosshair: - CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17); - break; - case kCursorCurrentItem: - CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17); - default: - break; + case kCursorCrosshair: + CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17); + break; + case kCursorCurrentItem: + CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17); + default: + break; } } |