[Scummvm-git-logs] scummvm master -> 7ec2a3aad21307f347258ae3499221b2cdaff2f5

madmoose thomas at fach-pedersen.net
Sun Aug 27 22:47:19 CEST 2017


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:
7ec2a3aad2 BLADERUNNER: Fix build


Commit: 7ec2a3aad21307f347258ae3499221b2cdaff2f5
    https://github.com/scummvm/scummvm/commit/7ec2a3aad21307f347258ae3499221b2cdaff2f5
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2017-08-27T22:46:55+02:00

Commit Message:
BLADERUNNER: Fix build

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


diff --git a/engines/bladerunner/overlays.h b/engines/bladerunner/overlays.h
index edeb0d1..9be515e 100644
--- a/engines/bladerunner/overlays.h
+++ b/engines/bladerunner/overlays.h
@@ -28,7 +28,7 @@
 
 namespace Graphics {
 	struct Surface;
-};
+}
 
 namespace BladeRunner {
 
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index 275ec18..53751af 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -839,7 +839,7 @@ void VQADecoder::VQAVideoTrack::VPTRWriteBlock(uint16 *frame, unsigned int dstBl
 }
 
 bool VQADecoder::VQAVideoTrack::decodeFrame(uint16 *frame) {
-	VQADecoder::CodebookInfo &codebookInfo = _vqaDecoder->codebookInfoForFrame(_vqaDecoder->_decodingFrame);
+	CodebookInfo &codebookInfo = _vqaDecoder->codebookInfoForFrame(_vqaDecoder->_decodingFrame);
 
 	if (!codebookInfo.data) {
 		_vqaDecoder->readFrame(codebookInfo.frame, kVQAReadCodebook);
diff --git a/engines/bladerunner/vqa_decoder.h b/engines/bladerunner/vqa_decoder.h
index c76a8b3..b8fb60a 100644
--- a/engines/bladerunner/vqa_decoder.h
+++ b/engines/bladerunner/vqa_decoder.h
@@ -168,7 +168,7 @@ private:
 	bool readLNIN(Common::SeekableReadStream *s, uint32 size);
 	bool readCLIP(Common::SeekableReadStream *s, uint32 size);
 
-	VQADecoder::CodebookInfo &VQADecoder::codebookInfoForFrame(int frame);
+	CodebookInfo &VQADecoder::codebookInfoForFrame(int frame);
 
 	class VQAVideoTrack {
 	public:





More information about the Scummvm-git-logs mailing list