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

[peterkohaut]

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:
fb26f21d04 BLADERUNNER: Fixed zbuffer in TB05


Commit: fb26f21d0478a29da16bd7daa10110aa97a2b604
    https://github.com/scummvm/scummvm/commit/fb26f21d0478a29da16bd7daa10110aa97a2b604
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2019-04-30T19:14:16+02:00

Commit Message:
BLADERUNNER: Fixed zbuffer in TB05

This was causing issues with walking in TB05

Changed paths:
    engines/bladerunner/vqa_decoder.h
    engines/bladerunner/vqa_player.cpp


diff --git a/engines/bladerunner/vqa_decoder.h b/engines/bladerunner/vqa_decoder.h
index 68e691c..ca08db5 100644
--- a/engines/bladerunner/vqa_decoder.h
+++ b/engines/bladerunner/vqa_decoder.h
@@ -81,9 +81,6 @@ public:
 
 	bool getLoopBeginAndEndFrame(int loop, int *begin, int *end);
 
-protected:
-
-private:
 	struct Header {
 		uint16 version;     // 0x00
 		uint16 flags;       // 0x02
@@ -141,7 +138,6 @@ private:
 	class VQAAudioTrack;
 
 	Common::SeekableReadStream *_s;
-	// Graphics::Surface *_surface;
 
 	Header   _header;
 	int      _readingFrame;
diff --git a/engines/bladerunner/vqa_player.cpp b/engines/bladerunner/vqa_player.cpp
index 65fab5f..05ce15d 100644
--- a/engines/bladerunner/vqa_player.cpp
+++ b/engines/bladerunner/vqa_player.cpp
@@ -43,6 +43,13 @@ bool VQAPlayer::open() {
 		return false;
 	}
 
+#if !BLADERUNNER_ORIGINAL_BUGS
+	// TB05 has wrong end of a loop and this will load empty zbuffer from next loop, which will lead to broken pathfinding
+	if (_name.equals("TB05_2.VQA")) {
+		_decoder._loopInfo.loops[1].end = 60;
+	}
+#endif
+
 	_hasAudio = _decoder.hasAudio();
 	if (_hasAudio) {
 		_audioStream = Audio::makeQueuingAudioStream(_decoder.frequency(), false);