[Scummvm-cvs-logs] scummvm master -> b0c032275af712e53f6079796b876a7a56319553

[Strangerke]

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

Summary:
b0c032275a MADS: Phantom - Initialize and synchronize a couple of variables


Commit: b0c032275af712e53f6079796b876a7a56319553
    https://github.com/scummvm/scummvm/commit/b0c032275af712e53f6079796b876a7a56319553
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-24T18:19:35+01:00

Commit Message:
MADS: Phantom - Initialize and synchronize a couple of variables

Changed paths:
    engines/mads/phantom/game_phantom.cpp
    engines/mads/phantom/phantom_scenes1.cpp
    engines/mads/phantom/phantom_scenes1.h



diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index dd649d1..af2102b 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -138,6 +138,8 @@ namespace Phantom {
 GamePhantom::GamePhantom(MADSEngine *vm) : Game(vm) {
 	_surface = new MSurface(MADS_SCREEN_WIDTH, MADS_SCENE_HEIGHT);
 	_difficulty = DIFFICULTY_HARD;
+	_catacombs = nullptr;
+	_catacombSize = -1;
 }
 
 void GamePhantom::startGame() {
diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index 53bf117..7bde277 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -5603,6 +5603,8 @@ Scene109::Scene109(MADSEngine *vm) : Scene1xx(vm) {
 	_anim1ActvFl = false;
 	_anim2ActvFl = false;
 	_anim3ActvFl = false;
+
+	_currentFloor = -1;
 }
 
 void Scene109::synchronize(Common::Serializer &s) {
@@ -5612,6 +5614,8 @@ void Scene109::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_anim1ActvFl);
 	s.syncAsByte(_anim2ActvFl);
 	s.syncAsByte(_anim3ActvFl);
+
+	s.syncAsSint16LE(_currentFloor);
 }
 
 void Scene109::setup() {
@@ -7664,6 +7668,7 @@ Scene113::Scene113(MADSEngine *vm) : Scene1xx(vm) {
 
 	_dayStatus = -1;
 	_raoulAction = -1;
+	_christineHotspotId1 = -1;
 	_christineHotspotId2 = -1;
 	_raoulCount = -1;
 	_dayCount = -1;
@@ -7698,6 +7703,7 @@ void Scene113::synchronize(Common::Serializer &s) {
 
 	s.syncAsSint16LE(_dayStatus);
 	s.syncAsSint16LE(_raoulAction);
+	s.syncAsSint16LE(_christineHotspotId1);
 	s.syncAsSint16LE(_christineHotspotId2);
 	s.syncAsSint16LE(_raoulCount);
 	s.syncAsSint16LE(_dayCount);
diff --git a/engines/mads/phantom/phantom_scenes1.h b/engines/mads/phantom/phantom_scenes1.h
index d1be6e0..cadfcef 100644
--- a/engines/mads/phantom/phantom_scenes1.h
+++ b/engines/mads/phantom/phantom_scenes1.h
@@ -264,6 +264,7 @@ private:
 	bool _anim2ActvFl;
 	bool _anim3ActvFl;
 	int _currentFloor;
+
 public:
 	Scene109(MADSEngine *vm);
 	virtual void synchronize(Common::Serializer &s);