From 65585f643375e71d21d1c33e7c2f9a118897837d Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Wed, 10 Mar 2010 06:39:23 +0000 Subject: Silenced some harmless cppcheck warnings about unreachable code after a return. In this case, it was always a break after a return in a switch case. There are similar cases which cppcheck didn't detect, and a couple of cases where we have a break after a continue in a switch case (where the continue refers to an outer loop), but I didn't touch those. Not yet, at least. svn-id: r48218 --- engines/agi/preagi_troll.cpp | 2 -- engines/agos/script_pn.cpp | 1 - engines/cruise/dataLoader.cpp | 3 --- engines/cruise/menu.cpp | 1 - engines/gob/gob.cpp | 1 - engines/kyra/kyra_v1.cpp | 2 -- engines/kyra/sprites_lol.cpp | 1 - engines/m4/mads_menus.cpp | 2 +- engines/saga/animation.cpp | 1 - engines/sci/engine/kgraphics.cpp | 1 - engines/sci/engine/vm.cpp | 1 - engines/scumm/charset.cpp | 1 - 12 files changed, 1 insertion(+), 16 deletions(-) (limited to 'engines') diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index 96a3147e5a..4e87c8063c 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -81,8 +81,6 @@ bool Troll::getMenuSel(const char *szMenu, int *iSel, int nSel) { inventory(); return false; - - break; case Common::KEYCODE_DOWN: case Common::KEYCODE_SPACE: *iSel += 1; diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index b4ba468f51..0391d67b31 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -769,7 +769,6 @@ int AGOSEngine_PN::varval() { case 249: b = readfromline(); return (int)(b + 256 * readfromline()); - break; case 250: return readfromline(); case 251: diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 24365e0888..b2ac7a2fd6 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -253,12 +253,9 @@ int loadFile(const char* name, int idx, int destIdx) { return 0; // exit if limit is reached } return loadSetEntry(name, ptr, destIdx, idx); - - break; } case type_FNT: { return loadFNTSub(ptr, idx); - break; } case type_SPL: { // Sound file diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp index c5600c5165..2ffaa29e4a 100644 --- a/engines/cruise/menu.cpp +++ b/engines/cruise/menu.cpp @@ -308,7 +308,6 @@ int playerMenu(int menuX, int menuY) { break; case 7: // exit return 1; - break; } } diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index e0d7a740eb..6ad1214dd6 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -508,7 +508,6 @@ bool GobEngine::initGameParts() { default: deinitGameParts(); return false; - break; } _inter->setupOpcodes(); diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index b9894af98f..bd8e1295ca 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -604,11 +604,9 @@ uint8 KyraEngine_v1::getVolume(kVolumeEntry vol) { switch (vol) { case kVolumeMusic: return convertVolumeFromMixer(ConfMan.getInt("music_volume")); - break; case kVolumeSfx: return convertVolumeFromMixer(ConfMan.getInt("sfx_volume")); - break; case kVolumeSpeech: if (speechEnabled()) diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp index 77ac3b9d7f..a4ff0684f7 100644 --- a/engines/kyra/sprites_lol.cpp +++ b/engines/kyra/sprites_lol.cpp @@ -773,7 +773,6 @@ int LoLEngine::getMonsterCurFrame(MonsterInPlay *m, uint16 dirFlags) { break; case 2: return (m->fightCurTick >= 13) ? 13 : m->fightCurTick; - break; case 3: switch (m->mode) { case 5: diff --git a/engines/m4/mads_menus.cpp b/engines/m4/mads_menus.cpp index 5426edbf21..2411e47cb4 100644 --- a/engines/m4/mads_menus.cpp +++ b/engines/m4/mads_menus.cpp @@ -573,7 +573,7 @@ void DragonMainMenuView::handleAction(MadsGameAction action) { case EXIT: vm->_events->quitFlag = true; return; - break; + default: break; } diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp index 8b9ada3e47..8c11ddac1a 100644 --- a/engines/saga/animation.cpp +++ b/engines/saga/animation.cpp @@ -771,7 +771,6 @@ void Anim::decodeFrame(AnimationData *anim, size_t frameOffset, byte *buf, size_ break; case SAGA_FRAME_END: // End of frame marker return; - break; default: break; } diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 75aa4b4ecd..732041d820 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -238,7 +238,6 @@ reg_t kGraph(EngineState *s, int argc, reg_t *argv) { if (g_sci->getResMan()->isAmiga32color()) return make_reg(0, 32); return make_reg(0, !g_sci->getResMan()->isVGA() ? 16 : 256); - break; case K_GRAPH_DRAW_LINE: priority = (argc > 6) ? argv[6].toSint16() : -1; diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index cb106950e9..6934a6f481 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -547,7 +547,6 @@ static reg_t pointer_add(EngineState *s, reg_t base, int offset) { case SEG_TYPE_DYNMEM: base.offset += offset; return base; - break; default: // FIXME: Changed this to warning, because iceman does this during dancing with girl. diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index cf1c18b4f1..757171b24c 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -368,7 +368,6 @@ byte *ScummEngine::get2byteCharPtr(int idx) { } return _2byteFontPtr + base; - break; } case Common::ZH_CNA: idx = ((idx % 256) - 0xa1)* 94 + ((idx / 256) - 0xa1); -- cgit v1.2.3