libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: 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-12-01 01:21:09 +00:00
parent ef30ebc0bb
commit 538bb7ab3e
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sherlock/objects.cpp
View File

@ -130,6 +130,7 @@ bool BaseObject::hasAborts() const {
case TELEPORT_CODE: idx += 4; break;
case CALL_TALK_CODE:idx += 8; break;
case HIDE_CODE: idx += 2; break;
default: break;
}
}
} while (idx < _seqSize);
@ -1281,6 +1282,7 @@ void Object::setObjTalkSequence(int seq) {
case TELEPORT_CODE: idx += 4; break;
case CALL_TALK_CODE: idx += 8; break;
case HIDE_CODE: idx += 2; break;
default: break;
}
}

4
engines/sherlock/scalpel/scalpel_people.cpp
View File

@ -275,6 +275,8 @@ void ScalpelPerson::setWalking() {
case WALK_RIGHT:
_sequenceNumber = WALK_DOWNRIGHT;
break;
default:
break;
}
}
} else if (_delta.y < -150) {
@ -286,6 +288,8 @@ void ScalpelPerson::setWalking() {
case WALK_RIGHT:
_sequenceNumber = WALK_UPRIGHT;
break;
default:
break;
}
}
}

2
engines/sherlock/scalpel/scalpel_user_interface.cpp
View File

@ -1738,6 +1738,8 @@ void ScalpelUserInterface::doTalkControl() {
case 3:
people._portraitSide = 120;
break;
default:
break;
}
// Check for flipping Holmes

9
engines/sherlock/tattoo/tattoo_people.cpp
View File

@ -314,6 +314,7 @@ void TattooPerson::gotoStand() {
case WALK_DOWNLEFT: _sequenceNumber = STOP_DOWNLEFT;break;
case WALK_LEFT: _sequenceNumber = STOP_LEFT; break;
case WALK_UPLEFT: _sequenceNumber = STOP_UPLEFT; break;
default: break;
}
}
@ -439,6 +440,8 @@ void TattooPerson::setWalking() {
case WALK_RIGHT:
_sequenceNumber = WALK_DOWNRIGHT;
break;
default:
break;
}
} else if (_delta.y < -1500) {
if (_sequenceNumber == WALK_LEFT || _sequenceNumber == WALK_RIGHT) {
@ -455,6 +458,8 @@ void TattooPerson::setWalking() {
case WALK_RIGHT:
_sequenceNumber = WALK_UPRIGHT;
break;
default:
break;
}
}
} else {
@ -773,6 +778,8 @@ void TattooPerson::updateNPC() {
case NPCPATH_IFFLAG_GOTO_LABEL:
_npcIndex += 4;
break;
default:
break;
}
}
break;
@ -819,6 +826,8 @@ void TattooPerson::updateNPC() {
case NPCPATH_IFFLAG_GOTO_LABEL:
_npcIndex += 4;
break;
default:
break;
}
}
}

3
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -857,6 +857,9 @@ void TattooUserInterface::drawMaskArea(bool mode) {
maskArea(*_mask, Common::Point(xp, 203));
maskArea(*_mask1, Common::Point(124 + xp, 239));
break;
default:
break;
}
}
}