aboutsummaryrefslogtreecommitdiff
path: root/engines/made/pmvplayer.cpp
diff options
context:
space:
mode:
authorStrangerke2015-01-28 07:47:28 +0100
committerStrangerke2015-01-28 07:47:28 +0100
commitae2ba18af360b5578eaa38ac7aacce3264f8d7bf (patch)
tree3fdb9d84c70d932e36b7be75aaac961a49d8ee11 /engines/made/pmvplayer.cpp
parent2d93a82e8060b2c9d05438c0ba352ad4ca46f1c0 (diff)
downloadscummvm-rg350-ae2ba18af360b5578eaa38ac7aacce3264f8d7bf.tar.gz
scummvm-rg350-ae2ba18af360b5578eaa38ac7aacce3264f8d7bf.tar.bz2
scummvm-rg350-ae2ba18af360b5578eaa38ac7aacce3264f8d7bf.zip
MADE: Initialize some variables
Diffstat (limited to 'engines/made/pmvplayer.cpp')
-rw-r--r--engines/made/pmvplayer.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index 3cac017e10..6ea0dc24d0 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();