[Scummvm-git-logs] scummvm master -> b86c2923cfd301bb774c068497f2b5632c591325
digitall
547637+digitall at users.noreply.github.com
Mon Nov 11 02:22:21 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:
b86c2923cf MORTEVIELLE: Fix Missing Default Switch Cases
Commit: b86c2923cfd301bb774c068497f2b5632c591325
https://github.com/scummvm/scummvm/commit/b86c2923cfd301bb774c068497f2b5632c591325
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-11T01:17:49Z
Commit Message:
MORTEVIELLE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Changed paths:
engines/mortevielle/actions.cpp
engines/mortevielle/graphics.cpp
engines/mortevielle/utils.cpp
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index b7b9c1e..bd85634 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -125,6 +125,8 @@ void MortevielleEngine::fctMove() {
if (menuChoice == 4)
menuChoice = 6;
break;
+ default:
+ break;
}
if ((_coreVar._currPlace > MOUNTAIN) && (_coreVar._currPlace != ROOM26))
@@ -188,6 +190,8 @@ void MortevielleEngine::fctMove() {
prepareDisplayText();
}
break;
+ default:
+ break;
}
if ((menuChoice < 5) || (menuChoice == 13) || (menuChoice == 14))
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index aa479fd..3809a54 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -735,6 +735,9 @@ void GfxSurface::decom11(const byte *&pSrc, byte *&pDest, const byte *&pLookup)
areaNum = 1;
}
break;
+
+ default:
+ break;
}
}
}
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index dd19c26..0efa58f 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -2290,6 +2290,8 @@ void MortevielleEngine::prepareRoom() {
case CHAPEL:
setRandomPresenceChapel(_coreVar._faithScore);
break;
+ default:
+ break;
}
if ((_savedBitIndex != 0) && (_currBitIndex != 10))
_savedBitIndex = _currBitIndex;
@@ -2830,6 +2832,8 @@ int MortevielleEngine::getPresence(int roomId) {
case CHAPEL:
pres = getPresenceStatsChapel(h);
break;
+ default:
+ break;
}
pres += _coreVar._faithScore;
rand = getRandomNumber(1, 100);
@@ -2856,6 +2860,8 @@ int MortevielleEngine::getPresence(int roomId) {
case CHAPEL:
pres = setPresenceChapel(h);
break;
+ default:
+ break;
}
retVal = pres;
}
@@ -2940,6 +2946,8 @@ void MortevielleEngine::drawPicture() {
if (_coreVar._wellObjectId != 0)
displayAnimFrame(1, 1);
break;
+ default:
+ break;
}
}
More information about the Scummvm-git-logs
mailing list