[Scummvm-git-logs] scummvm master -> 129988d0e946c622fd8319a19666c623850dac6d
digitall
547637+digitall at users.noreply.github.com
Sat Nov 16 12:33:46 CET 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
129988d0e9 ILLUSIONS: Fix Missing Default Switch Cases
Commit: 129988d0e946c622fd8319a19666c623850dac6d
https://github.com/scummvm/scummvm/commit/129988d0e946c622fd8319a19666c623850dac6d
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-16T11:30:12Z
Commit Message:
ILLUSIONS: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Changed paths:
engines/illusions/bbdou/bbdou_cursor.cpp
engines/illusions/bbdou/bbdou_specialcode.cpp
engines/illusions/bbdou/illusions_bbdou.cpp
engines/illusions/bbdou/scriptopcodes_bbdou.cpp
engines/illusions/camera.cpp
engines/illusions/duckman/duckman_specialcode.cpp
engines/illusions/duckman/illusions_duckman.cpp
engines/illusions/duckman/scriptopcodes_duckman.cpp
engines/illusions/illusions.cpp
engines/illusions/resources/backgroundresource.cpp
engines/illusions/threads/talkthread.cpp
engines/illusions/threads/talkthread_duckman.cpp
diff --git a/engines/illusions/bbdou/bbdou_cursor.cpp b/engines/illusions/bbdou/bbdou_cursor.cpp
index e9046c3..d0f6a09 100644
--- a/engines/illusions/bbdou/bbdou_cursor.cpp
+++ b/engines/illusions/bbdou/bbdou_cursor.cpp
@@ -312,6 +312,8 @@ uint BbdouCursor::calcTrackingCursorIndex(uint trackingFlags) {
cursorIndex = 8;
}
break;
+ default:
+ break;
}
return cursorIndex;
}
diff --git a/engines/illusions/bbdou/bbdou_specialcode.cpp b/engines/illusions/bbdou/bbdou_specialcode.cpp
index d7003af..9519d13 100644
--- a/engines/illusions/bbdou/bbdou_specialcode.cpp
+++ b/engines/illusions/bbdou/bbdou_specialcode.cpp
@@ -492,6 +492,8 @@ void BbdouSpecialCode::spcSaladCtl(OpCall &opCall) {
case 2:
addSalad(sequenceId);
break;
+ default:
+ break;
}
}
@@ -875,6 +877,8 @@ void BbdouSpecialCode::cursorCrosshairControlRoutine(Control *cursorControl, uin
case 7:
cursorData._sequenceId = 0x60014;
break;
+ default:
+ break;
}
_cursor->show(cursorControl);
cursorData._currOverlappedObjectId = overlappedControl->_objectId;
diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index 30726ea..f039952 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -405,6 +405,8 @@ Common::Point IllusionsEngine_BBDOU::getNamedPointPosition(uint32 namedPointId)
return Common::Point(640, 0);
case 0x70023:
return Common::Point(320, 240);
+ default:
+ break;
}
debug("getNamedPointPosition(%08X) UNKNOWN", namedPointId);
return Common::Point(0, 0);
@@ -457,6 +459,8 @@ void IllusionsEngine_BBDOU::cursorControlRoutine(Control *control, uint32 deltaT
case 3:
_menuSystem->update(control);
break;
+ default:
+ break;
}
}
}
diff --git a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
index d81cf0d..e1ac701 100644
--- a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
@@ -843,6 +843,8 @@ void ScriptOpcodes_BBDOU::opCompareBlockCounter(ScriptThread *scriptThread, OpCa
case 6:
compareResult = lvalue <= rvalue;
break;
+ default:
+ break;
}
_vm->_stack->push(compareResult ? 1 : 0);
}
diff --git a/engines/illusions/camera.cpp b/engines/illusions/camera.cpp
index 7fdb219..aa372be 100644
--- a/engines/illusions/camera.cpp
+++ b/engines/illusions/camera.cpp
@@ -213,6 +213,8 @@ void Camera::pushCameraMode() {
item._panTargetPoint = _activeState._panTargetPoint;
item._panNotifyId = _activeState._panNotifyId;
break;
+ default:
+ break;
}
_stack.push(item);
}
@@ -245,6 +247,8 @@ void Camera::popCameraMode() {
case 6:
stopPan();
break;
+ default:
+ break;
}
}
@@ -268,6 +272,8 @@ void Camera::update(uint32 currTime) {
case 3:
updateMode3(currTime);
break;
+ default:
+ break;
}
if (_activeState._cameraMode != 6) {
@@ -333,6 +339,8 @@ bool Camera::isAtPanLimit(int limitNum) {
return _activeState._currPan.x <= _activeState._bounds._topLeft.x;
case 4:
return _activeState._currPan.x >= _activeState._bounds._bottomRight.x;
+ default:
+ break;
}
return false;
}
@@ -540,6 +548,8 @@ void Camera::init() {
case kGameIdBBDOU:
initBBDOU();
break;
+ default:
+ break;
}
}
diff --git a/engines/illusions/duckman/duckman_specialcode.cpp b/engines/illusions/duckman/duckman_specialcode.cpp
index a7f301f..b00579b 100644
--- a/engines/illusions/duckman/duckman_specialcode.cpp
+++ b/engines/illusions/duckman/duckman_specialcode.cpp
@@ -338,6 +338,8 @@ void DuckmanSpecialCode::spcHoldGlowingElvisPoster(OpCall &opCall) {
_vm->_cursor._field14[_vm->_cursor._actorIndex - 1] = true;
}
break;
+ default:
+ break;
}
_vm->notifyThreadId(opCall._threadId);
}
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 326d8ab..6e6d31d 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -790,6 +790,8 @@ void IllusionsEngine_Duckman::cursorControlRoutine(Control *control, uint32 delt
case 4:
_menuSystem->update(_cursor._control);
break;
+ default:
+ break;
}
}
}
@@ -1188,9 +1190,13 @@ void IllusionsEngine_Duckman::playSoundEffect(int index) {
case 18:
soundEffectId = soundIds[26];
break;
+ default:
+ break;
}
- if (soundEffectId)
+
+ if (soundEffectId) {
_soundMan->playSound(soundEffectId, 255, 0);
+ }
}
bool IllusionsEngine_Duckman::getTriggerCause(uint32 verbId, uint32 objectId2, uint32 objectId, uint32 &outThreadId) {
diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index 24e69db..dc3415b 100644
--- a/engines/illusions/duckman/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -804,6 +804,8 @@ void ScriptOpcodes_Duckman::opCompareBlockCounter(ScriptThread *scriptThread, Op
case 6:
compareResult = lvalue <= rvalue;
break;
+ default:
+ break;
}
_vm->_stack->push(compareResult ? 1 : 0);
}
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index 20ae8ea..cb89fe0 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -318,6 +318,8 @@ uint32 IllusionsEngine::clipTextDuration(uint32 duration) {
if (duration > _fieldA)
duration = _fieldA;
break;
+ default:
+ break;
}
return duration;
}
diff --git a/engines/illusions/resources/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp
index 933ba25..7212ccc 100644
--- a/engines/illusions/resources/backgroundresource.cpp
+++ b/engines/illusions/resources/backgroundresource.cpp
@@ -503,6 +503,8 @@ void BackgroundInstance::drawTiles(Graphics::Surface *surface, TileMap &tileMap,
case kGameIdBBDOU:
drawTiles16(surface, tileMap, tilePixels);
break;
+ default:
+ break;
}
}
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 34abda8..e2ddde5 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -236,6 +236,8 @@ if (true) {
}
return kTSTerminate;
+ default:
+ break;
}
return kTSTerminate;
@@ -324,6 +326,8 @@ void TalkThread::onUnpause() {
}
}
break;
+ default:
+ break;
}
}
@@ -368,6 +372,8 @@ uint32 TalkThread::sendMessage(int msgNum, uint32 msgValue) {
case kMsgClearSequenceId2:
_sequenceId2 = 0;
break;
+ default:
+ break;
}
return 0;
}
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 0b67248..752f06f 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -197,6 +197,8 @@ int TalkThread_Duckman::onUpdate() {
}
return kTSTerminate;
+ default:
+ break;
}
return kTSTerminate;
@@ -272,6 +274,8 @@ uint32 TalkThread_Duckman::sendMessage(int msgNum, uint32 msgValue) {
case kMsgClearSequenceId2:
_sequenceId2 = 0;
break;
+ default:
+ break;
}
return 0;
}
More information about the Scummvm-git-logs
mailing list