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

Cleanup, and follow code formatting convention (indentation) for switch statements

Browse source 
svn-id: r35754
This commit is contained in:
Filippos Karapetis 2009-01-06 15:47:58 +00:00
parent ef78bbdf0d
commit c5c4ab97c9
1 changed files with 48 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

106
engines/saga/introproc_fta2.cpp
View file

@ -44,12 +44,12 @@ class MoviePlayerSMK : Graphics::SMKPlayer {
protected: protected:
virtual void setPalette(byte *pal); virtual void setPalette(byte *pal);
public: public:
MoviePlayerSMK(SagaEngine *vm): _vm(vm), SMKPlayer(vm->_mixer) { MoviePlayerSMK(SagaEngine *vm): _vm(vm), SMKPlayer(vm->_mixer),
_eventMan = _vm->_system->getEventManager(); _eventMan(vm->_system->getEventManager()) {
} }
~MoviePlayerSMK(void) { } ~MoviePlayerSMK(void) { }
bool playVideo(const char *filename); void playVideo(const char *filename);
private: private:
void processFrame(); void processFrame();
void processEvents(); void processEvents();
@ -74,24 +74,28 @@ void MoviePlayerSMK::processEvents() {
// Process events, and skip video if esc is pressed // Process events, and skip video if esc is pressed
while (_eventMan->pollEvent(curEvent)) { while (_eventMan->pollEvent(curEvent)) {
switch (curEvent.type) { switch (curEvent.type) {
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
if (curEvent.kbd.keycode == Common::KEYCODE_ESCAPE) if (curEvent.kbd.keycode == Common::KEYCODE_ESCAPE)
_skipVideo = true;
break;
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
_skipVideo = true; _skipVideo = true;
break; break;
default: case Common::EVENT_RTL:
break; case Common::EVENT_QUIT:
_skipVideo = true;
break;
default:
break;
} }
} }
} }
bool MoviePlayerSMK::playVideo(const char *filename) { void MoviePlayerSMK::playVideo(const char *filename) {
_skipVideo = false; _skipVideo = false;
if (!loadFile(filename)) debug(0, "Playing video %s", filename);
return false;
if (!loadFile(filename)) {
warning("Failed to load video file %s", filename);
return;
}
while (getCurFrame() < getFrameCount() && !_skipVideo && !_vm->shouldQuit()) { while (getCurFrame() < getFrameCount() && !_skipVideo && !_vm->shouldQuit()) {
processEvents(); processEvents();
@ -99,11 +103,10 @@ bool MoviePlayerSMK::playVideo(const char *filename) {
} }
closeFile(); closeFile();
return true;
} }
void MoviePlayerSMK::processFrame() { void MoviePlayerSMK::processFrame() {
uint32 startTime = 0;
decodeNextFrame(); decodeNextFrame();
Graphics::Surface *screen = _vm->_system->lockScreen(); Graphics::Surface *screen = _vm->_system->lockScreen();
@ -123,28 +126,21 @@ void MoviePlayerSMK::processFrame() {
// Update the screen // Update the screen
_vm->_system->updateScreen(); _vm->_system->updateScreen();
startTime = _vm->_system->getMillis();
// Wait before showing the next frame // Wait before showing the next frame
_vm->_system->delayMillis(waitTime); while (_vm->_system->getMillis() < startTime + waitTime && !_skipVideo && !_vm->shouldQuit()) {
processEvents();
_vm->_system->delayMillis(10);
}
} }
int Scene::FTA2StartProc() { int Scene::FTA2StartProc() {
MoviePlayerSMK *smkPlayer = new MoviePlayerSMK(_vm);
_vm->_gfx->showCursor(false); _vm->_gfx->showCursor(false);
// Show Ignite logo MoviePlayerSMK *smkPlayer = new MoviePlayerSMK(_vm);
debug(0, "Playing video trimark.smk"); smkPlayer->playVideo("trimark.smk"); // Show Ignite logo
if (!smkPlayer->playVideo("trimark.smk")) { smkPlayer->playVideo("intro.smk"); // Play introduction
warning("Failed to load video file trimark.smk");
}
// Play introduction
debug(0, "Playing video intro.smk");
if (!smkPlayer->playVideo("intro.smk")) {
warning("Failed to load video file intro.smk");
}
// Cleanup
delete smkPlayer; delete smkPlayer;
// HACK: Forcibly quit here // HACK: Forcibly quit here
@ -157,36 +153,30 @@ int Scene::FTA2EndProc(FTA2Endings whichEnding) {
char videoName[20]; char videoName[20];
switch (whichEnding) { switch (whichEnding) {
case kFta2BadEndingLaw: case kFta2BadEndingLaw:
strcpy(videoName, "end_1.smk"); strcpy(videoName, "end_1.smk");
break; break;
case kFta2BadEndingChaos: case kFta2BadEndingChaos:
strcpy(videoName, "end_2.smk"); strcpy(videoName, "end_2.smk");
break; break;
case kFta2GoodEnding1: case kFta2GoodEnding1:
strcpy(videoName, "end_3a.smk"); strcpy(videoName, "end_3a.smk");
break; break;
case kFta2GoodEnding2: case kFta2GoodEnding2:
strcpy(videoName, "end_3b.smk"); strcpy(videoName, "end_3b.smk");
break; break;
case kFta2BadEndingDeath: case kFta2BadEndingDeath:
strcpy(videoName, "end_4.smk"); strcpy(videoName, "end_4.smk");
break; break;
default: default:
error("Unknown FTA2 ending"); error("Unknown FTA2 ending");
} }
MoviePlayerSMK *smkPlayer = new MoviePlayerSMK(_vm);
_vm->_gfx->showCursor(false); _vm->_gfx->showCursor(false);
// Play ending // Play ending
debug(0, "Playing video %s", videoName); MoviePlayerSMK *smkPlayer = new MoviePlayerSMK(_vm);
if (!smkPlayer->playVideo(videoName)) { smkPlayer->playVideo(videoName);
warning("Failed to load video file %s", videoName);
}
// Cleanup
delete smkPlayer; delete smkPlayer;
return SUCCESS; return SUCCESS;