libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applied some ScummVM formatting conventions.

Browse Source 
svn-id: r17430
This commit is contained in:
Torbjörn Andersson 2005-04-07 08:57:40 +00:00
parent e6395f1eef
commit 49bab70ded
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
queen/cutaway.cpp
View File

@ -440,7 +440,7 @@ Cutaway::ObjectType Cutaway::getObjectType(CutawayObject &object) {
objectType = OBJECT_TYPE_NO_ANIMATION; objectType = OBJECT_TYPE_NO_ANIMATION;
} }
switch(object.objectNumber) { switch (object.objectNumber) {
case -2: case -2:
// Text to be spoken // Text to be spoken
objectType = OBJECT_TYPE_TEXT_SPEAK; objectType = OBJECT_TYPE_TEXT_SPEAK;

22
queen/queen.cpp
View File

@ -71,17 +71,17 @@ GameList Engine_QUEEN_gameList() {
} }
GameSettings determineTarget(uint32 size) { GameSettings determineTarget(uint32 size) {
switch(size) { switch (size) {
case 3724538: //regular demo case 3724538: //regular demo
case 3732177: case 3732177:
return queen_setting[1]; return queen_setting[1];
break; break;
case 1915913: //interview demo case 1915913: //interview demo
return queen_setting[2]; return queen_setting[2];
break; break;
default: //non-demo default: //non-demo
return queen_setting[0]; return queen_setting[0];
break; break;
} }
return queen_setting[0]; return queen_setting[0];
} }

80
queen/sound.cpp
View File

@ -47,37 +47,37 @@ Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
if (!mixer->isReady()) if (!mixer->isReady())
return new SilentSound(mixer, vm); return new SilentSound(mixer, vm);
switch(compression) { switch (compression) {
case COMPRESSION_NONE: case COMPRESSION_NONE:
return new SBSound(mixer, vm); return new SBSound(mixer, vm);
break; break;
case COMPRESSION_MP3: case COMPRESSION_MP3:
#ifndef USE_MAD #ifndef USE_MAD
warning("Using MP3 compressed datafile, but MP3 support not compiled in"); warning("Using MP3 compressed datafile, but MP3 support not compiled in");
return new SilentSound(mixer, vm); return new SilentSound(mixer, vm);
#else #else
return new MP3Sound(mixer, vm); return new MP3Sound(mixer, vm);
#endif #endif
break; break;
case COMPRESSION_OGG: case COMPRESSION_OGG:
#ifndef USE_VORBIS #ifndef USE_VORBIS
warning("Using OGG compressed datafile, but OGG support not compiled in"); warning("Using OGG compressed datafile, but OGG support not compiled in");
return new SilentSound(mixer, vm); return new SilentSound(mixer, vm);
#else #else
return new OGGSound(mixer, vm); return new OGGSound(mixer, vm);
#endif #endif
break; break;
case COMPRESSION_FLAC: case COMPRESSION_FLAC:
#ifndef USE_FLAC #ifndef USE_FLAC
warning("Using FLAC compressed datafile, but FLAC support not compiled in"); warning("Using FLAC compressed datafile, but FLAC support not compiled in");
return new SilentSound(mixer, vm); return new SilentSound(mixer, vm);
#else #else
return new FLACSound(mixer, vm); return new FLACSound(mixer, vm);
#endif #endif
break; break;
default: default:
warning("Unknown compression type"); warning("Unknown compression type");
return new SilentSound(mixer, vm); return new SilentSound(mixer, vm);
} }
} }
@ -161,15 +161,15 @@ void Sound::playSong(int16 songNum) {
int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override; int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
switch (override) { switch (override) {
// Override all songs // Override all songs
case 1: case 1:
break; break;
// Alter song settings (such as volume) and exit // Alter song settings (such as volume) and exit
case 2: case 2:
_vm->music()->toggleVChange(); _vm->music()->toggleVChange();
default: default:
return; return;
break; break;
} }
_lastOverride = songNum; _lastOverride = songNum;