TSAGE: Added new R2R conversation decoding logic

4 files changed, 15 insertions, 15 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 70749f6883..ac6ba523f6 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -2115,11 +2115,11 @@ void AnimationPlayerExt::synchronize(Serializer &s) {
 
 /*--------------------------------------------------------------------------*/
 
-ModalDialog::ModalDialog() {
+ModalWindow::ModalWindow() {
 	_field20 = 0;
 }
 
-void ModalDialog::remove() {
+void ModalWindow::remove() {
 	R2_GLOBALS._sceneItems.remove(&_object1);
 	_object1.remove();
 
@@ -2128,13 +2128,13 @@ void ModalDialog::remove() {
 	--R2_GLOBALS._insetUp;
 }
 
-void ModalDialog::synchronize(Serializer &s) {
+void ModalWindow::synchronize(Serializer &s) {
 	SceneArea::synchronize(s);
 
 	s.syncAsByte(_field20);
 }
 
-void ModalDialog::process(Event &event) {
+void ModalWindow::process(Event &event) {
 	if (_field20 != R2_GLOBALS._insetUp)
 		return;
 
@@ -2157,7 +2157,7 @@ void ModalDialog::process(Event &event) {
 	}
 }
 
-void ModalDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
+void ModalWindow::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
 	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
 
 	_object1.postInit();
@@ -2170,7 +2170,7 @@ void ModalDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX,
 	_field20 = R2_GLOBALS._insetUp;
 }
 
-void ModalDialog::proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+void ModalWindow::proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
 	_object1.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
 }
 
@@ -2426,7 +2426,7 @@ void ScannerDialog::remove() {
 	_obj6.remove();
 	_obj7.remove();
 
-	ModalDialog::remove();
+	ModalWindow::remove();
 }
 
 void ScannerDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
@@ -2435,7 +2435,7 @@ void ScannerDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX
 		R2_GLOBALS._player.addMover(NULL);
 
 	R2_GLOBALS._events.setCursor(CURSOR_USE);
-	ModalDialog::proc12(visage, stripFrameNum, frameNum, posX, posY);
+	ModalWindow::proc12(visage, stripFrameNum, frameNum, posX, posY);
 
 	proc13(100, -1, -1, -1);
 	_talkButton.setup(1);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 42ca071e33..2cf48f3cf3 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -446,22 +446,22 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
-class ModalDialog: public SceneArea {
+class ModalWindow: public SceneArea {
 public:
 	SceneActor _object1;
 	byte _field20;
 public:
-	ModalDialog();
+	ModalWindow();
 
 	virtual void remove();
 	virtual void synchronize(Serializer &s);
-	virtual Common::String getClassName() { return "ModalDialog"; }
+	virtual Common::String getClassName() { return "ModalWindow"; }
 	virtual void process(Event &event);
 	virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
 	virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
-class ScannerDialog: public ModalDialog {
+class ScannerDialog: public ModalWindow {
 
 	class Button: public SceneActor {
 	private:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index ef53ddf302..840172335f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2597,8 +2597,8 @@ void Scene250::synchronize(Serializer &s) {
 }
 
 void Scene250::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
 	loadScene(250);
+	SceneExt::postInit();
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.setVisage(10);
@@ -3050,7 +3050,7 @@ bool Scene300::Seeker::startAction(CursorType action, Event &event) {
 		R2_GLOBALS._player.disableControl();
 
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (R2_GLOBALS.getFlag(44)) {
+			if (!R2_GLOBALS.getFlag(44)) {
 				if (!R2_GLOBALS.getFlag(38)) {
 					R2_GLOBALS._sound1.play(69);
 					scene->_stripId = 181;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index a2865a4b94..0da6b3f93d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -120,7 +120,7 @@ public:
 class Scene1200 : public SceneExt {
 	enum CrawlDirection { CRAWL_EAST = 1, CRAWL_WEST = 2, CRAWL_SOUTH = 3, CRAWL_NORTH = 4 };
 
-	class LaserPanel: public ModalDialog {
+	class LaserPanel: public ModalWindow {
 	public:
 		class Jumper : public SceneActorExt {
 		public: