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

Strangerke Strangerke at scummvm.org
Tue Jan 27 07:25:01 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:
a1a99745f6 MADE: Initialize some more variables, remove an useless variable


Commit: a1a99745f6f120354c0565e96e0636c0d303ed52
    https://github.com/scummvm/scummvm/commit/a1a99745f6f120354c0565e96e0636c0d303ed52
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-27T07:21:52+01:00

Commit Message:
MADE: Initialize some more variables, remove an useless variable

Changed paths:
    engines/made/resource.cpp
    engines/made/screenfx.cpp
    engines/made/screenfx.h



diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 2c75965..f8e763e7 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -241,6 +241,7 @@ void AnimationResource::load(byte *source, int size) {
 /* SoundResource */
 
 SoundResource::SoundResource() : _soundSize(0), _soundData(NULL) {
+	_soundEnergyArray = nullptr;
 }
 
 SoundResource::~SoundResource() {
@@ -377,6 +378,9 @@ void GenericResource::load(byte *source, int size) {
 ResourceReader::ResourceReader() {
 	_isV1 = false;
 	_cacheDataSize = 0;
+
+	_fd = _fdMusic = _fdPics = _fdSounds = nullptr;
+	_cacheCount = 0;
 }
 
 ResourceReader::~ResourceReader() {
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index 2a155d6..3f98cbb 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -51,7 +51,12 @@ ScreenEffects::ScreenEffects(Screen *screen) : _screen(screen) {
 	vfxHeight = 0;
 
 	_fxPalette = new byte[768];
-
+	
+	_blendedPaletteStatus._active = false;
+	_blendedPaletteStatus._palette = _blendedPaletteStatus._newPalette = nullptr;
+	_blendedPaletteStatus._colorCount = 0;
+	_blendedPaletteStatus._value = _blendedPaletteStatus._maxValue = 0;
+	_blendedPaletteStatus._incr = 0;
 }
 
 ScreenEffects::~ScreenEffects() {
diff --git a/engines/made/screenfx.h b/engines/made/screenfx.h
index fd216bf..cedb059 100644
--- a/engines/made/screenfx.h
+++ b/engines/made/screenfx.h
@@ -38,7 +38,6 @@ struct BlendedPaletteStatus {
 	byte *_palette, *_newPalette;
 	int _colorCount;
 	int16 _value, _maxValue, _incr;
-	int cnt;
 };
 
 class ScreenEffects {






More information about the Scummvm-git-logs mailing list