[Scummvm-cvs-logs] scummvm master -> 2369f60a42ed63906a38d04c6a3c9243e10bfe44

bluegr bluegr at gmail.com
Fri Sep 27 00:38:54 CEST 2013 

This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f05e43fae6 NEVERHOOD: Fix uninitialized members of the SoundMan class - CID 1022297
b94165abe3 NEVERHOOD: Fix uninitialized members of the AudioResourceManMusicItem class - CID 1022298
871b4a83e2 NEVERHOOD: Fix uninitialized members of the Screen class - CID 1022299
16b419847f NEVERHOOD: Fix uninitialized members of the Scene class and remove dead code - CID 1022300
cfa6974d29 NEVERHOOD: Fix uninitialized members of the Palette class - CID 1022303, 1022304, 1022305, 1022306
e925f8a9d8 NEVERHOOD: Fix uninitialized variable in AsScene2810Rope - CID 1022310
802abdcc34 NEVERHOOD: Fix uninitialized variable in AsScene1002OutsideDoorBackground - CID 1022329
ba30e961b9 NEVERHOOD: Remove unused variable - CID 1022328
78d9aea198 NEVERHOOD: Fix uninitialized variable in Scene1303 - CID 1022323
2369f60a42 NEVERHOOD: Fix uninitialized member of the TextEditWidget class - CID 1022333


Commit: f05e43fae615c1c40e53e9285507d13259ab88df
    https://github.com/scummvm/scummvm/commit/f05e43fae615c1c40e53e9285507d13259ab88df
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:14-07:00

Commit Message:
NEVERHOOD: Fix uninitialized members of the SoundMan class - CID 1022297

Changed paths:
    engines/neverhood/sound.cpp



diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index 746dd17..e9ebbad 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -250,7 +250,9 @@ void SoundItem::update() {
 // SoundMan
 
 SoundMan::SoundMan(NeverhoodEngine *vm)
-	: _vm(vm), _soundIndex1(-1), _soundIndex2(-1), _soundIndex3(-1) {
+	: _vm(vm), _soundIndex1(-1), _soundIndex2(-1), _soundIndex3(-1),
+	  _initialCountdown(0), _playOnceAfterCountdown(false),
+	  _initialCountdown3(0), _playOnceAfterCountdown3(false) {
 }
 
 SoundMan::~SoundMan() {


Commit: b94165abe3e78d19f2f1873ca65503332ae2b125
    https://github.com/scummvm/scummvm/commit/b94165abe3e78d19f2f1873ca65503332ae2b125
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:15-07:00

Commit Message:
NEVERHOOD: Fix uninitialized members of the AudioResourceManMusicItem class - CID 1022298

Changed paths:
    engines/neverhood/sound.cpp



diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index e9ebbad..3ea4549 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -629,7 +629,8 @@ 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), _isPlaying(false) {
+	_volume(100), _panning(50),	_start(false), _isFadingIn(false), _isFadingOut(false), _isPlaying(false),
+	_fadeVolume(0), _fadeVolumeStep(0) {
 
 }
 


Commit: 871b4a83e2e3e1d907822770c05afdfadbafdca0
    https://github.com/scummvm/scummvm/commit/871b4a83e2e3e1d907822770c05afdfadbafdca0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:15-07:00

Commit Message:
NEVERHOOD: Fix uninitialized members of the Screen class - CID 1022299

Changed paths:
    engines/neverhood/screen.cpp



diff --git a/engines/neverhood/screen.cpp b/engines/neverhood/screen.cpp
index 4c8dd9a..901ab73 100644
--- a/engines/neverhood/screen.cpp
+++ b/engines/neverhood/screen.cpp
@@ -27,7 +27,8 @@ namespace Neverhood {
 
 Screen::Screen(NeverhoodEngine *vm)
 	: _vm(vm), _paletteData(NULL), _paletteChanged(false), _smackerDecoder(NULL),
-	_yOffset(0), _fullRefresh(false) {
+	_yOffset(0), _fullRefresh(false), _frameDelay(0), _savedSmackerDecoder(NULL),
+	_savedFrameDelay(0), _savedYOffset(0) {
 
 	_ticks = _vm->_system->getMillis();
 


Commit: 16b419847f49a500347487f38d50795cb6a13a63
    https://github.com/scummvm/scummvm/commit/16b419847f49a500347487f38d50795cb6a13a63
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:15-07:00

Commit Message:
NEVERHOOD: Fix uninitialized members of the Scene class and remove dead code - CID 1022300

Changed paths:
    engines/neverhood/scene.cpp
    engines/neverhood/scene.h



diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
index 0b2e9c6..9a7e87a 100644
--- a/engines/neverhood/scene.cpp
+++ b/engines/neverhood/scene.cpp
@@ -50,6 +50,9 @@ Scene::Scene(NeverhoodEngine *vm, Module *parentModule)
 	_smackerPlayer = NULL;
 	_isMessageListBusy = false;
 	_messageValue = -1;
+	_messageListStatus = 0;
+	_messageListCount = 0;
+	_messageListIndex = 0;
 
 	_backgroundFileHash = _cursorFileHash = 0;
 
diff --git a/engines/neverhood/scene.h b/engines/neverhood/scene.h
index f60e291..e618319 100644
--- a/engines/neverhood/scene.h
+++ b/engines/neverhood/scene.h
@@ -204,8 +204,6 @@ protected:
 	// Used for debugging
 	uint32 _backgroundFileHash, _cursorFileHash;    // for StaticScene and all Scene* classes
 
-	void (Entity::*_savedUpdateHandlerCb)();
-	uint32 (Entity::*_savedMessageHandlerCb)(int messageNum, const MessageParam &param, Entity *sender);
 	int _messageValue;
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 	bool queryPositionSprite(int16 mouseX, int16 mouseY);


Commit: cfa6974d29e4f30c749f859242e54b59b555b67a
    https://github.com/scummvm/scummvm/commit/cfa6974d29e4f30c749f859242e54b59b555b67a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:16-07:00

Commit Message:
NEVERHOOD: Fix uninitialized members of the Palette class - CID 1022303, 1022304, 1022305, 1022306

Changed paths:
    engines/neverhood/palette.cpp



diff --git a/engines/neverhood/palette.cpp b/engines/neverhood/palette.cpp
index c381f46..941bcc3 100644
--- a/engines/neverhood/palette.cpp
+++ b/engines/neverhood/palette.cpp
@@ -66,6 +66,11 @@ void Palette::init() {
 	_status = 0;
 	_palette = new byte[1024];
 	_basePalette = new byte[1024];
+	_palCounter = 0;
+	_fadeToR = 0;
+	_fadeToG = 0;
+	_fadeToB = 0;
+	_fadeStep = 0;
 }
 
 void Palette::usePalette() {


Commit: e925f8a9d888fe39a23d4b240976055cf9f2804d
    https://github.com/scummvm/scummvm/commit/e925f8a9d888fe39a23d4b240976055cf9f2804d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:16-07:00

Commit Message:
NEVERHOOD: Fix uninitialized variable in AsScene2810Rope - CID 1022310

Changed paths:
    engines/neverhood/modules/module2800_sprites.cpp



diff --git a/engines/neverhood/modules/module2800_sprites.cpp b/engines/neverhood/modules/module2800_sprites.cpp
index 28e2657..f7949b9 100644
--- a/engines/neverhood/modules/module2800_sprites.cpp
+++ b/engines/neverhood/modules/module2800_sprites.cpp
@@ -895,7 +895,7 @@ uint32 AsScene2809Spew::handleMessage(int messageNum, const MessageParam &param,
 }
 
 AsScene2810Rope::AsScene2810Rope(NeverhoodEngine *vm, Scene *parentScene, int16 x)
-	: AnimatedSprite(vm, 1100) {
+	: AnimatedSprite(vm, 1100), _parentScene(parentScene) {
 
 	createSurface(990, 68, 476);
 	SetUpdateHandler(&AnimatedSprite::update);


Commit: 802abdcc34e82166ff0dead36c8ad679fa9f1318
    https://github.com/scummvm/scummvm/commit/802abdcc34e82166ff0dead36c8ad679fa9f1318
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:16-07:00

Commit Message:
NEVERHOOD: Fix uninitialized variable in AsScene1002OutsideDoorBackground - CID 1022329

Changed paths:
    engines/neverhood/modules/module1000.cpp



diff --git a/engines/neverhood/modules/module1000.cpp b/engines/neverhood/modules/module1000.cpp
index 08fb88a..14ce5f4 100644
--- a/engines/neverhood/modules/module1000.cpp
+++ b/engines/neverhood/modules/module1000.cpp
@@ -1012,7 +1012,7 @@ void AsScene1002VenusFlyTrap::swallowKlaymen() {
 }
 
 AsScene1002OutsideDoorBackground::AsScene1002OutsideDoorBackground(NeverhoodEngine *vm)
-	: AnimatedSprite(vm, 1200), _countdown(0) {
+	: AnimatedSprite(vm, 1200), _countdown(0), _isDoorClosed(true) {
 
 	createSurface(850, 186, 212);
 	_x = 320;


Commit: ba30e961b99ce4029e1f3e621bb2e4d0e63aab43
    https://github.com/scummvm/scummvm/commit/ba30e961b99ce4029e1f3e621bb2e4d0e63aab43
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:16-07:00

Commit Message:
NEVERHOOD: Remove unused variable - CID 1022328

Changed paths:
    engines/neverhood/modules/module1200.h



diff --git a/engines/neverhood/modules/module1200.h b/engines/neverhood/modules/module1200.h
index c97dc98..e852731 100644
--- a/engines/neverhood/modules/module1200.h
+++ b/engines/neverhood/modules/module1200.h
@@ -155,8 +155,6 @@ protected:
 class SsScene1201Tnt : public StaticSprite {
 public:
 	SsScene1201Tnt(NeverhoodEngine *vm, uint32 elemIndex, uint32 pointIndex, int16 clipY2);
-protected:
-	uint32 _elemIndex;
 };
 
 class Scene1201 : public Scene {


Commit: 78d9aea1989cf8d99dc83766b15aab6464ed0df0
    https://github.com/scummvm/scummvm/commit/78d9aea1989cf8d99dc83766b15aab6464ed0df0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:17-07:00

Commit Message:
NEVERHOOD: Fix uninitialized variable in Scene1303 - CID 1022323

Changed paths:
    engines/neverhood/modules/module1300.cpp



diff --git a/engines/neverhood/modules/module1300.cpp b/engines/neverhood/modules/module1300.cpp
index c8a561a..0b883b2 100644
--- a/engines/neverhood/modules/module1300.cpp
+++ b/engines/neverhood/modules/module1300.cpp
@@ -630,7 +630,7 @@ void AsScene1303Balloon::stPopBalloon() {
 }
 
 Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule)
-	: Scene(vm, parentModule) {
+	: Scene(vm, parentModule), _asBalloon(NULL) {
 
 	SetMessageHandler(&Scene1303::handleMessage);
 


Commit: 2369f60a42ed63906a38d04c6a3c9243e10bfe44
    https://github.com/scummvm/scummvm/commit/2369f60a42ed63906a38d04c6a3c9243e10bfe44
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-26T15:38:17-07:00

Commit Message:
NEVERHOOD: Fix uninitialized member of the TextEditWidget class - CID 1022333

Changed paths:
    engines/neverhood/menumodule.cpp



diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index 362f527..5ad2dd6 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -574,6 +574,7 @@ TextEditWidget::TextEditWidget(NeverhoodEngine *vm, int16 x, int16 y, GameStateM
 
 	_maxVisibleChars = (_rect.x2 - _rect.x1) / _fontSurface->getCharWidth();
 	_cursorPos = 0;
+	_textLabelWidget = NULL;
 
 	SetUpdateHandler(&TextEditWidget::update);
 	SetMessageHandler(&TextEditWidget::handleMessage);

More information about the Scummvm-git-logs mailing list