Skip to content

Commit

Permalink
GOB: Fix Missing Default Switch Cases
Browse files Browse the repository at this point in the history 
These are flagged by GCC if -Wswitch-default is enabled.
  • Loading branch information
@digitall
digitall committed Dec 12, 2019
1 parent f62dc99 commit 799a088
Show file tree
Hide file tree
Showing 26 changed files with 158 additions and 0 deletions.
3 changes: 3 additions & 0 deletions engines/gob/draw.cpp
View file
Expand Up @@ -381,6 +381,9 @@ void Draw::adjustCoords(char adjust, int16 *coord1, int16 *coord2) {
if (coord1)
*coord1 = *coord1 * 2 + 1;
break;

default:
break;
}
}

Expand Down
3 changes: 3 additions & 0 deletions engines/gob/draw_fascin.cpp
View file
Expand Up @@ -299,6 +299,9 @@ void Draw_Fascination::spriteOperation(int16 operation) {

dirtiedRect(_destSurface, _destSpriteX, _destSpriteY, _spriteRight, _spriteBottom);
break;

default:
break;
}

_spriteLeft = spriteLeft;
Expand Down
5 changes: 5 additions & 0 deletions engines/gob/draw_v1.cpp
View file
Expand Up @@ -213,6 +213,8 @@ void Draw_v1::printTotText(int16 id) {
_backColor = cmd & 0xF;
spriteOperation(DRAW_FILLRECTABS);
break;
default:
break;
}
}
ptr += 2;
Expand Down Expand Up @@ -485,6 +487,9 @@ void Draw_v1::spriteOperation(int16 operation) {
_destSpriteX, _destSpriteY, (_transparency == 0) ? -1 : 0);

break;

default:
break;
}

if (_renderFlags & RENDERFLAG_USEDELTAS) {
Expand Down
5 changes: 5 additions & 0 deletions engines/gob/draw_v2.cpp
View file
Expand Up @@ -329,6 +329,8 @@ void Draw_v2::printTotText(int16 id) {
_backColor = cmd & 0xF;
spriteOperation(DRAW_FILLRECTABS);
break;
default:
break;
}
}
ptr += 2;
Expand Down Expand Up @@ -916,6 +918,9 @@ void Draw_v2::spriteOperation(int16 operation) {

dirtiedRect(_destSurface, _destSpriteX, _destSpriteY, _spriteRight, _spriteBottom);
break;

default:
break;
}

_spriteLeft = spriteLeft;
Expand Down
19 changes: 19 additions & 0 deletions engines/gob/expression.cpp
View file
Expand Up @@ -174,6 +174,10 @@ void Expression::skipExpr(char stopToken) {
case OP_FUNC:
_vm->_game->_script->skip(1);
skipExpr(OP_END_EXPR);
break;

default:
break;
}
continue;
} // if ((operation >= OP_ARRAY_INT8) && (operation <= OP_FUNC))
Expand Down Expand Up @@ -309,6 +313,9 @@ void Expression::printExpr_internal(char stopToken) {
debugN(5, "id(");
printExpr_internal(OP_END_EXPR);
break;

default:
break;
}
continue;
} // if ((operation >= OP_ARRAY_INT8) && (operation <= OP_FUNC))
Expand Down Expand Up @@ -783,11 +790,17 @@ void Expression::loadValue(byte operation, uint32 varBase, const StackFrame &sta
_resultInt =
_vm->_util->getRandom(_resultInt);
break;

default:
break;
}

*stackFrame.opers = OP_LOAD_IMM_INT16;
*stackFrame.values = _resultInt;
break;

default:
break;
}
}

Expand Down Expand Up @@ -823,6 +836,9 @@ void Expression::simpleArithmetic1(StackFrame &stackFrame) {
stackFrame.values[-2] &= stackFrame.values[0];
stackFrame.pop(2);
break;

default:
break;
}
}

Expand Down Expand Up @@ -859,6 +875,9 @@ void Expression::simpleArithmetic2(StackFrame &stackFrame) {
stackFrame.values[-3] &= stackFrame.values[-1];
stackFrame.pop(2);
break;

default:
break;
}
}

Expand Down
12 changes: 12 additions & 0 deletions engines/gob/goblin.cpp
View file
Expand Up @@ -721,6 +721,9 @@ void Goblin::adjustDest(int16 posX, int16 posY) {
case 3:
_pressedMapY -= resDelta;
break;

default:
break;
}

}
Expand Down Expand Up @@ -1748,6 +1751,9 @@ void Goblin::animate(Mult::Mult_Object *obj) {
if (animData->frame >= framesCount)
animData->isPaused = 1;
break;

default:
break;
}

if ((animData->newState == -1) && (animData->frame >= framesCount)) {
Expand Down Expand Up @@ -1873,6 +1879,9 @@ void Goblin::updateLayer1(Mult::Mult_AnimData *animData) {
case 23:
animData->layer = 21;
break;

default:
break;
}
}

Expand Down Expand Up @@ -1905,6 +1914,9 @@ void Goblin::updateLayer2(Mult::Mult_AnimData *animData) {
case 23:
animData->layer = 24;
break;

default:
break;
}
}

Expand Down
15 changes: 15 additions & 0 deletions engines/gob/goblin_v1.cpp
View file
Expand Up @@ -396,6 +396,9 @@ void Goblin_v1::movePathFind(Mult::Mult_Object *obj,
gobDesc->curLookDir = 4;
_destItemId = -1;
break;

default:
break;
}
break;

Expand All @@ -417,6 +420,9 @@ void Goblin_v1::movePathFind(Mult::Mult_Object *obj,
case 0:
gobDesc->nextState = 19;
break;

default:
break;
}
break;
}
Expand Down Expand Up @@ -484,6 +490,9 @@ void Goblin_v1::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
case 24:
gobDesc->curLookDir = 6;
break;

default:
break;
}
}

Expand Down Expand Up @@ -589,6 +598,9 @@ void Goblin_v1::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
case 38:
_gobPositions[_currentGoblin].y++;
break;

default:
break;
}

if (_currentGoblin == 1) {
Expand Down Expand Up @@ -673,6 +685,9 @@ void Goblin_v1::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
case 38:
_gobPositions[_currentGoblin].y++;
break;

default:
break;
}

if (_currentGoblin == 1) {
Expand Down
9 changes: 9 additions & 0 deletions engines/gob/goblin_v2.cpp
View file
Expand Up @@ -354,6 +354,9 @@ void Goblin_v2::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
if (animData->frame >= framesCount)
animData->isPaused = 1;
break;

default:
break;
}

switch (animData->state) {
Expand Down Expand Up @@ -404,6 +407,9 @@ void Goblin_v2::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
if (animData->pathExistence == 4)
animData->pathExistence = 5;
break;

default:
break;
}

if ((animData->newState != -1) && (animData->frame == framesCount) &&
Expand Down Expand Up @@ -699,6 +705,9 @@ void Goblin_v2::advMovement(Mult::Mult_Object *obj, int8 state) {
obj->goblinX--;
obj->goblinY++;
break;

default:
break;
}
}

Expand Down
3 changes: 3 additions & 0 deletions engines/gob/goblin_v3.cpp
View file
Expand Up @@ -103,6 +103,9 @@ void Goblin_v3::advMovement(Mult::Mult_Object *obj, int8 state) {
obj->goblinX++;
obj->goblinY += 2;
break;

default:
break;
}
}

Expand Down
17 changes: 17 additions & 0 deletions engines/gob/goblin_v4.cpp
View file
Expand Up @@ -264,6 +264,9 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
case 41:
animData->nextState = 31;
break;

default:
break;
}
break;
}
Expand Down Expand Up @@ -373,6 +376,8 @@ void Goblin_v4::movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16
case 7:
animData->nextState = 31;
break;
default:
break;
}
break;
}
Expand Down Expand Up @@ -416,6 +421,9 @@ void Goblin_v4::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
if (animData->frame >= framesCount)
animData->isPaused = 1;
break;

default:
break;
}

switch (animData->state) {
Expand Down Expand Up @@ -470,6 +478,9 @@ void Goblin_v4::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
if (animData->pathExistence == 4)
animData->pathExistence = 5;
break;

default:
break;
}

if ((animData->newState != -1) && (animData->frame == framesCount) &&
Expand Down Expand Up @@ -595,6 +606,9 @@ int16 Goblin_v4::turnState(int16 state, uint16 dir) {
case 29:
dx = 2;
break;

default:
break;
}

switch (dir) {
Expand Down Expand Up @@ -629,6 +643,9 @@ int16 Goblin_v4::turnState(int16 state, uint16 dir) {
case kDirSE:
cx = 5;
break;

default:
break;
}

return newStates[dx][cx];
Expand Down
6 changes: 6 additions & 0 deletions engines/gob/hotspots.cpp
View file
Expand Up @@ -1228,6 +1228,9 @@ uint16 Hotspots::handleInputs(int16 time, uint16 inputCount, uint16 &curInput,
if (curInput > 0)
curInput--;
break;

default:
break;
}
}
}
Expand Down Expand Up @@ -1451,6 +1454,9 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs,

flags = ((uint16) kTypeClick) + (windowNum << 8) + (flags << 4);
break;

default:
break;
}

// Add the new hotspot
Expand Down
3 changes: 3 additions & 0 deletions engines/gob/inter_fascin.cpp
View file
Expand Up @@ -189,6 +189,9 @@ void Inter_Fascination::oFascin_assign(OpFuncParams &params) {
else
WRITE_VARO_STR(dest, _vm->_game->_script->getResultStr());
break;

default:
break;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions engines/gob/inter_playtoons.cpp
View file
Expand Up @@ -155,6 +155,9 @@ void Inter_Playtoons::oPlaytoons_printText(OpFuncParams &params) {
sprintf(buf + i, "%s",
GET_VARO_STR(_vm->_game->_script->readVarIndex()));
break;

default:
break;
}
_vm->_game->_script->skip(1);
} else
Expand Down
11 changes: 11 additions & 0 deletions engines/gob/inter_v1.cpp
View file
Expand Up @@ -901,6 +901,8 @@ void Inter_v1::o1_assign(OpFuncParams &params) {
WRITE_VARO_STR(dest, _vm->_game->_script->getResultStr());
break;

default:
break;
}
}

Expand Down Expand Up @@ -969,6 +971,9 @@ void Inter_v1::o1_printText(OpFuncParams &params) {
sprintf(buf + i, "%s",
GET_VARO_STR(_vm->_game->_script->readVarIndex()));
break;

default:
break;
}
_vm->_game->_script->skip(1);
} else
Expand Down Expand Up @@ -1059,6 +1064,9 @@ void Inter_v1::o1_palLoad(OpFuncParams &params) {
return;
}
break;

default:
break;
}

if ((cmd & 0x7F) == 0x30) {
Expand Down Expand Up @@ -1164,6 +1172,9 @@ void Inter_v1::o1_palLoad(OpFuncParams &params) {
return;
}
break;

default:
break;
}

if (!_vm->_draw->_applyPal) {
Expand Down

0 comments on commit 799a088

Please sign in to comment.