[Scummvm-cvs-logs] SF.net SVN: scummvm:[48218] scummvm/trunk/engines
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Wed Mar 10 07:39:25 CET 2010
Revision: 48218
http://scummvm.svn.sourceforge.net/scummvm/?rev=48218&view=rev
Author: eriktorbjorn
Date: 2010-03-10 06:39:23 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
scummvm/trunk/engines/agi/preagi_troll.cpp
scummvm/trunk/engines/agos/script_pn.cpp
scummvm/trunk/engines/cruise/dataLoader.cpp
scummvm/trunk/engines/cruise/menu.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/sprites_lol.cpp
scummvm/trunk/engines/m4/mads_menus.cpp
scummvm/trunk/engines/saga/animation.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/scumm/charset.cpp
Modified: scummvm/trunk/engines/agi/preagi_troll.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_troll.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/agi/preagi_troll.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -81,8 +81,6 @@
inventory();
return false;
-
- break;
case Common::KEYCODE_DOWN:
case Common::KEYCODE_SPACE:
*iSel += 1;
Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/agos/script_pn.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -769,7 +769,6 @@
case 249:
b = readfromline();
return (int)(b + 256 * readfromline());
- break;
case 250:
return readfromline();
case 251:
Modified: scummvm/trunk/engines/cruise/dataLoader.cpp
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/cruise/dataLoader.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -253,12 +253,9 @@
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
Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/cruise/menu.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -308,7 +308,6 @@
break;
case 7: // exit
return 1;
- break;
}
}
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/gob/gob.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -508,7 +508,6 @@
default:
deinitGameParts();
return false;
- break;
}
_inter->setupOpcodes();
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -604,11 +604,9 @@
switch (vol) {
case kVolumeMusic:
return convertVolumeFromMixer(ConfMan.getInt("music_volume"));
- break;
case kVolumeSfx:
return convertVolumeFromMixer(ConfMan.getInt("sfx_volume"));
- break;
case kVolumeSpeech:
if (speechEnabled())
Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -773,7 +773,6 @@
break;
case 2:
return (m->fightCurTick >= 13) ? 13 : m->fightCurTick;
- break;
case 3:
switch (m->mode) {
case 5:
Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/m4/mads_menus.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -573,7 +573,7 @@
case EXIT:
vm->_events->quitFlag = true;
return;
- break;
+
default:
break;
}
Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/saga/animation.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -771,7 +771,6 @@
break;
case SAGA_FRAME_END: // End of frame marker
return;
- break;
default:
break;
}
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -238,7 +238,6 @@
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;
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -547,7 +547,6 @@
case SEG_TYPE_DYNMEM:
base.offset += offset;
return base;
- break;
default:
// FIXME: Changed this to warning, because iceman does this during dancing with girl.
Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp 2010-03-09 23:36:18 UTC (rev 48217)
+++ scummvm/trunk/engines/scumm/charset.cpp 2010-03-10 06:39:23 UTC (rev 48218)
@@ -368,7 +368,6 @@
}
return _2byteFontPtr + base;
- break;
}
case Common::ZH_CNA:
idx = ((idx % 256) - 0xa1)* 94 + ((idx / 256) - 0xa1);
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