[Scummvm-git-logs] scummvm master -> 13b501825ee8a77923ea705a4af60371ca5e91d5

digitall 547637+digitall at users.noreply.github.com
Thu Mar 18 23:37:33 UTC 2021


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
27b8a47297 TINSEL: Fix Signed vs. Unsigned Comparison GCC Compiler Warnings
13b501825e PEGASUS: Fix Switch Fallthrough GCC Compiler Warnings


Commit: 27b8a47297210adaf78ecfc77e6eb83c99515323
    https://github.com/scummvm/scummvm/commit/27b8a47297210adaf78ecfc77e6eb83c99515323
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-18T23:36:40Z

Commit Message:
TINSEL: Fix Signed vs. Unsigned Comparison GCC Compiler Warnings

Changed paths:
    engines/tinsel/bmv.cpp
    engines/tinsel/noir/lzss.cpp


diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 2238abdbf1..e94162c717 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -1105,7 +1105,7 @@ bool BMVPlayer::MaintainBuffer() {
 		return false;
 	}
 
-	if (stream.read(bigBuffer + nextReadSlot * slotSize, slotSize) != slotSize) {
+	if ((int)stream.read(bigBuffer + nextReadSlot * slotSize, slotSize) != slotSize) {
 		bFileEnd = true;
 	}
 
diff --git a/engines/tinsel/noir/lzss.cpp b/engines/tinsel/noir/lzss.cpp
index ca4488c9a0..dbd18ff71c 100644
--- a/engines/tinsel/noir/lzss.cpp
+++ b/engines/tinsel/noir/lzss.cpp
@@ -116,7 +116,7 @@ int decompressLZSS(Common::SeekableReadStream &input, byte *output) {
 	}
 	delete[] data;
 
-	if (offset > input.size()) {
+	if ((int32)offset > input.size()) {
 		error("Read too far during decompression");
 	}
 


Commit: 13b501825ee8a77923ea705a4af60371ca5e91d5
    https://github.com/scummvm/scummvm/commit/13b501825ee8a77923ea705a4af60371ca5e91d5
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-18T23:37:05Z

Commit Message:
PEGASUS: Fix Switch Fallthrough GCC Compiler Warnings

Changed paths:
    engines/pegasus/neighborhood/mars/mars.cpp
    engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
    engines/pegasus/neighborhood/tsa/fulltsa.cpp
    engines/pegasus/neighborhood/wsc/wsc.cpp


diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 8f5104ff4c..806fa3da69 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -1851,6 +1851,7 @@ void Mars::arriveAt(const RoomID room, const DirectionConstant direction) {
 	case MakeRoomView(kMars52, kEast):
 		if (g_arthurChip)
 			g_arthurChip->playArthurMovieForEvent("Images/AI/Globals/XGLOBA11", kArthurMarsEnteredReactor);
+		// falls through
 	case MakeRoomView(kMars52, kNorth):
 	case MakeRoomView(kMars52, kSouth):
 	case MakeRoomView(kMars52, kWest):
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
index d147d99698..125858bfda 100644
--- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
+++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
@@ -425,6 +425,7 @@ void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction)
 		break;
 	case MakeRoomView(kPrehistoric13, kNorth):
 		doArthurLetsSpreadOutMovie = true;
+		// falls through
 	case MakeRoomView(kPrehistoric08, kSouth):
 	case MakeRoomView(kPrehistoric10, kSouth):
 	case MakeRoomView(kPrehistoric12, kSouth):
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 07949dac00..483c60b26d 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -2995,6 +2995,7 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
 		case kTSA0BRobotsFromCommandCenterToFrontDoor:
 		case kTSA0BRobotsFromReadyRoomToFrontDoor:
 			doArthurRedirectedRobotsMovie = true;
+			// falls through
 		case kTSA0BRobotsFromCommandCenterToReadyRoom:
 		case kTSA0BRobotsFromReadyRoomToCommandCenter:
 		case kTSA0BRobotsFromFrontDoorToCommandCenter:
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index d2fc62adb1..2ce111ee38 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -1813,6 +1813,7 @@ void WSC::arriveAt(const RoomID room, const DirectionConstant dir) {
 		break;
 	case MakeRoomView(kWSC93, kEast):
 		GameState.setWSCBeenAtWSC93(true);
+		// falls through
 	case MakeRoomView(kWSC93, kNorth):
 		if (g_arthurChip)
 			g_arthurChip->playArthurMovieForEvent("Images/AI/Globals/XGLOBA38", kArthurWSCExitedPassage);




More information about the Scummvm-git-logs mailing list