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

Indentation.

Browse source 
svn-id: r34513
This commit is contained in:
Torbjörn Andersson 2008-09-13 15:23:23 +00:00
parent 2befee869b
commit b86a047164
4 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

154
engines/drascula/converse.cpp
View file

@ -43,83 +43,83 @@ void DrasculaEngine::playTalkSequence(int sequence) {
void DrasculaEngine::doTalkSequenceCommand(TalkSequenceCommand cmd) { void DrasculaEngine::doTalkSequenceCommand(TalkSequenceCommand cmd) {
switch (cmd.commandType) { switch (cmd.commandType) {
case kPause: case kPause:
pause(cmd.action); pause(cmd.action);
break; break;
case kSetFlag: case kSetFlag:
flags[cmd.action] = 1; flags[cmd.action] = 1;
break; break;
case kClearFlag: case kClearFlag:
flags[cmd.action] = 0; flags[cmd.action] = 0;
break; break;
case kPickObject: case kPickObject:
pickObject(cmd.action); pickObject(cmd.action);
break; break;
case kAddObject: case kAddObject:
addObject(cmd.action); addObject(cmd.action);
break; break;
case kBreakOut: case kBreakOut:
breakOut = 1; breakOut = 1;
break; break;
case kConverse: case kConverse:
converse(cmd.action); converse(cmd.action);
break; break;
case kPlaceVB: case kPlaceVB:
placeVonBraun(cmd.action); placeVonBraun(cmd.action);
break; break;
case kUpdateRoom: case kUpdateRoom:
updateRoom(); updateRoom();
break; break;
case kUpdateScreen: case kUpdateScreen:
updateScreen(); updateScreen();
break; break;
case kTrackProtagonist: case kTrackProtagonist:
trackProtagonist = cmd.action; trackProtagonist = cmd.action;
break; break;
case kPlaySound: case kPlaySound:
playSound(cmd.action); playSound(cmd.action);
break; break;
case kFinishSound: case kFinishSound:
finishSound(); finishSound();
break; break;
case kTalkerGeneral: case kTalkerGeneral:
talk(cmd.action); talk(cmd.action);
break; break;
case kTalkerDrunk: case kTalkerDrunk:
talk_drunk(cmd.action); talk_drunk(cmd.action);
break; break;
case kTalkerPianist: case kTalkerPianist:
talk_pianist(cmd.action); talk_pianist(cmd.action);
break; break;
case kTalkerBJ: case kTalkerBJ:
talk_bj(cmd.action); talk_bj(cmd.action);
break; break;
case kTalkerVBNormal: case kTalkerVBNormal:
talk_vonBraun(cmd.action, kVonBraunNormal); talk_vonBraun(cmd.action, kVonBraunNormal);
break; break;
case kTalkerVBDoor: case kTalkerVBDoor:
talk_vonBraun(cmd.action, kVonBraunDoor); talk_vonBraun(cmd.action, kVonBraunDoor);
break; break;
case kTalkerIgorSeated: case kTalkerIgorSeated:
talk_igor(cmd.action, kIgorSeated); talk_igor(cmd.action, kIgorSeated);
break; break;
case kTalkerWerewolf: case kTalkerWerewolf:
talk_werewolf(cmd.action); talk_werewolf(cmd.action);
break; break;
case kTalkerMus: case kTalkerMus:
talk_mus(cmd.action); talk_mus(cmd.action);
break; break;
case kTalkerDrascula: case kTalkerDrascula:
talk_drascula(cmd.action, 1); talk_drascula(cmd.action, 1);
break; break;
case kTalkerBartender0: case kTalkerBartender0:
talk_bartender(cmd.action, 0); talk_bartender(cmd.action, 0);
break; break;
case kTalkerBartender1: case kTalkerBartender1:
talk_bartender(cmd.action, 1); talk_bartender(cmd.action, 1);
break; break;
default: default:
error("doTalkSequenceCommand: Unknown command: %d", cmd.commandType); error("doTalkSequenceCommand: Unknown command: %d", cmd.commandType);
} }
} }

2
engines/drascula/drascula.cpp
View file

@ -714,7 +714,7 @@ void DrasculaEngine::updateEvents() {
#else #else
while (eventMan->pollEvent(event)) { while (eventMan->pollEvent(event)) {
#endif #endif
switch (event.type) { switch (event.type) {
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
_keyPressed = event.kbd; _keyPressed = event.kbd;
break; break;

18
engines/drascula/graphics.cpp
View file

@ -228,15 +228,15 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) {
letterX = _charMap[i].mappedChar; letterX = _charMap[i].mappedChar;
switch (_charMap[i].charType) { switch (_charMap[i].charType) {
case 0: // letters case 0: // letters
letterY = (_lang == kSpanish) ? 149 : 158; letterY = (_lang == kSpanish) ? 149 : 158;
break; break;
case 1: // signs case 1: // signs
letterY = (_lang == kSpanish) ? 160 : 169; letterY = (_lang == kSpanish) ? 160 : 169;
break; break;
case 2: // accented case 2: // accented
letterY = 180; letterY = 180;
break; break;
} // switch } // switch
break; break;
} // if } // if

14
engines/drascula/interface.cpp
View file

@ -30,13 +30,13 @@ namespace Drascula {
void DrasculaEngine::setCursor(int cursor) { void DrasculaEngine::setCursor(int cursor) {
switch (cursor) { switch (cursor) {
case kCursorCrosshair: case kCursorCrosshair:
CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17); CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17);
break; break;
case kCursorCurrentItem: case kCursorCurrentItem:
CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17); CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17);
default: default:
break; break;
} }
} }