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

[dreammaster]

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:
b6e3c18898 TITANIC: Fix cahce scan in CDialogueFile::addToCache
a4d577beff TITANIC: Add kSimpleSavesNames to features list


Commit: b6e3c18898ac34caa3acf2bbe57c9c631a4c5407
    https://github.com/scummvm/scummvm/commit/b6e3c18898ac34caa3acf2bbe57c9c631a4c5407
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-02T18:56:03-04:00

Commit Message:
TITANIC: Fix cahce scan in CDialogueFile::addToCache

Changed paths:
    engines/titanic/true_talk/dialogue_file.cpp



diff --git a/engines/titanic/true_talk/dialogue_file.cpp b/engines/titanic/true_talk/dialogue_file.cpp
index 34eb164..cbd3685 100644
--- a/engines/titanic/true_talk/dialogue_file.cpp
+++ b/engines/titanic/true_talk/dialogue_file.cpp
@@ -60,7 +60,7 @@ DialogueResource *CDialogueFile::addToCache(int index) {
 
 	// Scan cache for a free slot
 	uint cacheIndex = 0;
-	while (cacheIndex < _cache.size() && !_cache[cacheIndex]._active)
+	while (cacheIndex < _cache.size() && _cache[cacheIndex]._active)
 		++cacheIndex;
 	if (cacheIndex == _cache.size())
 		return nullptr;


Commit: a4d577beffbd33e0472efe5b3d3a99cb97b8ecb5
    https://github.com/scummvm/scummvm/commit/a4d577beffbd33e0472efe5b3d3a99cb97b8ecb5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-02T18:56:30-04:00

Commit Message:
TITANIC: Add kSimpleSavesNames to features list

Changed paths:
    engines/titanic/detection.cpp



diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index 86d26f2..096cd4b 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -90,7 +90,8 @@ bool TitanicMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave) ||
 		(f == kSavesSupportMetaInfo) ||
-		(f == kSavesSupportThumbnail);
+		(f == kSavesSupportThumbnail) ||
+		(f == kSimpleSavesNames);
 }
 
 bool Titanic::TitanicEngine::hasFeature(EngineFeature f) const {