SUPERNOVA: Resolve same MS1 TODOs

2 files changed, 9 insertions, 25 deletions

diff --git a/engines/supernova/supernova1/rooms.cpp b/engines/supernova/supernova1/rooms.cpp
index 5fe0868473..41b2338172 100644
--- a/engines/supernova/supernova1/rooms.cpp
+++ b/engines/supernova/supernova1/rooms.cpp
@@ -31,6 +31,12 @@
 
 namespace Supernova {
 
+Room1::Room1() {
+	_dialogsX[0] = kStringDialogX1;
+	_dialogsX[1] = kStringDialogX2;
+	_dialogsX[2] = kStringDialogX3;
+}
+
 Intro::Intro(SupernovaEngine *vm, GameManager1 *gm) {
 	_vm = vm;
 	_gm = gm;
@@ -2720,10 +2726,6 @@ ArsanoMeetup3::ArsanoMeetup3(SupernovaEngine *vm, GameManager1 *gm) {
 	_dialog2[3] = kStringDialogArsanoMeetup3_3;
 	_dialog3[0] = kStringDialogArsanoMeetup3_4;
 	_dialog3[1] = kStringDialogArsanoMeetup3_5;
-
-	_dialogsX[0] = kStringDialogX1;
-	_dialogsX[1] = kStringDialogX2;
-	_dialogsX[2] = kStringDialogX3;
 }
 
 bool ArsanoMeetup3::interact(Action verb, Object &obj1, Object &obj2) {
@@ -3557,10 +3559,6 @@ AxacussIntersection::AxacussIntersection(SupernovaEngine *vm, GameManager1 *gm)
 	_objectState[3] = Object(_id, kStringAxacussan, kStringAxacussanDescription, GUARDIAN, TALK, 0, 0, 0);
 	_objectState[4] = Object(_id, kStringImage, kStringImageDescription2, NULLOBJECT, NULLTYPE, 2, 2, 0);
 	_objectState[5] = Object(_id, kStringMastercard, kStringMastercardDescription, MASTERKEYCARD, TAKE | COMBINABLE, 255, 255, 1);
-
-	_dialogsX[0] = kStringDialogX1;
-	_dialogsX[1] = kStringDialogX2;
-	_dialogsX[2] = kStringDialogX3;
 }
 
 bool AxacussIntersection::interact(Action verb, Object &obj1, Object &obj2) {
@@ -3608,10 +3606,6 @@ AxacussExit::AxacussExit(SupernovaEngine *vm, GameManager1 *gm) {
 	_objectState[4] = Object(_id, kStringLamp2,kStringDefaultDescription,LAMP,COMBINABLE,3,3,0);
 	_objectState[5] = Object(_id, kStringAxacussan,kStringDefaultDescription,GUARDIAN,TALK,5,5,0);
 	_objectState[6] = Object(_id, kStringImage,kStringGenericDescription5,NULLOBJECT,NULLTYPE,4,4,0);
-
-	_dialogsX[0] = kStringDialogX1;
-	_dialogsX[1] = kStringDialogX2;
-	_dialogsX[2] = kStringDialogX3;
 }
 
 bool AxacussExit::interact(Action verb, Object &obj1, Object &obj2) {
diff --git a/engines/supernova/supernova1/rooms.h b/engines/supernova/supernova1/rooms.h
index 166d796daa..aa11817ccc 100644
--- a/engines/supernova/supernova1/rooms.h
+++ b/engines/supernova/supernova1/rooms.h
@@ -39,8 +39,11 @@ class GameManager1;
 class SupernovaEngine;
 
 class Room1: public Room {
+	public:
+		Room1();
 	protected:
 		GameManager1 *_gm;
+	int _dialogsX[6];
 };
 
 // Room 0
@@ -306,10 +309,6 @@ private:
 	int _dialog2[2];
 	int _dialog3[4];
 	int _dialog4[3];
-
-	// FIXME: Remove following unused bool variables?
-	//bool _found;
-	//bool _flug;
 };
 
 class ArsanoMeetup3 : public Room1 {
@@ -321,9 +320,6 @@ public:
 private:
 	int _dialog2[4];
 	int _dialog3[2];
-
-	// TODO: Hack, to be move away and renamed when the other uses are found
-	int _dialogsX[6];
 };
 
 
@@ -451,9 +447,6 @@ public:
 	AxacussIntersection(SupernovaEngine *vm, GameManager1 *gm);
 
 	virtual bool interact(Action verb, Object &obj1, Object &obj2);
-
-private:
-	int _dialogsX[6];
 };
 
 class AxacussExit : public Room1 {
@@ -461,9 +454,6 @@ public:
 	AxacussExit(SupernovaEngine *vm, GameManager1 *gm);
 
 	virtual bool interact(Action verb, Object &obj1, Object &obj2);
-
-private:
-	int _dialogsX[6];
 };
 
 class AxacussOffice1 : public Room1 {