[Scummvm-git-logs] scummvm master -> c006f405f3b9e7109ab5f0dd08671d26c582f886

digitall dgturner at iee.org
Tue Nov 13 09:50:46 CET 2018


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:
c006f405f3 PEGASUS: Fix Fall Through Compiler Warnings.


Commit: c006f405f3b9e7109ab5f0dd08671d26c582f886
    https://github.com/scummvm/scummvm/commit/c006f405f3b9e7109ab5f0dd08671d26c582f886
Author: D G Turner (digitall at scummvm.org)
Date: 2018-11-13T08:50:08Z

Commit Message:
PEGASUS: Fix Fall Through Compiler Warnings.

Changed paths:
    engines/pegasus/neighborhood/norad/delta/globegame.cpp
    engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
    engines/pegasus/neighborhood/wsc/wsc.cpp


diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index 15f8c26..2c339bd 100644
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -726,6 +726,8 @@ void GlobeGame::receiveNotification(Notification *notification, const Notificati
 						kFilterNoInput, kSpotSoundCompletedFlag);
 				break;
 			}
+			// fall through
+			// FIXME: fall through intentional?
 		case kPlayingTime:
 			_gameState = kPlayingInstructions;
 			_globeMovie.show();
diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
index 3eb51c7..c01241d 100644
--- a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
@@ -193,6 +193,8 @@ void NoradDelta::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSp
 	case kN59PlayerWins2:
 		compassMove.makeTwoKnotFaderSpec(kNoradDeltaMovieScale, entry.movieStart, 270, entry.movieEnd, 280);
 		compassMove.insertFaderKnot(entry.movieEnd - 1000, 270);
+		// fall through
+		// FIXME: fall through intentional?
 	default:
 		Norad::getExtraCompassMove(entry, compassMove);
 		break;
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index cef0f37..02336c0 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -1567,6 +1567,8 @@ void WSC::arriveAt(const RoomID room, const DirectionConstant dir) {
 			playSpotSoundSync(kPaging2In, kPaging2Out);
 			GameState.setWSCHeardPage2(true);
 		}
+		// fall through
+		// FIXME: fall through intentional?
 	case MakeRoomView(kWSC10, kNorth):
 	case MakeRoomView(kWSC26, kSouth):
 	case MakeRoomView(kWSC72, kWest):
@@ -1645,6 +1647,8 @@ void WSC::turnTo(const DirectionConstant direction) {
 			playSpotSoundSync(kPaging1In, kPaging1Out);
 			GameState.setWSCHeardPage1(true);
 		}
+		// fall through
+		// FIXME: fall through intentional?
 		// clone2727 says: This falls through?!??! WTF?
 	case MakeRoomView(kWSC42, kEast):
 		_privateFlags.setFlag(kWSCPrivateSinclairOfficeOpenFlag, false);





More information about the Scummvm-git-logs mailing list