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

2 files changed, 3 insertions, 2 deletions

diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
index 0b2e9c6b75..9a7e87ac8d 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 f60e291395..e6183199ce 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);