UNITY: Move UIScreen into new file.

Author: fuzzie

bridge.h

@@ -17,7 +17,7 @@
 #ifndef UNITY_BRIDGE_H
 #define UNITY_BRIDGE_H
 
-#include "unity.h"
+#include "screen.h"
 
 namespace Unity {
 

module.mk

@@ -9,6 +9,7 @@ MODULE_OBJS := \
 	fvf_decoder.o \
 	graphics.o \
 	object.o \
+	screen.o \
 	sound.o \
 	sprite.o \
 	sprite_player.o \

screen.cpp

@@ -0,0 +1,40 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "screen.h"
+
+namespace Unity {
+
+UIScreen::UIScreen(UnityEngine *vm) : _vm(vm) {
+}
+
+UIScreen::~UIScreen() {
+	for (uint i = 0; i < _controls.size(); i++) {
+		delete _controls[i];
+	}
+}
+
+UIControl *UIScreen::getControlAt(const Common::Point &pos) {
+	for (uint i = 0; i < _controls.size(); i++) {
+		if (_controls[i]->_bounds.contains(pos))
+			return _controls[i];
+	}
+
+	return NULL;
+}
+
+} // Unity
+

screen.h

@@ -0,0 +1,57 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef UNITY_SCREEN_H
+#define UNITY_SCREEN_H
+
+#include "common/array.h"
+#include "common/rect.h"
+
+namespace Unity {
+
+class UnityEngine;
+
+struct UIControl {
+	UIControl() : _id(0), _sprite(0xffffffff), _state(0) { }
+	virtual ~UIControl() { }
+
+	uint _id;
+	uint _sprite;
+	uint _state;
+	Common::Rect _bounds;
+};
+
+class UIScreen {
+public:
+	UIScreen(UnityEngine *vm);
+	virtual ~UIScreen();
+
+	virtual void start() = 0;
+	virtual void mouseMove(const Common::Point &pos) = 0;
+	virtual void mouseClick(const Common::Point &pos) = 0;
+	virtual void draw() = 0;
+
+protected:
+	UnityEngine *_vm;
+
+	Common::Array<UIControl *> _controls;
+	UIControl *getControlAt(const Common::Point &pos);
+};
+
+} // Unity
+
+#endif
+

unity.h

@@ -31,7 +31,7 @@ class Sound;
 class SpritePlayer;
 class Object;
 class Trigger;
-class UnityEngine;
+class UIScreen;
 
 enum AwayTeamMode {
 	mode_Look,
@@ -61,20 +61,6 @@ enum ScreenType {
 	ViewscreenScreenType
 };
 
-class UIScreen {
-public:
-	UIScreen(UnityEngine *vm) : _vm(vm) { }
-	virtual ~UIScreen() { }
-
-	virtual void start() = 0;
-	virtual void mouseMove(const Common::Point &pos) = 0;
-	virtual void mouseClick(const Common::Point &pos) = 0;
-	virtual void draw() = 0;
-
-protected:
-	UnityEngine *_vm;
-};
-
 class UnityEngine : public Engine {
 public:
 	UnityEngine(class OSystem *syst);

viewscreen.cpp

@@ -26,13 +26,13 @@ ViewscreenScreen::~ViewscreenScreen() {
 }
 
 void ViewscreenScreen::start() {
-	Object *obj;
-
 	_vm->data._currentScreen.objects.clear();
 	_vm->data._currentScreen.polygons.clear();
 	_vm->data._currentScreen.world = 0x5f;
 	_vm->data._currentScreen.screen = 0xff;
 
+	Object *obj;
+
 	// TODO: icon at 33, 444
 
 	// viewscreen image

viewscreen.h

@@ -17,7 +17,7 @@
 #ifndef UNITY_VIEWSCREEN_H
 #define UNITY_VIEWSCREEN_H
 
-#include "unity.h"
+#include "screen.h"
 
 namespace Unity {