diff options
| author | Martin Kiewitz | 2015-06-05 00:18:39 +0200 | 
|---|---|---|
| committer | Martin Kiewitz | 2015-06-05 00:18:39 +0200 | 
| commit | 30d3cc541ad7436f1c0f2ed11d09a2e8bece162a (patch) | |
| tree | 36af8cd03cf96a2867648bc53a004676604cc111 | |
| parent | 74d3121f9d5a51b6d81a06671d0c7124e3a2420e (diff) | |
| download | scummvm-rg350-30d3cc541ad7436f1c0f2ed11d09a2e8bece162a.tar.gz scummvm-rg350-30d3cc541ad7436f1c0f2ed11d09a2e8bece162a.tar.bz2 scummvm-rg350-30d3cc541ad7436f1c0f2ed11d09a2e8bece162a.zip  | |
SHERLOCK: 3DO changes
- journal.txt is actually missing
- chess.txt is the same as on PC
- information about 3DA/3DX files
| -rw-r--r-- | engines/sherlock/journal.cpp | 32 | ||||
| -rw-r--r-- | engines/sherlock/resources.cpp | 3 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 5 | 
3 files changed, 18 insertions, 22 deletions
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index 08357b5fbf..cc0b57cbe2 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 0a8470639c..cd2cd9d663 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 04d573be87..ed531a06c5 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;  	}  | 
