[Scummvm-git-logs] scummvm master -> 0fefa96897f0889c0874290567ab4a9a2d42351f

dreammaster dreammaster at scummvm.org
Sun Jul 1 00:35:34 CEST 2018


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:
771be9e3a9 TITANIC: Address readSavegameHeader compiler warning
0fefa96897 Merge pull request #1237 from dafioram/titanicCompileWarn


Commit: 771be9e3a9a28bbeaf69931b51d56e2f9b834976
    https://github.com/scummvm/scummvm/commit/771be9e3a9a28bbeaf69931b51d56e2f9b834976
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-06-30T14:30:35-07:00

Commit Message:
TITANIC: Address readSavegameHeader compiler warning

A function had a bool return that was not being used
now it is checked and an error is issued if the call fails.

Changed paths:
    engines/titanic/core/project_item.cpp


diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 99eec80..5ba70e9 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -189,7 +189,8 @@ void CProjectItem::loadGame(int slotId) {
 
 	// Load the savegame header in
 	TitanicSavegameHeader header;
-	readSavegameHeader(&file, header);
+	if (!readSavegameHeader(&file, header))
+		error("Failed to read save game header");
 
 	g_vm->_events->setTotalPlayTicks(header._totalFrames);
 


Commit: 0fefa96897f0889c0874290567ab4a9a2d42351f
    https://github.com/scummvm/scummvm/commit/0fefa96897f0889c0874290567ab4a9a2d42351f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-06-30T15:35:30-07:00

Commit Message:
Merge pull request #1237 from dafioram/titanicCompileWarn

TITANIC: Address readSavegameHeader compiler warning

Changed paths:
    engines/titanic/core/project_item.cpp







More information about the Scummvm-git-logs mailing list