aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-06-20 18:55:25 +0000
committerTorbjörn Andersson2006-06-20 18:55:25 +0000
commitecfedb1e81dc738620bdc42be15855559674a9ef (patch)
tree57eddf927c69a3cb9d0d15720bd29ded15c2a5fa /engines/queen
parent1569d5fadc511780cd24bd835fc8983a76a714ba (diff)
downloadscummvm-rg350-ecfedb1e81dc738620bdc42be15855559674a9ef.tar.gz
scummvm-rg350-ecfedb1e81dc738620bdc42be15855559674a9ef.tar.bz2
scummvm-rg350-ecfedb1e81dc738620bdc42be15855559674a9ef.zip
Cleanup. It seems unnecessary to have a "break" right after an unconditional
return in a switch case. svn-id: r23198
Diffstat (limited to 'engines/queen')
-rw-r--r--engines/queen/queen.cpp3
-rw-r--r--engines/queen/sound.cpp4
2 files changed, 0 insertions, 7 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 32ed860b75..b3380f3f97 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -79,13 +79,10 @@ GameDescriptor determineTarget(uint32 size) {
case 3724538: //regular demo
case 3732177:
return queen_setting[1];
- break;
case 1915913: //interview demo
return queen_setting[2];
- break;
default: //non-demo
return queen_setting[0];
- break;
}
return queen_setting[0];
}
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 2e28d5a87e..199c2c5580 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -53,7 +53,6 @@ Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression)
switch (compression) {
case COMPRESSION_NONE:
return new SBSound(mixer, vm);
- break;
case COMPRESSION_MP3:
#ifndef USE_MAD
warning("Using MP3 compressed datafile, but MP3 support not compiled in");
@@ -61,7 +60,6 @@ Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression)
#else
return new MP3Sound(mixer, vm);
#endif
- break;
case COMPRESSION_OGG:
#ifndef USE_VORBIS
warning("Using OGG compressed datafile, but OGG support not compiled in");
@@ -69,7 +67,6 @@ Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression)
#else
return new OGGSound(mixer, vm);
#endif
- break;
case COMPRESSION_FLAC:
#ifndef USE_FLAC
warning("Using FLAC compressed datafile, but FLAC support not compiled in");
@@ -77,7 +74,6 @@ Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression)
#else
return new FLACSound(mixer, vm);
#endif
- break;
default:
warning("Unknown compression type");
return new SilentSound(mixer, vm);