From 0aae714d4d894a4bfa9582c71ee8a1778260a047 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 9 Jan 2017 19:06:36 -0500
Subject: ui menu cleanup

---
 include/ui_menu.hpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index 8ca9368..b45a76d 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -13,28 +13,24 @@ class menuItem {
 public:
 	int member;
 	Menu *child;
+
+	vec2 loc;
+	dim2 dim;
+	Color color;
+	std::string text;
 	//union {
 		struct {
-			vec2 loc;
-			dim2 dim;
-			Color color;
-
-			std::string text;
 			menuFunc func;
 		} button;
-		struct {
-			vec2 loc;
-			dim2 dim;
-			Color color;
 
+		struct {
 			float minValue;
 			float maxValue;
             float sliderLoc;
-
-			std::string text;
 			float *var;
 		} slider;
 	//};
+
 	menuItem(){}
 	~menuItem(){
 		//button.text = NULL;
-- 
cgit v1.2.3