aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorjohndoe1232013-05-05 12:09:13 +0200
committerWillem Jan Palenstijn2013-05-08 21:02:00 +0200
commit32c21754e20afd589556ea862876c6e304b3326b (patch)
tree81fe21e3aea57ce08b6fa732d591c3b511f6454b /engines
parentfb0332d8842d7a87435f80a54c91a3a8b324bc8e (diff)
downloadscummvm-rg350-32c21754e20afd589556ea862876c6e304b3326b.tar.gz
scummvm-rg350-32c21754e20afd589556ea862876c6e304b3326b.tar.bz2
scummvm-rg350-32c21754e20afd589556ea862876c6e304b3326b.zip
NEVERHOOD: Fix member var initializations
Diffstat (limited to 'engines')
-rw-r--r--engines/neverhood/scene.cpp3
-rw-r--r--engines/neverhood/screen.cpp2
-rw-r--r--engines/neverhood/sound.cpp4
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
index 2705668c00..07d41754c9 100644
--- a/engines/neverhood/scene.cpp
+++ b/engines/neverhood/scene.cpp
@@ -25,7 +25,8 @@
namespace Neverhood {
Scene::Scene(NeverhoodEngine *vm, Module *parentModule)
- : Entity(vm, 0), _parentModule(parentModule), _dataResource(vm), _hitRects(NULL) {
+ : Entity(vm, 0), _parentModule(parentModule), _dataResource(vm), _hitRects(NULL),
+ _mouseCursorWasVisible(true) {
_isKlaymenBusy = false;
_doConvertMessages = false;
diff --git a/engines/neverhood/screen.cpp b/engines/neverhood/screen.cpp
index 25b4109980..5a748cfab4 100644
--- a/engines/neverhood/screen.cpp
+++ b/engines/neverhood/screen.cpp
@@ -27,7 +27,7 @@ namespace Neverhood {
Screen::Screen(NeverhoodEngine *vm)
: _vm(vm), _paletteData(NULL), _paletteChanged(false), _smackerDecoder(NULL),
- _yOffset(0) {
+ _yOffset(0), _fullRefresh(false) {
_ticks = _vm->_system->getMillis();
diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index a479bf26f9..c84b751e44 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -185,7 +185,7 @@ SoundItem::SoundItem(NeverhoodEngine *vm, uint32 groupNameHash, uint32 soundFile
bool playOnceAfterCountdown, int16 initialCountdown, bool playLooping, int16 currCountdown)
: _vm(vm), _soundResource(NULL), _groupNameHash(groupNameHash), _fileHash(soundFileHash),
_playOnceAfterRandomCountdown(false), _minCountdown(0), _maxCountdown(0),
- _playOnceAfterCountdown(_playOnceAfterCountdown), _initialCountdown(initialCountdown),
+ _playOnceAfterCountdown(playOnceAfterCountdown), _initialCountdown(initialCountdown),
_playLooping(false), _currCountdown(currCountdown) {
_soundResource = new SoundResource(vm);
@@ -607,7 +607,7 @@ bool AudioResourceManSoundItem::isPlaying() {
AudioResourceManMusicItem::AudioResourceManMusicItem(NeverhoodEngine *vm, uint32 fileHash)
: _vm(vm), _fileHash(fileHash), _terminate(false), _canRestart(false),
- _volume(100), _panning(50), _start(false), _isFadingIn(false), _isFadingOut(false) {
+ _volume(100), _panning(50), _start(false), _isFadingIn(false), _isFadingOut(false), _isPlaying(false) {
}