[Scummvm-cvs-logs] SF.net SVN: scummvm: [23198] scummvm/trunk/gui
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Tue Jun 20 20:55:48 CEST 2006
Revision: 23198
Author: eriktorbjorn
Date: 2006-06-20 11:55:25 -0700 (Tue, 20 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23198&view=rev
Log Message:
-----------
Cleanup. It seems unnecessary to have a "break" right after an unconditional
return in a switch case.
Modified Paths:
--------------
scummvm/trunk/backends/gp32/debug-gdbstub-usb.cpp
scummvm/trunk/backends/wince/wince-sdl.cpp
scummvm/trunk/engines/gob/music.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/saga/events.cpp
scummvm/trunk/engines/saga/image.cpp
scummvm/trunk/engines/scumm/help.cpp
scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
scummvm/trunk/engines/scumm/script_v5.cpp
scummvm/trunk/engines/scumm/script_v6.cpp
scummvm/trunk/engines/simon/simon.cpp
scummvm/trunk/gui/ThemeNew.cpp
scummvm/trunk/sound/softsynth/ym2612.cpp
Modified: scummvm/trunk/backends/gp32/debug-gdbstub-usb.cpp
===================================================================
--- scummvm/trunk/backends/gp32/debug-gdbstub-usb.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/backends/gp32/debug-gdbstub-usb.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -943,25 +943,18 @@
switch(CSPR & 0x1f) {
case 0x10: // USER
return 0;
- break;
case 0x11: // FIQ
return 1;
- break;
case 0x12: // IRQ
return 2;
- break;
case 0x13: // Supervisor
return 3;
- break;
case 0x17: // Abort
return 4;
- break;
case 0x1B: // Undefined/Breakpoint
return 5;
- break;
case 0x1F: // System
return 6;
- break;
default:
return -1;
}
@@ -1299,75 +1292,59 @@
// This is true if Z is set in CSPR
if ((CSPR & (1 << 30)) != 0) return true;
else return false;
-
- break;
case 1: // NE
// This should be true if Z is not set.
if ((CSPR & (1 << 30)) == 0) return true;
else return false;
- break;
case 2: // CS/HS
// this one should be true if C is set.
if ((CSPR & (1 << 29)) != 0) return true;
else return false;
- break;
case 3: // CC/LO
// this one should be true if C is clear.
if ((CSPR & (1 << 29)) == 0) return true;
else return false;
- break;
case 4: // MI
// this one should be true if N is set
if ((CSPR & (1 << 31)) != 0) return true;
else return false;
- break;
case 5: // PL
// this one should be true if N is clear.
if ((CSPR & (1 << 31)) == 0) return true;
else return false;
- break;
case 6: // VS
// this one should be true if V is set
if ((CSPR & (1 << 28)) != 0) return true;
else return false;
- break;
case 7: // VC
// this one should be true if V is clear.
if ((CSPR & (1 << 28)) == 0) return true;
else return false;
- break;
case 8: // HI
// This is true if C and Z is clear
if (((CSPR & (1 << 30)) == 0) && ((CSPR & (1 << 29)) == 0)) return true;
else return false;
- break;
case 9: // LS
// C clear OR Z set
if (((CSPR & (1 << 29)) == 0) || ((CSPR & (1 << 30)) != 0)) return true;
else return false;
- break;
case 10: // GE
// N set AND V set || N clear and V clear
if ((CSPR & (1 << 31)) == (CSPR & (1 << 28))) return true;
else return false;
- break;
case 11: // LT
// N != V
if ((CSPR & (1 << 31)) != (CSPR & (1 << 28))) return true;
else return false;
- break;
case 12: // GT
// Z == 0, N == V
if (((CSPR & (1 << 30)) == 0) && ((CSPR & (1 << 31)) == (CSPR & (1 << 28)))) return true;
else return false;
- break;
case 13: // LE
if (((CSPR & (1 << 30)) == 1) && ((CSPR & (1 << 31)) != (CSPR & (1 << 28)))) return true;
else return false;
- break;
case 14: // AL
return true;
- break;
default:
break;
}
@@ -1662,20 +1639,14 @@
switch (shift) {
case 0: // LSL
return LSL(uiRegisterValue, amount);
- break;
case 1: // LSR
return LSR(uiRegisterValue, amount);
- break;
case 2: // ASR
return ASR(uiRegisterValue, amount);
- break;
case 3: // ROR
return ROR(uiRegisterValue, amount);
- break;
-
default:
break;
-
}
return 0;
}
Modified: scummvm/trunk/backends/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/wince/wince-sdl.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/backends/wince/wince-sdl.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -851,7 +851,6 @@
_transactionDetails.sizeChanged = true;
_transactionDetails.needUnload = true;
return;
- break;
case kTransactionCommit:
break;
default:
@@ -965,17 +964,16 @@
bool OSystem_WINCE3::setGraphicsMode(int mode) {
- switch (_transactionMode) {
- case kTransactionActive:
+ switch (_transactionMode) {
+ case kTransactionActive:
_transactionDetails.mode = mode;
_transactionDetails.modeChanged = true;
return true;
+ case kTransactionCommit:
break;
- case kTransactionCommit:
+ default:
break;
- default:
- break;
- }
+ }
Common::StackLock lock(_graphicsMutex);
int oldScaleFactorXm = _scaleFactorXm;
Modified: scummvm/trunk/engines/gob/music.cpp
===================================================================
--- scummvm/trunk/engines/gob/music.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/gob/music.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -391,7 +391,6 @@
_ended = true;
_samplesTillPoll = 0;
return;
- break;
default:
warning("Unknown special command in ADL, stopping playback: %X", instr & 0x0F);
_repCount = 0;
Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/queen/queen.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -79,13 +79,10 @@
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];
}
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/queen/sound.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -53,7 +53,6 @@
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 @@
#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 @@
#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 @@
#else
return new FLACSound(mixer, vm);
#endif
- break;
default:
warning("Unknown compression type");
return new SilentSound(mixer, vm);
Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/saga/events.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -364,7 +364,6 @@
case kEventEnd:
_vm->_scene->nextScene();
return kEvStBreak;
- break;
default:
break;
}
@@ -514,7 +513,6 @@
break;
default:
return FAILURE;
- break;
}
return SUCCESS;
Modified: scummvm/trunk/engines/saga/image.cpp
===================================================================
--- scummvm/trunk/engines/saga/image.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/saga/image.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -293,7 +293,6 @@
break;
default:
return FAILURE;
- break;
}
}
Modified: scummvm/trunk/engines/scumm/help.cpp
===================================================================
--- scummvm/trunk/engines/scumm/help.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/scumm/help.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -35,10 +35,8 @@
case GID_MANIAC:
case GID_ZAK:
return 4;
- break;
case GID_INDY3:
return 6;
- break;
case GID_LOOM:
case GID_MONKEY_EGA:
case GID_MONKEY_VGA:
@@ -51,7 +49,6 @@
case GID_FT:
case GID_CMI:
return 3;
- break;
/* TODO - I don't know the controls for these games
case GID_PUTTDEMO:
case GID_PUTTPUTT:
Modified: scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_enemy.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/scumm/insane/insane_enemy.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -33,31 +33,22 @@
switch (num) {
case EN_ROTT1:
return enemy0initializer(actor1, actor2, probability);
- break;
case EN_ROTT2:
return enemy1initializer(actor1, actor2, probability);
- break;
case EN_ROTT3:
return enemy2initializer(actor1, actor2, probability);
- break;
case EN_VULTF1:
return enemy3initializer(actor1, actor2, probability);
- break;
case EN_VULTM1:
return enemy4initializer(actor1, actor2, probability);
- break;
case EN_VULTF2:
return enemy5initializer(actor1, actor2, probability);
- break;
case EN_VULTM2:
return enemy6initializer(actor1, actor2, probability);
- break;
case EN_CAVEFISH:
return enemy7initializer(actor1, actor2, probability);
- break;
case EN_TORQUE:
return enemy8initializer(actor1, actor2, probability);
- break;
case -1:
// nothing
break;
@@ -71,34 +62,24 @@
switch (num) {
case EN_ROTT1:
return enemy0handler(actor1, actor2, probability);
- break;
case EN_ROTT2:
return enemy1handler(actor1, actor2, probability);
- break;
case EN_ROTT3:
return enemy2handler(actor1, actor2, probability);
- break;
case EN_VULTF1:
return enemy3handler(actor1, actor2, probability);
- break;
case EN_VULTM1:
return enemy4handler(actor1, actor2, probability);
- break;
case EN_VULTF2:
return enemy5handler(actor1, actor2, probability);
- break;
case EN_VULTM2:
return enemy6handler(actor1, actor2, probability);
- break;
case EN_CAVEFISH:
return enemy7handler(actor1, actor2, probability);
- break;
case EN_TORQUE:
return enemy8handler(actor1, actor2, probability);
- break;
case EN_BEN:
return enemyBenHandler(actor1, actor2, probability);
- break;
case -1:
// nothing
break;
Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -632,12 +632,10 @@
smlayer_setFluPalette(_smush_roadrashRip, 0);
setupValues();
return;
- break;
case 17:
smlayer_setFluPalette(_smush_goglpaltRip, 0);
setupValues();
return;
- break;
case 2:
if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
smlayer_setActorCostume(0, 2, readArray(9));
@@ -645,19 +643,16 @@
smlayer_setActorCostume(0, 2, readArray(10));
setupValues();
return;
- break;
case 13:
setEnemyCostumes();
smlayer_setFluPalette(_smush_roadrashRip, 0);
return;
- break;
case 21:
_currEnemy = EN_ROTT3; //PATCH
setEnemyCostumes();
_actor[1].y = 200;
smlayer_setFluPalette(_smush_roadrashRip, 0);
return;
- break;
case 4:
case 5:
case 6:
@@ -668,7 +663,6 @@
smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2);
setupValues();
return;
- break;
case 7:
case 8:
writeArray(4, 0);
Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/scumm/script_v5.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -882,11 +882,9 @@
break;
case 0x04:
return;
- break;
case 0x1F: // close file
debug(0, "stub saveVars close file");
return;
- break;
}
}
}
@@ -916,11 +914,9 @@
break;
case 0x04:
return;
- break;
case 0x1F: // close file
debug(0, "stub loadVars close file");
return;
- break;
}
}
}
@@ -1921,7 +1917,6 @@
case 30:
debug(0, "o5_roomOps: unhandled FM-TOWNS fadeEffect %d", a);
return;
- break;
}
}
_switchRoomEffect = (byte)(a & 0xFF);
Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/scumm/script_v6.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -2791,35 +2791,26 @@
switch (key) {
case 0x147: // Home
return (_keyDownMap[0x107] || _keyDownMap[0x115]) ? 1 : 0;
- break;
case 0x148: // Up
return (_keyDownMap[0x108] || _keyDownMap[0x111] ||
_keyDownMap[0x38]) ? 1 : 0;
- break;
case 0x149: // PgUp
return (_keyDownMap[0x109] || _keyDownMap[0x118]) ? 1 : 0;
- break;
case 0x14B: // Left
return (_keyDownMap[0x104] || _keyDownMap[0x114] ||
_keyDownMap[0x34]) ? 1 : 0;
- break;
case 0x14D: // Right
return (_keyDownMap[0x106] || _keyDownMap[0x113] ||
_keyDownMap[0x36]) ? 1 : 0;
- break;
case 0x14F: // End
return (_keyDownMap[0x101] || _keyDownMap[0x117]) ? 1 : 0;
- break;
case 0x150: // Down
return (_keyDownMap[0x102] || _keyDownMap[0x112] ||
_keyDownMap[0x32]) ? 1 : 0;
- break;
case 0x151: // PgDn
return (_keyDownMap[0x103] || _keyDownMap[0x119]) ? 1 : 0;
- break;
default:
return (_keyDownMap[key]) ? 1 : 0;
- break;
}
}
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -2063,7 +2063,6 @@
case OSystem::EVENT_QUIT:
shutdown();
return;
- break;
default:
break;
}
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/gui/ThemeNew.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -908,23 +908,18 @@
switch (shadowStyle) {
case kShadowButton:
return Common::Rect(r.left - 1, r.top - 1, r.right + 1, r.bottom + 1);
- break;
case kShadowEmboss:
return Common::Rect(r.left - 1, r.top - 1, r.right + 1, r.bottom + 1);
- break;
case kShadowPopUp:
return Common::Rect(r.left - 1, r.top - 1, r.right + 3, r.bottom + 3);
- break;
case kShadowFull:
return Common::Rect(r.left - 2, r.top - 2, r.right + 4, r.bottom + 4);
- break;
default:
return Common::Rect(r.left - _shadowLeftWidth/2, r.top - _shadowTopHeight/2, r.right + _shadowRightWidth/2 + 1, r.bottom + _shadowBottomHeight/2 + 1);
- break;
}
return Common::Rect();
@@ -1156,11 +1151,9 @@
switch (state) {
case kStateDisabled:
return _colors[kColorStateDisabled];
- break;
case kStateHighlight:
return _colors[kColorStateHighlight];
- break;
default:
break;
Modified: scummvm/trunk/sound/softsynth/ym2612.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.cpp 2006-06-20 18:26:40 UTC (rev 23197)
+++ scummvm/trunk/sound/softsynth/ym2612.cpp 2006-06-20 18:55:25 UTC (rev 23198)
@@ -333,7 +333,6 @@
switch (_state) {
case _s_ready:
return;
- break;
case _s_attacking:
next_state = _s_attacking;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list