Skip to content
Permalink
Browse files

TOUCHE: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.
  • Loading branch information...
digitall committed Nov 9, 2019
1 parent fd2f01f commit fbb60c6d8997bcaf671a52ca114bbb3d6293b43b
Showing with 22 additions and 0 deletions.
  1. +6 −0 engines/touche/menu.cpp
  2. +2 −0 engines/touche/opcodes.cpp
  3. +14 −0 engines/touche/touche.cpp
@@ -76,6 +76,8 @@ void ToucheEngine::drawButton(Button *button) {
dx = -1;
dy = -2;
break;
default:
break;
}
const int x = button->x + button->w / 2;
const int y = button->y + button->h / 2;
@@ -158,6 +160,8 @@ static void setupMenu(MenuMode mode, MenuData *menuData) {
menuData->buttonsTable = saveLoadButtonsTable;
menuData->buttonsCount = ARRAYSIZE(saveLoadButtonsTable);
break;
default:
break;
}
}

@@ -177,6 +181,8 @@ void ToucheEngine::redrawMenu(MenuData *menu) {
case kMenuSaveStateMode:
drawSaveGameStateDescriptions(_offscreenBuffer, kScreenWidth, menu, _saveLoadCurrentPage, _saveLoadCurrentSlot);
break;
default:
break;
}
for (uint i = 0; i < menu->buttonsCount; ++i) {
drawButton(&menu->buttonsTable[i]);
@@ -422,6 +422,8 @@ void ToucheEngine::op_setFlag() {
case 619:
debug(0, "Unknown music flag %d", val);
break;
default:
break;
}
}

@@ -338,6 +338,8 @@ void ToucheEngine::writeConfigurationSettings() {
ConfMan.setBool("speech_mute", false);
ConfMan.setBool("subtitles", true);
break;
default:
break;
}
ConfMan.setInt("music_volume", getMusicVolume());
ConfMan.flushToDisk();
@@ -851,6 +853,8 @@ void ToucheEngine::setKeyCharFrame(int keyChar, int16 type, int16 value1, int16
key->anim3Start = value1;
key->anim3Count = value2;
break;
default:
break;
}
}

@@ -1612,6 +1616,8 @@ void ToucheEngine::handleLeftMouseButtonClickOnInventory() {
drawInventory(_objectDescriptionNum, 1);
}
break;
default:
break;
}
}
break;
@@ -1699,6 +1705,8 @@ void ToucheEngine::handleMouseClickOnRoom(int flag) {
}
}
break;
default:
break;
}
if (_giveItemToCounter == 0 && !_hideInventoryTexts) {
if (hitBox->contains(hitPosX, hitPosY)) {
@@ -2098,6 +2106,8 @@ void ToucheEngine::updateRoomRegions() {
}
i += _programAreaTable[i].animCount + 1;
break;
default:
break;
}
}
}
@@ -2778,6 +2788,8 @@ void ToucheEngine::adjustKeyCharPosToWalkBox(KeyChar *key, int moveType) {
key->yPos = dy * kz / dz + y1;
}
break;
default:
break;
}
}

@@ -3057,6 +3069,8 @@ void ToucheEngine::updateKeyCharWalkPath(KeyChar *key, int16 dx, int16 dy, int16
}
}
break;
default:
break;
}
}

0 comments on commit fbb60c6

Please sign in to comment.
You can’t perform that action at this time.