WINTERMUTE: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.
This commit is contained in:
D G Turner 2019-11-14 23:28:07 +00:00
parent c7a5b15218
commit d7a22f72a1
38 changed files with 133 additions and 0 deletions

View File

@ -456,6 +456,9 @@ bool AdActor::loadBuffer(char *buffer, bool complete) {
}
}
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@ -1435,6 +1438,9 @@ bool AdActor::mergeAnims(const char *animsFilename) {
}
}
break;
default:
break;
}
}
delete[] fileBuffer;

View File

@ -489,6 +489,9 @@ bool AdEntity::loadBuffer(char *buffer, bool complete) {
_walkToDir = (TDirection)i;
}
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -1381,9 +1381,15 @@ bool AdGame::loadBuffer(char *buffer, bool complete) {
case TOKEN_DEBUG_STARTUP_SCENE:
BaseUtils::setString(&_debugStartupScene, params2);
break;
default:
break;
}
}
break;
default:
break;
}
}
@ -1577,6 +1583,9 @@ bool AdGame::loadItemsBuffer(char *buffer, bool merge) {
}
}
break;
default:
break;
}
}
@ -1648,6 +1657,9 @@ bool AdGame::windowLoadHook(UIWindow *win, char **buffer, char **params) {
}
}
break;
default:
break;
}
if (cmd == PARSERR_TOKENNOTFOUND || cmd == PARSERR_GENERIC) {

View File

@ -298,6 +298,9 @@ bool AdInventoryBox::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -310,6 +310,9 @@ bool AdItem::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -217,6 +217,9 @@ bool AdLayer::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -220,6 +220,9 @@ bool AdRegion::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -367,6 +367,9 @@ bool AdResponseBox::loadBuffer(char *buffer, bool complete) {
cmd = PARSERR_GENERIC;
}
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@ -422,6 +425,7 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
switch (_verticalAlign) {
case VAL_TOP:
default:
buffer->putTextIndent(indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
break;
case VAL_BOTTOM:
@ -487,6 +491,7 @@ bool AdResponseBox::display() {
break;
case VAL_TOP:
default:
// do nothing
break;
}

View File

@ -125,6 +125,9 @@ bool AdRotLevel::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -126,6 +126,9 @@ bool AdScaleLevel::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -878,6 +878,8 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -225,6 +225,9 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@ -328,6 +331,8 @@ bool AdSpriteSet::saveAsText(BaseDynamicBuffer *buffer, int indent) {
case DI_UPLEFT:
buffer->putTextIndent(indent + 2, "UP_LEFT=\"%s\"\n", _sprites[i]->getFilename());
break;
default:
break;
}
}
}

View File

@ -167,6 +167,9 @@ bool AdTalkDef::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -150,6 +150,9 @@ bool AdTalkNode::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -156,6 +156,9 @@ bool AdWaypointGroup::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -136,6 +136,9 @@ bool BaseClass::parseEditorProperty(char *buffer, bool complete) {
cmd = PARSERR_GENERIC;
}
break;
default:
break;
}
}

View File

@ -133,6 +133,7 @@ bool BaseFileManager::addPath(TPathType type, const Common::FSNode &path) {
switch (type) {
case PATH_SINGLE:
default:
// _singlePaths.push_back(path);
error("TODO: Allow adding single-paths");
break;

View File

@ -292,6 +292,9 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -938,6 +938,9 @@ bool BaseGame::loadBuffer(char *buffer, bool complete) {
case TOKEN_COMPAT_KILL_METHOD_THREADS:
parser.scanStr(params, "%b", &_compatKillMethodThreads);
break;
default:
break;
}
}

View File

@ -187,6 +187,9 @@ bool BaseGameSettings::loadSettings(const char *filename) {
case TOKEN_GUID:
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -443,6 +443,8 @@ int32 BaseParser::scanStr(const char *in, const char *format, ...) {
*a = '\0';
break;
}
default:
break;
}
if (*format) {
format++;

View File

@ -203,6 +203,9 @@ bool BaseRegion::loadBuffer(char *buffer, bool complete) {
case TOKEN_PROPERTY:
parseProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -417,6 +417,9 @@ bool BaseScriptHolder::parseProperty(char *buffer, bool complete) {
cmd = PARSERR_GENERIC;
}
break;
default:
break;
}
}

View File

@ -328,6 +328,9 @@ bool BaseSprite::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteCa
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}

View File

@ -180,6 +180,9 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -132,6 +132,7 @@ bool BaseSaveThumbFile::seek(uint32 pos, int whence) {
switch (whence) {
case SEEK_SET:
default:
newPos = pos;
break;
case SEEK_END:

View File

@ -419,6 +419,9 @@ bool BaseFontBitmap::loadBuffer(char *buffer) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}

View File

@ -442,6 +442,8 @@ bool BaseFontTT::loadBuffer(char *buffer) {
}
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
@ -500,6 +502,9 @@ bool BaseFontTT::parseLayer(BaseTTFontLayer *layer, char *buffer) {
layer->_color = BYTETORGBA(RGBCOLGetR(layer->_color), RGBCOLGetG(layer->_color), RGBCOLGetB(layer->_color), a);
}
break;
default:
break;
}
}
if (cmd != PARSERR_EOF) {

View File

@ -164,6 +164,9 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer
_velocity += force->_direction * dist * elapsedTime;
}
break;
default:
break;
}
}
_pos += _velocity * elapsedTime;

View File

@ -190,6 +190,9 @@ bool BaseSoundMgr::setVolume(Audio::Mixer::SoundType type, int volume) {
break;
case Audio::Mixer::kPlainSoundType:
error("Plain sound type shouldn't be used in WME");
break;
default:
break;
}
g_engine->syncSoundSettings();

View File

@ -79,6 +79,8 @@ Common::String Error::getErrorLevelStr() const {
case ERROR:
return "ERROR";
break;
default:
break;
}
return "SUCCESS";
}

View File

@ -456,6 +456,9 @@ bool UIButton::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -295,6 +295,9 @@ bool UIEdit::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -159,6 +159,9 @@ bool UIEntity::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -298,6 +298,9 @@ bool UIText::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -254,6 +254,9 @@ bool UITiledImage::loadBuffer(char *buffer, bool complete) {
case TOKEN_EDITOR_PROPERTY:
parseEditorProperty(params, false);
break;
default:
break;
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {

View File

@ -292,6 +292,8 @@ ConversionResult ConvertUTF16toUTF8(
case 1:
*--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
// fall through
default:
break;
}
target += bytesToWrite;
}
@ -415,6 +417,9 @@ ConversionResult ConvertUTF8toUTF16(
// fall through
case 0:
ch += *source++;
break;
default:
break;
}
ch -= offsetsFromUTF8[extraBytesToRead];
@ -523,6 +528,9 @@ ConversionResult ConvertUTF32toUTF8(
// fall through
case 1:
*--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
break;
default:
break;
}
target += bytesToWrite;
}
@ -577,6 +585,9 @@ ConversionResult ConvertUTF8toUTF32(
// fall through
case 0:
ch += *source++;
break;
default:
break;
}
ch -= offsetsFromUTF8[extraBytesToRead];

View File

@ -255,6 +255,9 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
_posX = (int)((_gameRef->_renderer->getWidth() - width) / 2);
_posY = (int)((_gameRef->_renderer->getHeight() - height) / 2);
break;
default:
break;
}
_theoraDecoder->start();