aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-03-10 06:39:23 +0000
committerTorbjörn Andersson2010-03-10 06:39:23 +0000
commit65585f643375e71d21d1c33e7c2f9a118897837d (patch)
treec182a841eb69a3d7473bb36b04b81e7c7f66f670 /engines/cruise
parentfc50408ce38d562d73fea2182659a4800852dcb5 (diff)
downloadscummvm-rg350-65585f643375e71d21d1c33e7c2f9a118897837d.tar.gz
scummvm-rg350-65585f643375e71d21d1c33e7c2f9a118897837d.tar.bz2
scummvm-rg350-65585f643375e71d21d1c33e7c2f9a118897837d.zip
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
Diffstat (limited to 'engines/cruise')
-rw-r--r--engines/cruise/dataLoader.cpp3
-rw-r--r--engines/cruise/menu.cpp1
2 files changed, 0 insertions, 4 deletions
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;
}
}