TSAGE: Further cleanup of existing R2R MazeUI code

scummvm · Jun 29, 2013 · 61df7e3 · 61df7e3
1 parent 5ba9f83
commit 61df7e3
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 104 deletions.
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1293,8 +1293,6 @@ void MazeUI::synchronize(Serializer &s) {
 	_rect1.synchronize(s);
 	_rect2.synchronize(s);
 
-	// FIXME: syncrhonize _field16 and _field3A
-
 	s.syncAsSint16LE(_field12);
 	s.syncAsSint16LE(_field14);
 	s.syncAsSint16LE(_field26);
@@ -1370,8 +1368,8 @@ int MazeUI::sub51AF8(Common::Point pt) {
 	return -1;
 }
 
-bool MazeUI::sub51AFD(Common::Point pt) {
-	int retval = false;
+bool MazeUI::setMazePosition(Common::Point pt) {
+	bool retval = false;
 
 	_field2E = pt.x;
 	_field30 = pt.y;
@@ -1399,14 +1397,13 @@ bool MazeUI::sub51AFD(Common::Point pt) {
 	return retval;
 }
 
-void MazeUI::sub51B02() {
-	warning("STUB: MazeUI::sub51B02()");
+void MazeUI::mazeProc1() {
+	warning("STUB: MazeUI::mazeProc1()");
 }
 
-void MazeUI::sub9EDE8(Rect rect) {
+void MazeUI::setUIBounds(Rect rect) {
 	_rect1 = rect;
-	warning("FIXME: MazeUI::sub9EDE8()");
-//	_rect1.clip(g_globals->gfxManager()._bounds);
+	_rect1.clip(g_globals->gfxManager()._bounds);
 }
 
 int MazeUI::sub9EE22(int &arg1, int &arg2) {

diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -309,9 +309,9 @@ class MazeUI: public SavedObject {
 	void synchronize(Serializer &s);
 
 	int sub51AF8(Common::Point pt);
-	bool sub51AFD(Common::Point pt);
-	void sub51B02();
-	void sub9EDE8(Rect rect);
+	bool setMazePosition(Common::Point pt);
+	void mazeProc1();
+	void setUIBounds(Rect rect);
 	int sub9EE22(int &arg1, int &arg2);
 };
 

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1134,12 +1134,12 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	_actor1.hide();
 
 	tmpRect.set(110, 20, 210, 120);
-	_object1.sub9EDE8(tmpRect);
+	_object1.setUIBounds(tmpRect);
 
 	_object1.load(1);
-	_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
+	_object1.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 	warning("int unk = set_pane_p(_paneNumber);");
-	_object1.sub51B02();
+	_object1.mazeProc1();
 	warning("set_pane_p(unk);");
 
 	R2_GLOBALS._player.enableControl();
@@ -1544,9 +1544,9 @@ void Scene1200::dispatch() {
 	Rect tmpRect;
 	Scene::dispatch();
 	if (_field41C != 0) {
-		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
+		_object1.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
-		_object1.sub51B02();
+		_object1.mazeProc1();
 		warning("_gfxManager.sub294AC(unk);");
 		warning("tmpRect.sub14DF3();");
 		_field41C = 0;
@@ -1571,9 +1571,9 @@ void Scene1200::dispatch() {
 		default:
 			break;
 		}
-		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
+		_object1.setMazePosition(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
-		_object1.sub51B02();
+		_object1.mazeProc1();
 		warning("_gfxManager.sub294AC(unk);");
 		warning("tmpRect.sub14DF3();");