diff options
author | Strangerke | 2015-01-27 07:21:52 +0100 |
---|---|---|
committer | Strangerke | 2015-01-27 07:21:52 +0100 |
commit | a1a99745f6f120354c0565e96e0636c0d303ed52 (patch) | |
tree | 10bbaa172a52d267fcdaeaf88cbfee88a8c5476f /engines/made | |
parent | 849f383169d57b0dee7b33ab0c2166007b50b8c2 (diff) | |
download | scummvm-rg350-a1a99745f6f120354c0565e96e0636c0d303ed52.tar.gz scummvm-rg350-a1a99745f6f120354c0565e96e0636c0d303ed52.tar.bz2 scummvm-rg350-a1a99745f6f120354c0565e96e0636c0d303ed52.zip |
MADE: Initialize some more variables, remove an useless variable
Diffstat (limited to 'engines/made')
-rw-r--r-- | engines/made/resource.cpp | 4 | ||||
-rw-r--r-- | engines/made/screenfx.cpp | 7 | ||||
-rw-r--r-- | engines/made/screenfx.h | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index 2c75965976..f8e763e74e 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 2a155d67ac..3f98cbb9ab 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 fd216bfd63..cedb059927 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 { |