aboutsummaryrefslogtreecommitdiff
path: root/engines/tucker/sequences.cpp
diff options
context:
space:
mode:
authorStrangerke2014-03-15 12:02:44 +0100
committerStrangerke2014-03-15 12:02:44 +0100
commit661f0414726240cd3c6aae24eb431a231bcccf0d (patch)
tree73af77460d4fee40a2ebd27e51b3101f11ca342d /engines/tucker/sequences.cpp
parent0e48803b42ec570a4a7aa01222c44333543c990b (diff)
downloadscummvm-rg350-661f0414726240cd3c6aae24eb431a231bcccf0d.tar.gz
scummvm-rg350-661f0414726240cd3c6aae24eb431a231bcccf0d.tar.bz2
scummvm-rg350-661f0414726240cd3c6aae24eb431a231bcccf0d.zip
TUCKER: Initialize some pointers with nullptr instead of 0
Diffstat (limited to 'engines/tucker/sequences.cpp')
-rw-r--r--engines/tucker/sequences.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 74a2e9a461..b82bb9ca5c 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -487,11 +487,11 @@ AnimationSequencePlayer::AnimationSequencePlayer(OSystem *system, Audio::Mixer *
memset(_animationPalette, 0, sizeof(_animationPalette));
_soundSeqDataCount = 0;
_soundSeqDataIndex = 0;
- _soundSeqData = 0;
+ _soundSeqData = nullptr;
_offscreenBuffer = (uint8 *)malloc(kScreenWidth * kScreenHeight);
_updateScreenWidth = 0;
_updateScreenPicture = false;
- _picBufPtr = _pic2BufPtr = 0;
+ _picBufPtr = _pic2BufPtr = nullptr;
_changeToNextSequence = false;
_updateFunc = nullptr;
@@ -731,9 +731,8 @@ void AnimationSequencePlayer::fadeOutPalette() {
void AnimationSequencePlayer::unloadAnimation() {
_mixer->stopAll();
free(_picBufPtr);
- _picBufPtr = 0;
free(_pic2BufPtr);
- _pic2BufPtr = 0;
+ _picBufPtr = _pic2BufPtr = nullptr;
}
uint8 *AnimationSequencePlayer::loadPicture(const char *fileName) {