[Scummvm-cvs-logs] scummvm master -> ae2ba18af360b5578eaa38ac7aacce3264f8d7bf

Strangerke Strangerke at scummvm.org
Wed Jan 28 07:49:51 CET 2015


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:
ae2ba18af3 MADE: Initialize some variables


Commit: ae2ba18af360b5578eaa38ac7aacce3264f8d7bf
    https://github.com/scummvm/scummvm/commit/ae2ba18af360b5578eaa38ac7aacce3264f8d7bf
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-28T07:47:28+01:00

Commit Message:
MADE: Initialize some variables

Changed paths:
    engines/made/database.cpp
    engines/made/pmvplayer.cpp
    engines/made/redreader.cpp



diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index a9855ba..3eab31a 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -252,6 +252,10 @@ byte *ObjectV3::getData() {
 
 
 GameDatabase::GameDatabase(MadeEngine *vm) : _vm(vm) {
+	_gameState = nullptr;
+	_gameStateSize = 0;
+	_mainCodeObjectIndex = 0;
+	_isRedSource = false;
 }
 
 GameDatabase::~GameDatabase() {
@@ -595,6 +599,8 @@ const char *GameDatabaseV2::getString(uint16 offset) {
 /* GameDatabaseV3 */
 
 GameDatabaseV3::GameDatabaseV3(MadeEngine *vm) : GameDatabase(vm) {
+	_gameText = nullptr;
+	_gameStateOffs = 0;
 }
 
 void GameDatabaseV3::load(Common::SeekableReadStream &sourceS) {
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index 3cac017..6ea0dc2 100644
--- a/engines/made/pmvplayer.cpp
+++ b/engines/made/pmvplayer.cpp
@@ -37,16 +37,18 @@
 
 namespace Made {
 
-PmvPlayer::PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(NULL), _vm(vm), _mixer(mixer) {
+PmvPlayer::PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(nullptr), _vm(vm), _mixer(mixer) {
+	_audioStream = nullptr;
+	_surface = nullptr;
+	_aborted = false;
 }
 
 PmvPlayer::~PmvPlayer() {
 }
 
 bool PmvPlayer::play(const char *filename) {
-
 	_aborted = false;
-	_surface = NULL;
+	_surface = nullptr;
 
 	_fd = new Common::File();
 	if (!_fd->open(filename)) {
@@ -81,8 +83,11 @@ bool PmvPlayer::play(const char *filename) {
 	// results to sound being choppy. Therefore, we set them to more
 	// "common" values here (11025 instead of 11127 and 22050 instead
 	// of 22254)
-	if (soundFreq == 11127) soundFreq = 11025;
-	if (soundFreq == 22254) soundFreq = 22050;
+	if (soundFreq == 11127)
+		soundFreq = 11025;
+
+	if (soundFreq == 22254)
+		soundFreq = 22050;
 
 	for (int i = 0; i < 22; i++) {
 		int unk = _fd->readUint16LE();
diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp
index f5e6ca8..f92ffd8 100644
--- a/engines/made/redreader.cpp
+++ b/engines/made/redreader.cpp
@@ -76,6 +76,22 @@ bool RedReader::seekFile(Common::File &fd, FileEntry &fileEntry, const char *fil
 }
 
 LzhDecompressor::LzhDecompressor() {
+	freq = nullptr;
+	len_table = nullptr;
+	sortptr = nullptr;
+	_source = nullptr;
+
+	_compSize = 0;
+	_blockPos = 0;
+	_bitbuf = 0;
+	_subbitbuf = 0;
+	_bitcount = 0;
+	_blocksize = 0;
+	tree_n = 0;
+	heapsize = 0;
+	decode_i = 0;
+	decode_j = 0;
+	count_len_depth = 0;
 }
 
 LzhDecompressor::~LzhDecompressor() {






More information about the Scummvm-git-logs mailing list