[Scummvm-git-logs] scummvm master -> 7bf7a415f77feae79efe88cdc08120d0b204a52f

digitall 547637+digitall at users.noreply.github.com
Fri Oct 18 16:28:24 CEST 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:
7bf7a415f7 DRACI: Fix Missing Default Switch Cases


Commit: 7bf7a415f77feae79efe88cdc08120d0b204a52f
    https://github.com/scummvm/scummvm/commit/7bf7a415f77feae79efe88cdc08120d0b204a52f
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-18T15:24:54+01:00

Commit Message:
DRACI: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/draci/font.cpp
    engines/draci/game.cpp


diff --git a/engines/draci/font.cpp b/engines/draci/font.cpp
index c688f42..669c7d8 100644
--- a/engines/draci/font.cpp
+++ b/engines/draci/font.cpp
@@ -173,6 +173,9 @@ void Font::drawChar(Surface *dst, uint8 chr, int tx, int ty, int with_color) con
 			case 251:
 				color = kFontColor4;
 				break;
+
+			default:
+				break;
 			}
 
 			// Paint the pixel
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index f82ef39..523a1d0 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -643,8 +643,8 @@ void Game::loop(LoopSubstatus substatus, bool shouldExit) {
 			case kStatusDialogue:
 				handleDialogueLoop();
 				break;
-			case kStatusGate:
-				// cannot happen when isCursonOn; added for completeness
+			case kStatusGate: // cannot happen when isCursonOn; added for completeness
+			default:
 				break;
 			}
 		}
@@ -1000,6 +1000,8 @@ void Game::inventorySwitch(int keycode) {
 			removeItem(new_item);
 		}
 		break;
+	default:
+		break;
 	}
 	if (getLoopStatus() == kStatusOrdinary) {
 		updateOrdinaryCursor();





More information about the Scummvm-git-logs mailing list