[Scummvm-cvs-logs] scummvm master -> 227d80e0fdfb12f2416a5e738e19b572c51fe3d9

Strangerke Strangerke at scummvm.org
Tue Feb 25 23:06:50 CET 2014


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:
227d80e0fd VOYEUR: Add some details about unused variables, initialize some variables


Commit: 227d80e0fdfb12f2416a5e738e19b572c51fe3d9
    https://github.com/scummvm/scummvm/commit/227d80e0fdfb12f2416a5e738e19b572c51fe3d9
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-25T14:04:42-08:00

Commit Message:
VOYEUR: Add some details about unused variables, initialize some variables

Changed paths:
    engines/voyeur/animation.cpp
    engines/voyeur/animation.h



diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 82cddc2..6c0a96f 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -153,6 +153,19 @@ RL2Decoder::SoundFrame::SoundFrame(int offset, int size) {
 RL2Decoder::RL2FileHeader::RL2FileHeader() {
 	_frameOffsets = nullptr;
 	_frameSoundSizes = nullptr;
+
+	_channels = 0;
+	_colorCount = 0;
+	_numFrames = 0;
+	_rate = 0;
+	_soundRate = 0;
+	_videoBase = 0;
+	_backSize = 0;
+	_signature = MKTAG('N', 'O', 'N', 'E');
+	_form = 0;
+	_dataSize = 0;
+	_method = 0;
+	_defSoundSize = 0;
 }
 
 RL2Decoder::RL2FileHeader::~RL2FileHeader() {
diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h
index 01d4282..dcdbf36 100644
--- a/engines/voyeur/animation.h
+++ b/engines/voyeur/animation.h
@@ -69,9 +69,9 @@ private:
 		bool isValid() const;
 
 	private:
-		uint32 _form;
-		uint32 _dataSize;
-		int _method;
+		uint32 _form;      // Unused variable
+		uint32 _dataSize;  // Unused variable
+		int _method;       // Unused variable
 		int _defSoundSize;
 	};
 






More information about the Scummvm-git-logs mailing list