[Scummvm-cvs-logs] scummvm master -> 30d3cc541ad7436f1c0f2ed11d09a2e8bece162a

[m-kiewitz]

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:
30d3cc541a SHERLOCK: 3DO changes


Commit: 30d3cc541ad7436f1c0f2ed11d09a2e8bece162a
    https://github.com/scummvm/scummvm/commit/30d3cc541ad7436f1c0f2ed11d09a2e8bece162a
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-05T00:18:39+02:00

Commit Message:
SHERLOCK: 3DO changes

- journal.txt is actually missing
- chess.txt is the same as on PC
- information about 3DA/3DX files

Changed paths:
    engines/sherlock/journal.cpp
    engines/sherlock/resources.cpp
    engines/sherlock/scalpel/scalpel.cpp



diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 08357b5..cc0b57c 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -114,28 +114,24 @@ void Journal::loadJournalLocations() {
 
 	delete dir;
 
-	// Load in the locations stored in journal.txt
-	Common::SeekableReadStream *loc = 0;
-
+	_locations.clear();
 	if (_vm->getPlatform() != Common::kPlatform3DO) {
-		// PC: journal.txt
-		loc = res.load("journal.txt");
-	} else {
-		// 3DO: seems to use chess.txt
-		loc = res.load("chess.txt");
-	}
+		// 3DO: storage of locations is currently unknown TODO
 
-	_locations.clear();
-	while (loc->pos() < loc->size()) {
-		Common::String line;
-		char c;
-		while ((c = loc->readByte()) != 0)
-			line += c;
+		// Load in the locations stored in journal.txt
+		Common::SeekableReadStream *loc = res.load("journal.txt");
 
-		_locations.push_back(line);
-	}
+		while (loc->pos() < loc->size()) {
+			Common::String line;
+			char c;
+			while ((c = loc->readByte()) != 0)
+				line += c;
+
+			_locations.push_back(line);
+		}
 
-	delete loc;
+		delete loc;
+	}
 }
 
 void Journal::loadJournalFile(bool alreadyLoaded) {
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 0a84706..cd2cd9d 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -109,9 +109,6 @@ Resources::Resources(SherlockEngine *vm) : _vm(vm), _cache(vm) {
 			// talk.lib - resources themselves seem to be the same, although a few texts were slightly changed
 			addToCache("talk.lib");
 
-			// chess.txt - instead of journal.txt
-			addToCache("chess.txt");
-
 			// remaining files are missing
 			// portraits were replaced with FMV
 		}
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 04d573b..ed531a0 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -225,8 +225,11 @@ void ScalpelEngine::showOpening() {
 		return;
 
 	if (getPlatform() == Common::kPlatform3DO) {
-		// 3DO opening seems to be using completely different resources
+		// 3DO opening seems to be similar
 		// TODO
+		// 3DO animations are in directory Prologue/
+		// .3DX seem to be just like .VDX except that all INT16LE are INT16BE
+		// .3DA however seems to be completely different
 		return;
 	}