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

dreammaster dreammaster at scummvm.org
Wed Nov 9 02:25:22 CET 2016


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:
f1615d83d7 TITANIC: Fix compiler warnings


Commit: f1615d83d76ededc3966635c9dc15e6ab79cc6d4
    https://github.com/scummvm/scummvm/commit/f1615d83d76ededc3966635c9dc15e6ab79cc6d4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-08T20:25:14-05:00

Commit Message:
TITANIC: Fix compiler warnings

Changed paths:
    engines/titanic/events.cpp
    engines/titanic/room_flags.cpp



diff --git a/engines/titanic/events.cpp b/engines/titanic/events.cpp
index 89ad338..97f9a86 100644
--- a/engines/titanic/events.cpp
+++ b/engines/titanic/events.cpp
@@ -138,7 +138,6 @@ void Events::sleep(uint time) {
 }
 
 bool Events::waitForPress(uint expiry) {
-	CGameManager *gameManager = g_vm->_window->_gameManager;
 	uint32 delayEnd = g_system->getMillis() + expiry;
 	CPressTarget pressTarget;
 	addTarget(&pressTarget);
diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
index 75baf2c..07303d8 100644
--- a/engines/titanic/room_flags.cpp
+++ b/engines/titanic/room_flags.cpp
@@ -425,6 +425,9 @@ void CRoomFlags::changeClass(PassengerClass newClassNum) {
 	case UNCHECKED:
 		if (++floorNum > v11)
 			floorNum = v11;
+
+	default:
+		break;
 	}
 
 	// Set new floor and room





More information about the Scummvm-git-logs mailing list