thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

QUEEN: 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-11-15 03:38:19 +00:00
parent 4af25ccfdd
commit 81468e2193
11 changed files with 67 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/queen/command.cpp
View file

@ -514,6 +514,8 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) {
case 4:
_vm->logic()->joeUseUnderwear();
break;
default:
break;
}
if (_state.subject[0] > 0)
@ -1228,6 +1230,8 @@ uint16 Command::nextObjectDescription(ObjectDescription* objDesc, uint16 firstDe
++objDesc->lastSeenNumber;
}
break;
default:
break;
}
return objDesc->lastSeenNumber;
}

4
engines/queen/credits.cpp
View file

@ -113,6 +113,8 @@ void Credits::update() {
case '9' :
_zone = line[1] - '1';
break;
default:
break;
}
} else {
assert(_count < ARRAYSIZE(_list));
@ -131,6 +133,8 @@ void Credits::update() {
case 2:
_list[_count].x = (_zone % 3) * (320 / 3) + 100 - _vm->display()->textWidth(line);
break;
default:
break;
}
_list[_count].y = (_zone / 3) * (200 / 3) + (_count * 10);
_count++;

4
engines/queen/cutaway.cpp
View file

@ -147,6 +147,8 @@ void Cutaway::load(const char *filename) {
case 'B':
_vm->logic()->joeCutFacing(DIR_BACK);
break;
default:
break;
}
}
@ -450,6 +452,8 @@ Cutaway::ObjectType Cutaway::getObjectType(CutawayObject &object) {
// Text to be displayed only (not spoken)
objectType = OBJECT_TYPE_TEXT_DISPLAY;
break;
default:
break;
}
if (OBJECT_TYPE_ANIMATION == objectType && !object.execute) {

10
engines/queen/display.cpp
View file

@ -299,6 +299,8 @@ void Display::palCustomColors(uint16 roomNum) {
palSetAmigaColor(20, 0xA58);
palSetAmigaColor(21, 0x845);
break;
default:
break;
}
return;
}
@ -327,6 +329,8 @@ void Display::palCustomColors(uint16 roomNum) {
_pal.room[i * 3 + 2] = _pal.room[i * 3 + 1] * 60 / 100;
}
break;
default:
break;
}
}
@ -358,6 +362,8 @@ void Display::palCustomScroll(uint16 roomNum) {
loPal = 28;
hiPal = 31;
break;
default:
break;
}
_pal.dirtyMin = MIN(_pal.dirtyMin, loPal);
_pal.dirtyMax = MAX(_pal.dirtyMax, hiPal);
@ -554,6 +560,8 @@ void Display::palCustomScroll(uint16 roomNum) {
loPal = 101;
hiPal = 127;
break;
default:
break;
}
_pal.dirtyMin = MIN(_pal.dirtyMin, loPal);
_pal.dirtyMax = MAX(_pal.dirtyMax, hiPal);
@ -1136,6 +1144,8 @@ void Display::blankScreenEffect2() {
case 3:
c = *(p + SCREEN_W + 1);
break;
default:
break;
}
memset(p, c, 2);
memset(p + SCREEN_W, c, 2);

4
engines/queen/graphics.cpp
View file

@ -627,6 +627,8 @@ void Graphics::handleParallax(uint16 roomNum) {
_bobs[21].x += 2;
_bobs[21].y += 2;
break;
default:
break;
}
}
@ -1257,6 +1259,8 @@ void BamScene::updateFightAnimation() {
_flag = F_STOP;
}
break;
default:
break;
}
}
}

12
engines/queen/journal.cpp
View file

@ -239,6 +239,8 @@ void Journal::handleKeyDown(uint16 ascii, int keycode) {
_quitMode = QM_CONTINUE;
}
break;
default:
break;
}
}
@ -292,6 +294,8 @@ void Journal::handleMouseDown(int x, int y) {
_quitMode = QM_CONTINUE;
_vm->quitGame();
break;
default:
break;
}
} else if (zoneNum == ZN_NO) {
exitYesNoPanelMode();
@ -372,8 +376,12 @@ void Journal::handleMouseDown(int x, int y) {
_vm->subtitles(!_vm->subtitles());
drawConfigPanel();
break;
default:
break;
}
break;
default:
break;
}
update();
}
@ -504,6 +512,8 @@ void Journal::drawInfoPanel() {
case 'a':
_vm->display()->setTextCentered(132, "Amiga A500/600", false);
break;
default:
break;
}
switch (ver[1]) {
case 'E':
@ -524,6 +534,8 @@ void Journal::drawInfoPanel() {
case 'S':
_vm->display()->setTextCentered(144, "Espa\xA4""ol", false);
break;
default:
break;
}
char versionId[13];
sprintf(versionId, "Version %c.%c%c", ver[2], ver[3], ver[4]);

16
engines/queen/logic.cpp
View file

@ -648,6 +648,8 @@ void Logic::setupJoeInRoom(bool autoPosition, uint16 scale) {
case DIR_RIGHT:
joeFacing(DIR_LEFT);
break;
default:
break;
}
}
joePrevFacing(joeFacing());
@ -712,6 +714,8 @@ uint16 Logic::joeFace() {
case 37:
frame = 5;
break;
default:
break;
}
}
pbs->frameNum = 31;
@ -756,6 +760,8 @@ void Logic::joeGrab(int16 grabState) {
// turn back
frame = 7;
break;
default:
break;
}
if (frame != 0) {
@ -1107,6 +1113,8 @@ void Logic::handleSpecialArea(Direction facing, uint16 areaNum, uint16 walkDataN
case 1:
playCutaway("C50H.CUT", nextCut);
break;
default:
break;
}
}
break;
@ -1134,6 +1142,8 @@ void Logic::handleSpecialArea(Direction facing, uint16 areaNum, uint16 walkDataN
case 2:
playCutaway("C73C.CUT");
break;
default:
break;
}
break;
case ROOM_TEMPLE_MAZE_5:
@ -1156,9 +1166,13 @@ void Logic::handleSpecialArea(Direction facing, uint16 areaNum, uint16 walkDataN
case 1:
playCutaway("C103E.CUT", nextCut);
break;
default:
break;
}
}
break;
default:
break;
}
while (strlen(nextCut) > 4 &&
@ -1360,6 +1374,8 @@ void Logic::setupRestoredGame() {
_vm->display()->palSetJoeDress();
loadJoeBanks("JOED_A.BBK", "JOED_B.BBK");
break;
default:
break;
}
BobSlot *pbs = _vm->graphics()->bob(0);

2
engines/queen/midiadlib.cpp
View file

@ -103,6 +103,8 @@ void AdLibMidiDriver::metaEvent(byte type, byte *data, uint16 length) {
return;
}
break;
default:
break;
}
}
warning("Unhandled meta event %d len %d", event, length);

2
engines/queen/sound.cpp
View file

@ -461,6 +461,8 @@ void AmigaSound::playSong(int16 song) {
case 195:
song = 32;
break;
default:
break;
}
if (_lastOverride != 32 && _lastOverride != 44) {

2
engines/queen/state.cpp
View file

@ -90,6 +90,8 @@ void State::alterOn(uint16 *objState, StateOn state) {
case STATE_ON_OFF:
*objState &= ~(1 << 8);
break;
default:
break;
}
}

8
engines/queen/talk.cpp
View file

@ -813,6 +813,9 @@ void Talk::speakSegment(
faceDirectionCommand = command;
command = 0;
break;
default:
break;
}
bool isJoe = (0 == person->actor->bobNum);
@ -859,7 +862,8 @@ void Talk::speakSegment(
color = isJoe ? 6 : 30;
}
break;
default: // FRANK_HEAD
case FRANK_HEAD:
default:
textX = 150;
if (_vm->resource()->getPlatform() == Common::kPlatformAmiga) {
color = 17;
@ -935,6 +939,8 @@ void Talk::speakSegment(
case SPEAK_FACE_BACK:
faceDirection = DIR_BACK;
break;
default:
break;
}
if (isJoe)
_vm->logic()->joeFacing(faceDirection);