libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 04:01:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE: Fix Missing Default Switch Cases

Browse Source 
These are flagged by GCC if -Wswitch-default is enabled.
This commit is contained in:
D G Turner 2019-10-16 20:49:38 +01:00
parent 7e31014e98
commit ca800c3c62
4 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/cge/bitmap.cpp
View File

@ -300,6 +300,9 @@ bool Bitmap::solidAt(int16 x, int16 y) {
case kBmpREP:
w = 1;
break;
case kBmpCPY:
default:
break;
}
m += w;
}
@ -317,6 +320,7 @@ bool Bitmap::solidAt(int16 x, int16 y) {
n += w;
switch (t) {
default:
case kBmpEOI:
return false;
case kBmpSKP:

15
engines/cge/cge_main.cpp
View File

@ -941,6 +941,8 @@ void CGEEngine::optionTouch(int opt, uint16 mask) {
if (mask & kMouseLeftUp)
quit();
break;
default:
break;
}
}
@ -1065,22 +1067,23 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i
switch (i) {
case 0 : // Name - will be taken in Expand routine
default:
case 0: // Name - will be taken in Expand routine
break;
case 1 : // Type
case 1: // Type
if ((type = takeEnum(Type, strtok(NULL, " \t,;/"))) < 0)
error("Bad line %d [%s]", lcnt, fname);
break;
case 2 : // Phase
case 2: // Phase
shpcnt++;
break;
case 3 : // East
case 3: // East
east = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
case 11 : // Portable
case 11: // Portable
port = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
case 12 : // Transparent
case 12: // Transparent
tran = (atoi(strtok(NULL, " \t,;/")) != 0);
break;
}

51
engines/cge/snail.cpp
View File

@ -508,26 +508,29 @@ void CGEEngine::snGame(Sprite *spr, int num) {
}
_commandHandler->addCommand(kCmdSetZ, 20700, 0, NULL);
bool hit = (_sprK1->_seqPtr + _sprK2->_seqPtr + _sprK3->_seqPtr == 15);
if (hit) {
if (spr->_ref == 1) {
_commandHandler->addCommand(kCmdSay, 1, 20003, NULL); // hurray!
_commandHandler->addCommand(kCmdSeq, 20011, 2, NULL); // Camera away
_commandHandler->addCommand(kCmdSend, 20701, -1, NULL); // move dice1 to scene -1
_commandHandler->addCommand(kCmdSend, 20702, -1, NULL); // move dice2 to scene -1
_commandHandler->addCommand(kCmdSend, 20703, -1, NULL); // move dice3 to scene -1
_commandHandler->addCommand(kCmdSend, 20700, -1, NULL); // move TV to scene -1
_commandHandler->addCommand(kCmdKeep, 20007, 0, NULL); // to pocket
_commandHandler->addCommand(kCmdSend, 20006, 20, NULL); // Move Coin to scene 20
_commandHandler->addCommand(kCmdSound, 20006, 20002, NULL); // Play Coin sound
_commandHandler->addCommand(kCmdSay, 20002, 20004, NULL); // Say "Luck guy..."
_commandHandler->addCommand(kCmdSend, 20010, 20, NULL); // Move Paper to scene 20
_commandHandler->addCommand(kCmdSound, 20010, 20003, NULL); // Play "ksh" sound! (fx20003.wav)
_commandHandler->addCommand(kCmdSay, 20001, 20005, NULL); // Say "Congratulations"
_game = false;
return;
} else
_sprK3->step(newRandom(5));
{
bool hit = (_sprK1->_seqPtr + _sprK2->_seqPtr + _sprK3->_seqPtr == 15);
if (hit) {
if (spr->_ref == 1) {
_commandHandler->addCommand(kCmdSay, 1, 20003, NULL); // hurray!
_commandHandler->addCommand(kCmdSeq, 20011, 2, NULL); // Camera away
_commandHandler->addCommand(kCmdSend, 20701, -1, NULL); // move dice1 to scene -1
_commandHandler->addCommand(kCmdSend, 20702, -1, NULL); // move dice2 to scene -1
_commandHandler->addCommand(kCmdSend, 20703, -1, NULL); // move dice3 to scene -1
_commandHandler->addCommand(kCmdSend, 20700, -1, NULL); // move TV to scene -1
_commandHandler->addCommand(kCmdKeep, 20007, 0, NULL); // to pocket
_commandHandler->addCommand(kCmdSend, 20006, 20, NULL); // Move Coin to scene 20
_commandHandler->addCommand(kCmdSound, 20006, 20002, NULL); // Play Coin sound
_commandHandler->addCommand(kCmdSay, 20002, 20004, NULL); // Say "Luck guy..."
_commandHandler->addCommand(kCmdSend, 20010, 20, NULL); // Move Paper to scene 20
_commandHandler->addCommand(kCmdSound, 20010, 20003, NULL); // Play "ksh" sound! (fx20003.wav)
_commandHandler->addCommand(kCmdSay, 20001, 20005, NULL); // Say "Congratulations"
_game = false;
return;
} else {
_sprK3->step(newRandom(5));
}
}
}
if (_gameCase2Cpt < 100) {
@ -543,6 +546,8 @@ void CGEEngine::snGame(Sprite *spr, int num) {
// Tell to use ALT key
_commandHandler->addCommand(kCmdSay, 20003, 20022, NULL);
break;
default:
break;
}
_gameCase2Cpt++;
}
@ -593,7 +598,13 @@ void CGEEngine::snGame(Sprite *spr, int num) {
_commandHandler->addCommand(kCmdUncover, 1, 20101, NULL); // SDS ??
_commandHandler->addCommand(kCmdGame, 1, 2, NULL); // again!
break;
default:
break;
}
default:
break;
}
}

6
engines/cge/vga13h.cpp
View File

@ -252,6 +252,8 @@ Sprite *Sprite::expand() {
case 0xFE:
s->_next = seqCount - 1;
break;
default:
break;
}
if (s->_next > maxnxt)
maxnxt = s->_next;
@ -285,6 +287,8 @@ Sprite *Sprite::expand() {
c->_val = atoi(strtok(NULL, " \t,;/"));
c->_spritePtr = NULL;
break;
default:
break;
}
}
} else {
@ -880,6 +884,7 @@ void Bitmap::xShow(int16 x, int16 y) {
while (count-- > 0) {
// Transfer operation
switch (cmd) {
default:
case 1:
// SKIP
break;
@ -927,6 +932,7 @@ void Bitmap::show(int16 x, int16 y) {
while (count-- > 0) {
// Transfer operation
switch (cmd) {
default:
case 1:
// SKIP
break;