diff options
author | Torbjörn Andersson | 2009-12-30 07:14:09 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2009-12-30 07:14:09 +0000 |
commit | 1a66ad80a4b9bec6440060c5f941ca5f53833703 (patch) | |
tree | 04394653e5951dde6c9b4cc09dc202e57aa62ce7 /engines/mohawk/myst.cpp | |
parent | 516495a4a1a66e907257e8545dd668a1613d61f2 (diff) | |
download | scummvm-rg350-1a66ad80a4b9bec6440060c5f941ca5f53833703.tar.gz scummvm-rg350-1a66ad80a4b9bec6440060c5f941ca5f53833703.tar.bz2 scummvm-rg350-1a66ad80a4b9bec6440060c5f941ca5f53833703.zip |
Re-indentet switch() blocks to follow ScummVM indentation style. (I've always
found this style a bit unusual, but I value consistency.)
svn-id: r46734
Diffstat (limited to 'engines/mohawk/myst.cpp')
-rw-r--r-- | engines/mohawk/myst.cpp | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 6ae7d97479..1143db721e 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -118,34 +118,34 @@ Common::String MohawkEngine_Myst::wrapMovieFilename(Common::String movieName, ui const char* prefix; switch (stack) { - case kIntroStack: - prefix = "intro/"; - break; - case kChannelwoodStack: - // The Windmill videos like to hide in a different folder - if (movieName.contains("wmill")) - prefix = "channel2/"; - else - prefix = "channel/"; - break; - case kDniStack: - prefix = "dunny/"; - break; - case kMechanicalStack: - prefix = "mech/"; - break; - case kMystStack: - prefix = "myst/"; - break; - case kSeleniticStack: - prefix = "selen/"; - break; - case kStoneshipStack: - prefix = "stone/"; - break; - default: - prefix = ""; // Masterpiece Edition Only Movies - break; + case kIntroStack: + prefix = "intro/"; + break; + case kChannelwoodStack: + // The Windmill videos like to hide in a different folder + if (movieName.contains("wmill")) + prefix = "channel2/"; + else + prefix = "channel/"; + break; + case kDniStack: + prefix = "dunny/"; + break; + case kMechanicalStack: + prefix = "mech/"; + break; + case kMystStack: + prefix = "myst/"; + break; + case kSeleniticStack: + prefix = "selen/"; + break; + case kStoneshipStack: + prefix = "stone/"; + break; + default: + prefix = ""; // Masterpiece Edition Only Movies + break; } if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh) @@ -243,52 +243,52 @@ Common::Error MohawkEngine_Myst::run() { while (_eventMan->pollEvent(event)) { switch (event.type) { - case Common::EVENT_MOUSEMOVE: - _mousePos = event.mouse; - _needsUpdate = true; - checkCurrentResource(); - break; - case Common::EVENT_LBUTTONUP: - if (_curResource >= 0) { - debug(2, "Sending mouse up event to resource %d\n", _curResource); - _resources[_curResource]->handleMouseUp(); - } + case Common::EVENT_MOUSEMOVE: + _mousePos = event.mouse; + _needsUpdate = true; + checkCurrentResource(); + break; + case Common::EVENT_LBUTTONUP: + if (_curResource >= 0) { + debug(2, "Sending mouse up event to resource %d\n", _curResource); + _resources[_curResource]->handleMouseUp(); + } - for (uint16 i = 0; i < _resources.size(); i++) - if (_resources[i]->isEnabled()) - _resources[i]->drawDataToScreen(); - break; - case Common::EVENT_LBUTTONDOWN: - if (_curResource >= 0) { - debug(2, "Sending mouse up event to resource %d\n", _curResource); - _resources[_curResource]->handleMouseDown(); - } - break; - case Common::EVENT_KEYDOWN: - switch (event.kbd.keycode) { - case Common::KEYCODE_d: - if (event.kbd.flags & Common::KBD_CTRL) { - _console->attach(); - _console->onFrame(); - } - break; - case Common::KEYCODE_SPACE: - pauseGame(); - break; - case Common::KEYCODE_F4: - _showResourceRects = !_showResourceRects; - if (_showResourceRects) - drawResourceRects(); - break; - case Common::KEYCODE_F5: - runDialog(*_optionsDialog); - break; - default: - break; + for (uint16 i = 0; i < _resources.size(); i++) + if (_resources[i]->isEnabled()) + _resources[i]->drawDataToScreen(); + break; + case Common::EVENT_LBUTTONDOWN: + if (_curResource >= 0) { + debug(2, "Sending mouse up event to resource %d\n", _curResource); + _resources[_curResource]->handleMouseDown(); + } + break; + case Common::EVENT_KEYDOWN: + switch (event.kbd.keycode) { + case Common::KEYCODE_d: + if (event.kbd.flags & Common::KBD_CTRL) { + _console->attach(); + _console->onFrame(); } break; + case Common::KEYCODE_SPACE: + pauseGame(); + break; + case Common::KEYCODE_F4: + _showResourceRects = !_showResourceRects; + if (_showResourceRects) + drawResourceRects(); + break; + case Common::KEYCODE_F5: + runDialog(*_optionsDialog); + break; default: break; + } + break; + default: + break; } } @@ -527,18 +527,18 @@ void MohawkEngine_Myst::loadCard() { debugC(kDebugView, "\t\t Type: %d", _view.scriptResources[i].type); switch (_view.scriptResources[i].type) { - case 1: - debugC(kDebugView, "\t\t\t\t= Image"); - break; - case 2: - debugC(kDebugView, "\t\t\t\t= Sound"); - break; - case 3: - debugC(kDebugView, "\t\t\t\t= Resource List"); - break; - default: - debugC(kDebugView, "\t\t\t\t= Unknown"); - break; + case 1: + debugC(kDebugView, "\t\t\t\t= Image"); + break; + case 2: + debugC(kDebugView, "\t\t\t\t= Sound"); + break; + case 3: + debugC(kDebugView, "\t\t\t\t= Resource List"); + break; + default: + debugC(kDebugView, "\t\t\t\t= Unknown"); + break; } if (_view.scriptResources[i].type == 3) { @@ -839,31 +839,31 @@ static MystResource *loadResource(MohawkEngine_Myst *vm, Common::SeekableReadStr debugC(kDebugResource, "\tSub_Record: %d", (parent == NULL) ? 0 : 1); switch (type) { - case kMystForwardResource: - case kMystLeftResource: - case kMystRightResource: - case kMystDownResource: - case kMystUpResource: - case 14: // TODO: kMystBackwardResource? - return new MystResource(vm, rlstStream, parent); - case kMystActionResource: - return new MystResourceType5(vm, rlstStream, parent); - case kMystVideoResource: - return new MystResourceType6(vm, rlstStream, parent); - case kMystSwitchResource: - return new MystResourceType7(vm, rlstStream, parent); - case 8: - return new MystResourceType8(vm, rlstStream, parent); - case 10: - return new MystResourceType10(vm, rlstStream, parent); - case 11: - return new MystResourceType11(vm, rlstStream, parent); - case 12: - return new MystResourceType12(vm, rlstStream, parent); - case 13: - return new MystResourceType13(vm, rlstStream, parent); - default: - error ("Unknown/Unhandled MystResource type %d", type); + case kMystForwardResource: + case kMystLeftResource: + case kMystRightResource: + case kMystDownResource: + case kMystUpResource: + case 14: // TODO: kMystBackwardResource? + return new MystResource(vm, rlstStream, parent); + case kMystActionResource: + return new MystResourceType5(vm, rlstStream, parent); + case kMystVideoResource: + return new MystResourceType6(vm, rlstStream, parent); + case kMystSwitchResource: + return new MystResourceType7(vm, rlstStream, parent); + case 8: + return new MystResourceType8(vm, rlstStream, parent); + case 10: + return new MystResourceType10(vm, rlstStream, parent); + case 11: + return new MystResourceType11(vm, rlstStream, parent); + case 12: + return new MystResourceType12(vm, rlstStream, parent); + case 13: + return new MystResourceType13(vm, rlstStream, parent); + default: + error ("Unknown/Unhandled MystResource type %d", type); } } |