diff options
author | D G Turner | 2019-10-19 18:47:34 +0100 |
---|---|---|
committer | D G Turner | 2019-10-19 18:47:34 +0100 |
commit | b0ed255b391b23ad0126e030f52a53783f4004c0 (patch) | |
tree | a3526dc90b378c625127788320df7b447012e4b2 /engines/cruise | |
parent | 30c11071c4abc13383db399ad42a4fb367edfc48 (diff) | |
download | scummvm-rg350-b0ed255b391b23ad0126e030f52a53783f4004c0.tar.gz scummvm-rg350-b0ed255b391b23ad0126e030f52a53783f4004c0.tar.bz2 scummvm-rg350-b0ed255b391b23ad0126e030f52a53783f4004c0.zip |
CRUISE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/cruise')
-rw-r--r-- | engines/cruise/background.cpp | 4 | ||||
-rw-r--r-- | engines/cruise/dataLoader.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/linker.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/mainDraw.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/menu.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/script.cpp | 10 |
6 files changed, 22 insertions, 0 deletions
diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp index 4cf52f62e1..4aa33cffd5 100644 --- a/engines/cruise/background.cpp +++ b/engines/cruise/background.cpp @@ -179,6 +179,7 @@ int loadBackground(const char *name, int idx) { default: assert(0); + break; } gfxModuleData_setPal256(palScreen[idx]); @@ -199,6 +200,9 @@ int loadBackground(const char *name, int idx) { memcpy(backgroundScreens[idx], ptr2, 320 * 200); ptr2 += 320 * 200; break; + default: + assert(0); + break; } loadMEN(&ptr2); diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 2eff82bc61..d5b6541c2a 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -128,6 +128,8 @@ void decodeGfxUnified(dataFileEntry *pCurrentFileEntry, int16 format) { break; } + default: + break; } MemFree(pCurrentFileEntry->subData.ptr); diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp index 9786de775f..68ed923417 100644 --- a/engines/cruise/linker.cpp +++ b/engines/cruise/linker.cpp @@ -249,6 +249,8 @@ int updateScriptImport(int ovlIdx) { ovlData->arrayMsgRelHeader[linkEntryIdx].obj2Number = pFoundExport->idx; break; } + default: + break; } } } diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 5777b846b4..015d0b07e9 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -1370,6 +1370,8 @@ int getValueFromObjectQuerry(objectParamsQuery *params, int idx) { return params->state2; case 7: return params->nbState; + default: + break; } assert(0); diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp index cf0b872646..1abc7df199 100644 --- a/engines/cruise/menu.cpp +++ b/engines/cruise/menu.cpp @@ -300,6 +300,8 @@ int playerMenu(int menuX, int menuY) { break; case 7: // exit return 1; + default: + break; } } diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index aee3e8b846..f4593a1d36 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -264,6 +264,8 @@ int32 opcodeType2() { } break; + default: + break; } return 0; @@ -313,6 +315,9 @@ int32 opcodeType4() { // test if (var2 >= var1) boolVar = 1; break; + + default: + break; } pushVar(boolVar); @@ -398,6 +403,9 @@ int32 opcodeType5() { case 7: currentScriptPtr->scriptOffset = newSi; //always break; + + default: + break; } return (0); @@ -441,6 +449,8 @@ int32 opcodeType3() { // math pushVar(pop2 & pop1); return (0); + default: + break; } return 0; |