From a59b4cbc9d1d308121250fa52eeafce8ef763ea9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 24 Oct 2013 22:42:46 -0400
Subject: TSAGE: Add in R2R screen border to scenes showing the user interface

---
 engines/tsage/user_interface.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'engines/tsage/user_interface.cpp')

diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 09cc2fd56d..5cfc845ceb 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -276,11 +276,29 @@ void UICollection::draw() {
 			Rect(0, UI_INTERFACE_Y, SCREEN_WIDTH, SCREEN_HEIGHT),
 			Rect(0, UI_INTERFACE_Y, SCREEN_WIDTH, SCREEN_HEIGHT));
 
+		if (g_vm->getGameID() == GType_Ringworld2)
+			r2rDrawFrame();
+
 		_clearScreen = 1;
 		g_globals->_sceneManager._scene->_sceneBounds = savedBounds;
 	}
 }
 
+void UICollection::r2rDrawFrame() {
+	Visage visage;
+	visage.setVisage(2, 1);
+	GfxSurface vertLine = visage.getFrame(1);
+	GfxSurface horizLine = visage.getFrame(2);
+
+	GLOBALS._screenSurface.copyFrom(horizLine, 0, 0);
+	GLOBALS._screenSurface.copyFrom(vertLine, 0, 3);
+	GLOBALS._screenSurface.copyFrom(vertLine, SCREEN_WIDTH - 4, 3);
+
+	// Restrict drawing area to exclude the borders at the edge of the screen
+	R2_GLOBALS._screenSurface._clipRect = Rect(4, 4, SCREEN_WIDTH - 4, 
+		SCREEN_HEIGHT - 4);
+}
+
 /*--------------------------------------------------------------------------*/
 
 UIElements::UIElements(): UICollection() {
-- 
cgit v1.2.3


From 10aa743e9dbaf8e7ecd2eb777cdb8a50a50dd618 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 26 Oct 2013 17:59:44 -0400
Subject: TSAGE: Renamed proc methods in ModalWindow classes

---
 engines/tsage/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/user_interface.cpp')

diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 5cfc845ceb..cb8d3c8ca1 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -87,7 +87,7 @@ void UIQuestion::showDescription(CursorType cursor) {
 			Ringworld2::SceneExt *scene = static_cast<Ringworld2::SceneExt *>
 				(R2_GLOBALS._sceneManager._scene);
 			if (!scene->_sceneAreas.contains(R2_GLOBALS._scannerDialog))
-				R2_GLOBALS._scannerDialog->proc12(4, 1, 1, 160, 125);
+				R2_GLOBALS._scannerDialog->setup2(4, 1, 1, 160, 125);
 		} else {
 			// Show object description
 			SceneItem::display2(3, (int)cursor);
-- 
cgit v1.2.3


From c02073ff9ac369a86968e35c8b32bc7488bbaab8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 27 Oct 2013 00:27:44 +0200
Subject: TSAGE: Fix CID 1002365, 1002366, 1107569

---
 engines/tsage/user_interface.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines/tsage/user_interface.cpp')

diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index cb8d3c8ca1..c7053a073d 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -307,6 +307,10 @@ UIElements::UIElements(): UICollection() {
 	else
 		_cursorVisage.setVisage(1, 5);
 	g_saver->addLoadNotifier(&UIElements::loadNotifierProc);
+
+	_slotStart = 0;
+	_scoreValue = 0;
+	_active = false;
 }
 
 void UIElements::synchronize(Serializer &s) {
-- 
cgit v1.2.3