From 2a73b6c08e98c07e63ef669487aad934da89feb7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 23 May 2014 21:43:00 +0200
Subject: MADS: Move contructors out of the header in scene group 8

---
 engines/mads/nebular/nebular_scenes8.cpp | 47 ++++++++++++++++++++++++--------
 engines/mads/nebular/nebular_scenes8.h   | 13 +++++----
 2 files changed, 42 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 1fef2709b4..6f9a46d655 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -78,9 +78,8 @@ void Scene8xx::sceneEntrySound() {
 
 /*------------------------------------------------------------------------*/
 
-void Scene801::setup() {
-	setPlayerSpritesPrefix();
-	setAAName();
+Scene801::Scene801(MADSEngine *vm) : Scene8xx(vm) {
+	_walkThroughDoor = false;
 }
 
 void Scene801::synchronize(Common::Serializer &s) {
@@ -89,6 +88,10 @@ void Scene801::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_walkThroughDoor);
 }
 
+void Scene801::setup() {
+	setPlayerSpritesPrefix();
+	setAAName();
+}
 
 void Scene801::enter() {
 	_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1));
@@ -830,10 +833,17 @@ void Scene803::actions() {
 
 /*------------------------------------------------------------------------*/
 
+Scene804::Scene804(MADSEngine *vm) : Scene8xx(vm) {
+	_messWithThrottle = false;
+	_movingThrottle = false;
+	_throttleGone = false;
+	_dontPullThrottleAgain = false;
+	_pullThrottleReally = false;
+	_alreadyOrgan = false;
+	_alreadyPop = false;
 
-void Scene804::setup() {
-	Scene8xx::setPlayerSpritesPrefix();
-	Scene8xx::setAAName();
+	_throttleCounter = 0;
+	_resetFrame = -1;
 }
 
 void Scene804::synchronize(Common::Serializer &s) {
@@ -851,6 +861,11 @@ void Scene804::synchronize(Common::Serializer &s) {
 	s.syncAsUint32LE(_throttleCounter);
 }
 
+void Scene804::setup() {
+	Scene8xx::setPlayerSpritesPrefix();
+	Scene8xx::setAAName();
+}
+
 void Scene804::enter() {
 	_messWithThrottle = false;
 	_throttleCounter = 0;
@@ -1252,9 +1267,8 @@ void Scene807::actions() {
 
 /*------------------------------------------------------------------------*/
 
-void Scene808::setup() {
-	setPlayerSpritesPrefix();
-	setAAName();
+Scene808::Scene808(MADSEngine *vm) : Scene8xx(vm) {
+	_goingTo803 = false;
 }
 
 void Scene808::synchronize(Common::Serializer &s) {
@@ -1263,6 +1277,11 @@ void Scene808::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_goingTo803);
 }
 
+void Scene808::setup() {
+	setPlayerSpritesPrefix();
+	setAAName();
+}
+
 void Scene808::enter() {
 	_scene->_userInterface.setup(kInputLimitedSentences);
 
@@ -1464,9 +1483,8 @@ void Scene808::actions() {
 
 /*------------------------------------------------------------------------*/
 
-void Scene810::setup() {
-	setPlayerSpritesPrefix();
-	setAAName();
+Scene810::Scene810(MADSEngine *vm) : Scene8xx(vm) {
+	_moveAllowed = false;
 }
 
 void Scene810::synchronize(Common::Serializer &s) {
@@ -1475,6 +1493,11 @@ void Scene810::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_moveAllowed);
 }
 
+void Scene810::setup() {
+	setPlayerSpritesPrefix();
+	setAAName();
+}
+
 void Scene810::enter() {
 	_scene->_userInterface.setup(kInputLimitedSentences);
 	_game._player._visible = false;
diff --git a/engines/mads/nebular/nebular_scenes8.h b/engines/mads/nebular/nebular_scenes8.h
index f926d1ec97..150951dcaf 100644
--- a/engines/mads/nebular/nebular_scenes8.h
+++ b/engines/mads/nebular/nebular_scenes8.h
@@ -57,7 +57,7 @@ private:
 	bool _walkThroughDoor;
 
 public:
-	Scene801(MADSEngine *vm) : Scene8xx(vm) {}
+	Scene801(MADSEngine *vm);
 	void synchronize(Common::Serializer &s);
 
 	virtual void setup();
@@ -92,16 +92,17 @@ public:
 class Scene804: public Scene8xx {
 private:
 	bool _messWithThrottle;
-	uint32 _throttleCounter;
 	bool _movingThrottle;
 	bool _throttleGone;
 	bool _dontPullThrottleAgain;
-	int _resetFrame;
 	bool _pullThrottleReally;
 	bool _alreadyOrgan;
 	bool _alreadyPop;
+	uint32 _throttleCounter;
+	int _resetFrame;
+
 public:
-	Scene804(MADSEngine *vm) : Scene8xx(vm), _throttleCounter(0) {}
+	Scene804(MADSEngine *vm);
 	void synchronize(Common::Serializer &s);
 
 	virtual void setup();
@@ -136,7 +137,7 @@ private:
 	bool _goingTo803;
 
 public:
-	Scene808(MADSEngine *vm) : Scene8xx(vm) {}
+	Scene808(MADSEngine *vm);
 	void synchronize(Common::Serializer &s);
 
 	virtual void setup();
@@ -149,7 +150,7 @@ private:
 	bool _moveAllowed;
 
 public:
-	Scene810(MADSEngine *vm) : Scene8xx(vm) {}
+	Scene810(MADSEngine *vm);
 	void synchronize(Common::Serializer &s);
 
 	virtual void setup();
-- 
cgit v1.2.3