major update with stuff

1 files changed, 264 insertions, 196 deletions

diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index 86325ab9..05b4d047 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -5,6 +5,7 @@
 #include <stdlib.h> // atoi
 
 #include <engine/e_client_interface.h>
+#include <engine/client/graphics.h>
 
 #include <game/generated/g_protocol.hpp>
 #include <game/generated/gc_data.hpp>
@@ -43,33 +44,31 @@ bool MENUS_KEYBINDER::on_input(INPUT_EVENT e)
 	return false;
 }
 
-void MENUS::render_settings_player(RECT main_view)
+void MENUS::render_settings_player(CUIRect main_view)
 {
-	RECT button;
-	RECT skinselection;
-	ui_vsplit_l(&main_view, 300.0f, &main_view, &skinselection);
-
-
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
+	CUIRect button;
+	CUIRect othersection;
+	main_view.VSplitLeft(300.0f, &main_view, &othersection);
+	main_view.HSplitTop(20.0f, &button, &main_view);
 
 	// render settings
 	{	
 		char buf[128];
 		
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
+		main_view.HSplitTop(20.0f, &button, &main_view);
 		str_format(buf, sizeof(buf), "%s:", localize("Name"));
-		ui_do_label(&button, buf, 14.0, -1);
-		ui_vsplit_l(&button, 80.0f, 0, &button);
-		ui_vsplit_l(&button, 180.0f, &button, 0);
-		if(ui_do_edit_box(config.player_name, &button, config.player_name, sizeof(config.player_name), 14.0f))
+		UI()->DoLabel(&button, buf, 14.0, -1);
+		button.VSplitLeft(80.0f, 0, &button);
+		button.VSplitLeft(180.0f, &button, 0);
+		if(DoEditBox(config.player_name, &button, config.player_name, sizeof(config.player_name), 14.0f))
 			need_sendinfo = true;
 
 		// extra spacing
-		ui_hsplit_t(&main_view, 10.0f, 0, &main_view);
+		main_view.HSplitTop(10.0f, 0, &main_view);
 
 		static int dynamic_camera_button = 0;
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if(ui_do_button(&dynamic_camera_button, localize("Dynamic Camera"), config.cl_mouse_deadzone != 0, &button, ui_draw_checkbox, 0))
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		if(DoButton_CheckBox(&dynamic_camera_button, localize("Dynamic Camera"), config.cl_mouse_deadzone != 0, &button))
 		{
 			
 			if(config.cl_mouse_deadzone)
@@ -86,26 +85,26 @@ void MENUS::render_settings_player(RECT main_view)
 			}
 		}
 
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if (ui_do_button(&config.cl_autoswitch_weapons, localize("Switch weapon on pickup"), config.cl_autoswitch_weapons, &button, ui_draw_checkbox, 0))
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		if(DoButton_CheckBox(&config.cl_autoswitch_weapons, localize("Switch weapon on pickup"), config.cl_autoswitch_weapons, &button))
 			config.cl_autoswitch_weapons ^= 1;
 			
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if (ui_do_button(&config.cl_nameplates, localize("Show name plates"), config.cl_nameplates, &button, ui_draw_checkbox, 0))
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		if(DoButton_CheckBox(&config.cl_nameplates, localize("Show name plates"), config.cl_nameplates, &button))
 			config.cl_nameplates ^= 1;
 
 		//if(config.cl_nameplates)
 		{
-			ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-			ui_vsplit_l(&button, 15.0f, 0, &button);
-			if (ui_do_button(&config.cl_nameplates_always, localize("Always show name plates"), config.cl_nameplates_always, &button, ui_draw_checkbox, 0))
+			main_view.HSplitTop(20.0f, &button, &main_view);
+			button.VSplitLeft(15.0f, 0, &button);
+			if(DoButton_CheckBox(&config.cl_nameplates_always, localize("Always show name plates"), config.cl_nameplates_always, &button))
 				config.cl_nameplates_always ^= 1;
 		}
 			
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
+		main_view.HSplitTop(20.0f, &button, &main_view);
 		
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if (ui_do_button(&config.player_color_body, localize("Custom colors"), config.player_use_custom_color, &button, ui_draw_checkbox, 0))
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		if(DoButton_CheckBox(&config.player_color_body, localize("Custom colors"), config.player_use_custom_color, &button))
 		{
 			config.player_use_custom_color = config.player_use_custom_color?0:1;
 			need_sendinfo = true;
@@ -129,27 +128,27 @@ void MENUS::render_settings_player(RECT main_view)
 				
 			for(int i = 0; i < 2; i++)
 			{
-				RECT text;
-				ui_hsplit_t(&main_view, 20.0f, &text, &main_view);
-				ui_vsplit_l(&text, 15.0f, 0, &text);
-				ui_do_label(&text, parts[i], 14.0f, -1);
+				CUIRect text;
+				main_view.HSplitTop(20.0f, &text, &main_view);
+				text.VSplitLeft(15.0f, 0, &text);
+				UI()->DoLabel(&text, parts[i], 14.0f, -1);
 				
 				int prevcolor = *colors[i];
 				int color = 0;
 				for(int s = 0; s < 3; s++)
 				{
-					RECT text;
-					ui_hsplit_t(&main_view, 19.0f, &button, &main_view);
-					ui_vsplit_l(&button, 30.0f, 0, &button);
-					ui_vsplit_l(&button, 70.0f, &text, &button);
-					ui_vsplit_r(&button, 5.0f, &button, 0);
-					ui_hsplit_t(&button, 4.0f, 0, &button);
+					CUIRect text;
+					main_view.HSplitTop(19.0f, &button, &main_view);
+					button.VSplitLeft(30.0f, 0, &button);
+					button.VSplitLeft(70.0f, &text, &button);
+					button.VSplitRight(5.0f, &button, 0);
+					button.HSplitTop(4.0f, 0, &button);
 					
 					float k = ((prevcolor>>((2-s)*8))&0xff)  / 255.0f;
-					k = ui_do_scrollbar_h(&color_slider[i][s], &button, k);
+					k = DoScrollbarH(&color_slider[i][s], &button, k);
 					color <<= 8;
 					color += clamp((int)(k*255), 0, 255);
-					ui_do_label(&text, labels[s], 15.0f, -1);
+					UI()->DoLabel(&text, labels[s], 15.0f, -1);
 					 
 				}
 		
@@ -157,35 +156,103 @@ void MENUS::render_settings_player(RECT main_view)
 					need_sendinfo = true;
 					
 				*colors[i] = color;
-				ui_hsplit_t(&main_view, 5.0f, 0, &main_view);
+				main_view.HSplitTop(5.0f, 0, &main_view);
 			}
 		}
+		
+		// render skinselector
+		static int skinselector_id = 0;		
+		ui_do_listbox_start(&skinselector_id, &main_view, 50, localize("Skins"), (gameclient.skins->num()+3)/4, 0);
+
+		for(int skin_id = 0; skin_id < gameclient.skins->num(); )
+		{
+			LISTBOXITEM item = ui_do_listbox_nextrow();
+			CUIRect boxes[4];
+			CUIRect first_half, second_half;
+			item.rect.VSplitMid(&first_half, &second_half);
+			first_half.VSplitMid(&boxes[0], &boxes[1]);
+			second_half.VSplitMid(&boxes[2], &boxes[3]);
+			
+			for(int i = 0; i < 4 && skin_id < gameclient.skins->num(); i++, skin_id++)
+			{
+				//CUIRect r = item.
+				const SKINS::SKIN *s = gameclient.skins->get(skin_id);
+
+				TEE_RENDER_INFO info;
+				info.texture = s->org_texture;
+				info.color_body = vec4(1,1,1,1);
+				info.color_feet = vec4(1,1,1,1);
+				if(config.player_use_custom_color)
+				{
+					info.color_body = gameclient.skins->get_color(config.player_color_body);
+					info.color_feet = gameclient.skins->get_color(config.player_color_feet);
+					info.texture = s->color_texture;
+				}
+					
+				info.size = UI()->Scale()*50.0f;
+				
+				CUIRect icon = boxes[i]; //item.rect;
+				//button.VSplitLeft(50.0f, &icon, &text);
+				
+				/*if(UI()->DoButton(s, "", selected, &button, ui_draw_list_row, 0))
+				{
+					config_set_player_skin(&config, s->name);
+					need_sendinfo = true;
+				}*/
+
+				//text.HSplitTop(12.0f, 0, &text); // some margin from the top
+				//UI()->DoLabel(&text, buf, 18.0f, 0);
+				
+				icon.HSplitTop(5.0f, 0, &icon); // some margin from the top
+				RenderTools()->RenderTee(ANIMSTATE::get_idle(), &info, 0, vec2(1, 0), vec2(icon.x+icon.w/2, icon.y+icon.h/2));
+				
+				if(config.debug)
+				{
+					Graphics()->TextureSet(-1);
+					Graphics()->QuadsBegin();
+					Graphics()->SetColor(s->blood_color.r, s->blood_color.g, s->blood_color.b, 1.0f);
+					Graphics()->QuadsDrawTL(icon.x, icon.y, 12, 12);
+					Graphics()->QuadsEnd();
+				}
+			}
+		}
+		
+		int new_selection = ui_do_listbox_end();
+		(void)new_selection;
+		//main_view
+	}
+	
+	// render skinselector
+	/*
+	{
+		
+		//othersection
 	}
 		
 	// draw header
-	RECT header, footer;
-	ui_hsplit_t(&skinselection, 20, &header, &skinselection);
-	ui_draw_rect(&header, vec4(1,1,1,0.25f), CORNER_T, 5.0f); 
-	ui_do_label(&header, localize("Skins"), 18.0f, 0);
+	CUIRect header, footer;
+	skinselection.HSplitTop(20, &header, &skinselection);
+	RenderTools()->DrawUIRect(&header, vec4(1,1,1,0.25f), CUI::CORNER_T, 5.0f); 
+	UI()->DoLabel(&header, localize("Skins"), 18.0f, 0);
 
 	// draw footers	
-	ui_hsplit_b(&skinselection, 20, &skinselection, &footer);
-	ui_draw_rect(&footer, vec4(1,1,1,0.25f), CORNER_B, 5.0f); 
-	ui_vsplit_l(&footer, 10.0f, 0, &footer);
+	skinselection.HSplitBottom(20, &skinselection, &footer);
+	RenderTools()->DrawUIRect(&footer, vec4(1,1,1,0.25f), CUI::CORNER_B, 5.0f); 
+	footer.VSplitLeft(10.0f, 0, &footer);
 
 	// modes
-	ui_draw_rect(&skinselection, vec4(0,0,0,0.15f), 0, 0);
+	RenderTools()->DrawUIRect(&skinselection, vec4(0,0,0,0.15f), 0, 0);
 
-	RECT scroll;
-	ui_vsplit_r(&skinselection, 15, &skinselection, &scroll);
+	CUIRect scroll;
+	skinselection.VSplitRight(15, &skinselection, &scroll);
 
-	RECT list = skinselection;
-	ui_hsplit_t(&list, 50, &button, &list);
+	CUIRect list = skinselection;
+	list.HSplitTop(50, &button, &list);
 	
 	int num = (int)(skinselection.h/button.h);
 	static float scrollvalue = 0;
 	static int scrollbar = 0;
-	ui_hmargin(&scroll, 5.0f, &scroll);
+	scroll.HMargin(5.0f, &scroll);
 	scrollvalue = ui_do_scrollbar_v(&scrollbar, &scroll, scrollvalue);
 
 	int start = (int)((gameclient.skins->num()-num)*scrollvalue);
@@ -220,35 +287,35 @@ void MENUS::render_settings_player(RECT main_view)
 			info.texture = s->color_texture;
 		}
 			
-		info.size = ui_scale()*50.0f;
+		info.size = UI()->Scale()*50.0f;
 		
-		RECT icon;
-		RECT text;
-		ui_vsplit_l(&button, 50.0f, &icon, &text);
+		CUIRect icon;
+		CUIRect text;
+		button.VSplitLeft(50.0f, &icon, &text);
 		
-		if(ui_do_button(s, "", selected, &button, ui_draw_list_row, 0))
+		if(UI()->DoButton(s, "", selected, &button, ui_draw_list_row, 0))
 		{
 			config_set_player_skin(&config, s->name);
 			need_sendinfo = true;
 		}
 
-		ui_hsplit_t(&text, 12.0f, 0, &text); // some margin from the top
-		ui_do_label(&text, buf, 18.0f, 0);
+		text.HSplitTop(12.0f, 0, &text); // some margin from the top
+		UI()->DoLabel(&text, buf, 18.0f, 0);
 		
-		ui_hsplit_t(&icon, 5.0f, 0, &icon); // some margin from the top
-		render_tee(ANIMSTATE::get_idle(), &info, 0, vec2(1, 0), vec2(icon.x+icon.w/2, icon.y+icon.h/2));
+		icon.HSplitTop(5.0f, 0, &icon); // some margin from the top
+		RenderTools()->RenderTee(ANIMSTATE::get_idle(), &info, 0, vec2(1, 0), vec2(icon.x+icon.w/2, icon.y+icon.h/2));
 		
 		if(config.debug)
 		{
-			gfx_texture_set(-1);
-			gfx_quads_begin();
-			gfx_setcolor(s->blood_color.r, s->blood_color.g, s->blood_color.b, 1.0f);
-			gfx_quads_drawTL(icon.x, icon.y, 12, 12);
-			gfx_quads_end();
+			Graphics()->TextureSet(-1);
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(s->blood_color.r, s->blood_color.g, s->blood_color.b, 1.0f);
+			Graphics()->QuadsDrawTL(icon.x, icon.y, 12, 12);
+			Graphics()->QuadsEnd();
 		}
 		
-		ui_hsplit_t(&list, 50, &button, &list);
-	}
+		list.HSplitTop(50, &button, &list);
+	}*/
 }
 
 typedef void (*assign_func_callback)(CONFIGURATION *config, int value);
@@ -288,31 +355,31 @@ static KEYINFO keys[] =
 
 const int key_count = sizeof(keys) / sizeof(KEYINFO);
 
-void MENUS::ui_do_getbuttons(int start, int stop, RECT view)
+void MENUS::ui_do_getbuttons(int start, int stop, CUIRect view)
 {
 	for (int i = start; i < stop; i++)
 	{
 		KEYINFO &key = keys[i];
-		RECT button, label;
-		ui_hsplit_t(&view, 20.0f, &button, &view);
-		ui_vsplit_l(&button, 130.0f, &label, &button);
+		CUIRect button, label;
+		view.HSplitTop(20.0f, &button, &view);
+		button.VSplitLeft(130.0f, &label, &button);
 	
 		char buf[64];
 		str_format(buf, sizeof(buf), "%s:", (const char *)key.name);
 		
-		ui_do_label(&label, key.name, 14.0f, -1);
+		UI()->DoLabel(&label, key.name, 14.0f, -1);
 		int oldid = key.keyid;
-		int newid = ui_do_key_reader((void *)&keys[i].name, &button, oldid);
+		int newid = DoKeyReader((void *)&keys[i].name, &button, oldid);
 		if(newid != oldid)
 		{
 			gameclient.binds->bind(oldid, "");
 			gameclient.binds->bind(newid, keys[i].command);
 		}
-		ui_hsplit_t(&view, 5.0f, 0, &view);
+		view.HSplitTop(5.0f, 0, &view);
 	}
 }
 
-void MENUS::render_settings_controls(RECT main_view)
+void MENUS::render_settings_controls(CUIRect main_view)
 {
 	// this is kinda slow, but whatever
 	for(int i = 0; i < key_count; i++)
@@ -332,28 +399,28 @@ void MENUS::render_settings_controls(RECT main_view)
 			}
 	}
 
-	RECT movement_settings, weapon_settings, voting_settings, chat_settings, misc_settings, reset_button;
-	ui_vsplit_l(&main_view, main_view.w/2-5.0f, &movement_settings, &voting_settings);
+	CUIRect movement_settings, weapon_settings, voting_settings, chat_settings, misc_settings, reset_button;
+	main_view.VSplitLeft(main_view.w/2-5.0f, &movement_settings, &voting_settings);
 	
 	/* movement settings */
 	{
-		ui_hsplit_t(&movement_settings, main_view.h/2-5.0f, &movement_settings, &weapon_settings);
-		ui_draw_rect(&movement_settings, vec4(1,1,1,0.25f), CORNER_ALL, 10.0f);
-		ui_margin(&movement_settings, 10.0f, &movement_settings);
+		movement_settings.HSplitTop(main_view.h/2-5.0f, &movement_settings, &weapon_settings);
+		RenderTools()->DrawUIRect(&movement_settings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
+		movement_settings.Margin(10.0f, &movement_settings);
 		
 		gfx_text(0, movement_settings.x, movement_settings.y, 14, localize("Movement"), -1);
 		
-		ui_hsplit_t(&movement_settings, 14.0f+5.0f+10.0f, 0, &movement_settings);
+		movement_settings.HSplitTop(14.0f+5.0f+10.0f, 0, &movement_settings);
 		
 		{
-			RECT button, label;
-			ui_hsplit_t(&movement_settings, 20.0f, &button, &movement_settings);
-			ui_vsplit_l(&button, 130.0f, &label, &button);
-			ui_do_label(&label, localize("Mouse sens."), 14.0f, -1);
-			ui_hmargin(&button, 2.0f, &button);
-			config.inp_mousesens = (int)(ui_do_scrollbar_h(&config.inp_mousesens, &button, (config.inp_mousesens-5)/500.0f)*500.0f)+5;
+			CUIRect button, label;
+			movement_settings.HSplitTop(20.0f, &button, &movement_settings);
+			button.VSplitLeft(130.0f, &label, &button);
+			UI()->DoLabel(&label, localize("Mouse sens."), 14.0f, -1);
+			button.HMargin(2.0f, &button);
+			config.inp_mousesens = (int)(DoScrollbarV(&config.inp_mousesens, &button, (config.inp_mousesens-5)/500.0f)*500.0f)+5;
 			//*key.key = ui_do_key_reader(key.key, &button, *key.key);
-			ui_hsplit_t(&movement_settings, 20.0f, 0, &movement_settings);
+			movement_settings.HSplitTop(20.0f, 0, &movement_settings);
 		}
 		
 		ui_do_getbuttons(0, 5, movement_settings);
@@ -362,65 +429,65 @@ void MENUS::render_settings_controls(RECT main_view)
 	
 	/* weapon settings */
 	{
-		ui_hsplit_t(&weapon_settings, 10.0f, 0, &weapon_settings);
-		ui_draw_rect(&weapon_settings, vec4(1,1,1,0.25f), CORNER_ALL, 10.0f);
-		ui_margin(&weapon_settings, 10.0f, &weapon_settings);
+		weapon_settings.HSplitTop(10.0f, 0, &weapon_settings);
+		RenderTools()->DrawUIRect(&weapon_settings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
+		weapon_settings.Margin(10.0f, &weapon_settings);
 
 		gfx_text(0, weapon_settings.x, weapon_settings.y, 14, localize("Weapon"), -1);
 		
-		ui_hsplit_t(&weapon_settings, 14.0f+5.0f+10.0f, 0, &weapon_settings);
+		weapon_settings.HSplitTop(14.0f+5.0f+10.0f, 0, &weapon_settings);
 		ui_do_getbuttons(5, 12, weapon_settings);
 	}
 	
 	/* voting settings */
 	{
-		ui_vsplit_l(&voting_settings, 10.0f, 0, &voting_settings);
-		ui_hsplit_t(&voting_settings, main_view.h/4-5.0f, &voting_settings, &chat_settings);
-		ui_draw_rect(&voting_settings, vec4(1,1,1,0.25f), CORNER_ALL, 10.0f);
-		ui_margin(&voting_settings, 10.0f, &voting_settings);
+		voting_settings.VSplitLeft(10.0f, 0, &voting_settings);
+		voting_settings.HSplitTop(main_view.h/4-5.0f, &voting_settings, &chat_settings);
+		RenderTools()->DrawUIRect(&voting_settings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
+		voting_settings.Margin(10.0f, &voting_settings);
 	
 		gfx_text(0, voting_settings.x, voting_settings.y, 14, localize("Voting"), -1);
 		
-		ui_hsplit_t(&voting_settings, 14.0f+5.0f+10.0f, 0, &voting_settings);
+		voting_settings.HSplitTop(14.0f+5.0f+10.0f, 0, &voting_settings);
 		ui_do_getbuttons(12, 14, voting_settings);
 	}
 	
 	/* chat settings */
 	{
-		ui_hsplit_t(&chat_settings, 10.0f, 0, &chat_settings);
-		ui_hsplit_t(&chat_settings, main_view.h/4-10.0f, &chat_settings, &misc_settings);
-		ui_draw_rect(&chat_settings, vec4(1,1,1,0.25f), CORNER_ALL, 10.0f);
-		ui_margin(&chat_settings, 10.0f, &chat_settings);
+		chat_settings.HSplitTop(10.0f, 0, &chat_settings);
+		chat_settings.HSplitTop(main_view.h/4-10.0f, &chat_settings, &misc_settings);
+		RenderTools()->DrawUIRect(&chat_settings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
+		chat_settings.Margin(10.0f, &chat_settings);
 	
 		gfx_text(0, chat_settings.x, chat_settings.y, 14, localize("Chat"), -1);
 		
-		ui_hsplit_t(&chat_settings, 14.0f+5.0f+10.0f, 0, &chat_settings);
+		chat_settings.HSplitTop(14.0f+5.0f+10.0f, 0, &chat_settings);
 		ui_do_getbuttons(14, 16, chat_settings);
 	}
 	
 	/* misc settings */
 	{
-		ui_hsplit_t(&misc_settings, 10.0f, 0, &misc_settings);
-		ui_hsplit_t(&misc_settings, main_view.h/2-5.0f-45.0f, &misc_settings, &reset_button);
-		ui_draw_rect(&misc_settings, vec4(1,1,1,0.25f), CORNER_ALL, 10.0f);
-		ui_margin(&misc_settings, 10.0f, &misc_settings);
+		misc_settings.HSplitTop(10.0f, 0, &misc_settings);
+		misc_settings.HSplitTop(main_view.h/2-5.0f-45.0f, &misc_settings, &reset_button);
+		RenderTools()->DrawUIRect(&misc_settings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
+		misc_settings.Margin(10.0f, &misc_settings);
 	
 		gfx_text(0, misc_settings.x, misc_settings.y, 14, localize("Miscellaneous"), -1);
 		
-		ui_hsplit_t(&misc_settings, 14.0f+5.0f+10.0f, 0, &misc_settings);
+		misc_settings.HSplitTop(14.0f+5.0f+10.0f, 0, &misc_settings);
 		ui_do_getbuttons(16, 21, misc_settings);
 	}
 	
 	// defaults
-	ui_hsplit_t(&reset_button, 10.0f, 0, &reset_button);
+	reset_button.HSplitTop(10.0f, 0, &reset_button);
 	static int default_button = 0;
-	if (ui_do_button((void*)&default_button, localize("Reset to defaults"), 0, &reset_button, ui_draw_menu_button, 0))
+	if(DoButton_Menu((void*)&default_button, localize("Reset to defaults"), 0, &reset_button))
 		gameclient.binds->set_defaults();
 }
 
-void MENUS::render_settings_graphics(RECT main_view)
+void MENUS::render_settings_graphics(CUIRect main_view)
 {
-	RECT button;
+	CUIRect button;
 	char buf[128];
 	
 	static const int MAX_RESOLUTIONS = 256;
@@ -430,44 +497,44 @@ void MENUS::render_settings_graphics(RECT main_view)
 	if(num_modes == -1)
 		num_modes = gfx_get_video_modes(modes, MAX_RESOLUTIONS);
 	
-	RECT modelist;
-	ui_vsplit_l(&main_view, 300.0f, &main_view, &modelist);
+	CUIRect modelist;
+	main_view.VSplitLeft(300.0f, &main_view, &modelist);
 	
 	// draw allmodes switch
-	RECT header, footer;
-	ui_hsplit_t(&modelist, 20, &button, &modelist);
-	if (ui_do_button(&config.gfx_display_all_modes, localize("Show only supported"), config.gfx_display_all_modes^1, &button, ui_draw_checkbox, 0))
+	CUIRect header, footer;
+	modelist.HSplitTop(20, &button, &modelist);
+	if(DoButton_CheckBox(&config.gfx_display_all_modes, localize("Show only supported"), config.gfx_display_all_modes^1, &button))
 	{
 		config.gfx_display_all_modes ^= 1;
 		num_modes = gfx_get_video_modes(modes, MAX_RESOLUTIONS);
 	}
 	
 	// draw header
-	ui_hsplit_t(&modelist, 20, &header, &modelist);
-	ui_draw_rect(&header, vec4(1,1,1,0.25f), CORNER_T, 5.0f); 
-	ui_do_label(&header, localize("Display Modes"), 14.0f, 0);
+	modelist.HSplitTop(20, &header, &modelist);
+	RenderTools()->DrawUIRect(&header, vec4(1,1,1,0.25f), CUI::CORNER_T, 5.0f); 
+	UI()->DoLabel(&header, localize("Display Modes"), 14.0f, 0);
 
 	// draw footers	
-	ui_hsplit_b(&modelist, 20, &modelist, &footer);
+	modelist.HSplitBottom(20, &modelist, &footer);
 	str_format(buf, sizeof(buf), "%s: %dx%d %d bit", localize("Current"), config.gfx_screen_width, config.gfx_screen_height, config.gfx_color_depth);
-	ui_draw_rect(&footer, vec4(1,1,1,0.25f), CORNER_B, 5.0f); 
-	ui_vsplit_l(&footer, 10.0f, 0, &footer);
-	ui_do_label(&footer, buf, 14.0f, -1);
+	RenderTools()->DrawUIRect(&footer, vec4(1,1,1,0.25f), CUI::CORNER_B, 5.0f); 
+	footer.VSplitLeft(10.0f, 0, &footer);
+	UI()->DoLabel(&footer, buf, 14.0f, -1);
 
 	// modes
-	ui_draw_rect(&modelist, vec4(0,0,0,0.15f), 0, 0);
+	RenderTools()->DrawUIRect(&modelist, vec4(0,0,0,0.15f), 0, 0);
 
-	RECT scroll;
-	ui_vsplit_r(&modelist, 15, &modelist, &scroll);
+	CUIRect scroll;
+	modelist.VSplitRight(15, &modelist, &scroll);
 
-	RECT list = modelist;
-	ui_hsplit_t(&list, 20, &button, &list);
+	CUIRect list = modelist;
+	list.HSplitTop(20, &button, &list);
 	
 	int num = (int)(modelist.h/button.h);
 	static float scrollvalue = 0;
 	static int scrollbar = 0;
-	ui_hmargin(&scroll, 5.0f, &scroll);
-	scrollvalue = ui_do_scrollbar_v(&scrollbar, &scroll, scrollvalue);
+	scroll.HMargin(5.0f, &scroll);
+	scrollvalue = DoScrollbarV(&scrollbar, &scroll, scrollvalue);
 
 	int start = (int)((num_modes-num)*scrollvalue);
 	if(start < 0)
@@ -490,7 +557,7 @@ void MENUS::render_settings_graphics(RECT main_view)
 		}
 		
 		str_format(buf, sizeof(buf), "  %dx%d %d bit", modes[i].width, modes[i].height, depth);
-		if(ui_do_button(&modes[i], buf, selected, &button, ui_draw_list_row, 0))
+		if(DoButton_ListRow(&modes[i], buf, selected, &button))
 		{
 			config.gfx_color_depth = depth;
 			config.gfx_screen_width = modes[i].width;
@@ -499,58 +566,58 @@ void MENUS::render_settings_graphics(RECT main_view)
 				need_restart = true;
 		}
 		
-		ui_hsplit_t(&list, 20, &button, &list);
+		list.HSplitTop(20, &button, &list);
 	}
 	
 	
 	// switches
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_fullscreen, localize("Fullscreen"), config.gfx_fullscreen, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.gfx_fullscreen, localize("Fullscreen"), config.gfx_fullscreen, &button))
 	{
 		config.gfx_fullscreen ^= 1;
 		need_restart = true;
 	}
 
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_vsync, localize("V-Sync"), config.gfx_vsync, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.gfx_vsync, localize("V-Sync"), config.gfx_vsync, &button))
 	{
 		config.gfx_vsync ^= 1;
 		need_restart = true;
 	}
 
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_fsaa_samples, localize("FSAA samples"), config.gfx_fsaa_samples, &button, ui_draw_checkbox_number, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox_Number(&config.gfx_fsaa_samples, localize("FSAA samples"), config.gfx_fsaa_samples, &button))
 	{
 		config.gfx_fsaa_samples = (config.gfx_fsaa_samples+1)%17;
 		need_restart = true;
 	}
 		
-	ui_hsplit_t(&main_view, 40.0f, &button, &main_view);
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_texture_quality, localize("Quality Textures"), config.gfx_texture_quality, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(40.0f, &button, &main_view);
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.gfx_texture_quality, localize("Quality Textures"), config.gfx_texture_quality, &button))
 	{
 		config.gfx_texture_quality ^= 1;
 		need_restart = true;
 	}
 
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_texture_compression, localize("Texture Compression"), config.gfx_texture_compression, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.gfx_texture_compression, localize("Texture Compression"), config.gfx_texture_compression, &button))
 	{
 		config.gfx_texture_compression ^= 1;
 		need_restart = true;
 	}
 
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.gfx_high_detail, localize("High Detail"), config.gfx_high_detail, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.gfx_high_detail, localize("High Detail"), config.gfx_high_detail, &button))
 		config.gfx_high_detail ^= 1;
 
 	//
 	
-	RECT text;
-	ui_hsplit_t(&main_view, 20.0f, 0, &main_view);
-	ui_hsplit_t(&main_view, 20.0f, &text, &main_view);
-	//ui_vsplit_l(&text, 15.0f, 0, &text);
-	ui_do_label(&text, localize("UI Color"), 14.0f, -1);
+	CUIRect text;
+	main_view.HSplitTop(20.0f, 0, &main_view);
+	main_view.HSplitTop(20.0f, &text, &main_view);
+	//text.VSplitLeft(15.0f, 0, &text);
+	UI()->DoLabel(&text, localize("UI Color"), 14.0f, -1);
 	
 	const char *labels[] = {
 		localize("Hue"),
@@ -560,27 +627,27 @@ void MENUS::render_settings_graphics(RECT main_view)
 	int *color_slider[4] = {&config.ui_color_hue, &config.ui_color_sat, &config.ui_color_lht, &config.ui_color_alpha};
 	for(int s = 0; s < 4; s++)
 	{
-		RECT text;
-		ui_hsplit_t(&main_view, 19.0f, &button, &main_view);
-		ui_vmargin(&button, 15.0f, &button);
-		ui_vsplit_l(&button, 50.0f, &text, &button);
-		ui_vsplit_r(&button, 5.0f, &button, 0);
-		ui_hsplit_t(&button, 4.0f, 0, &button);
+		CUIRect text;
+		main_view.HSplitTop(19.0f, &button, &main_view);
+		button.VMargin(15.0f, &button);
+		button.VSplitLeft(50.0f, &text, &button);
+		button.VSplitRight(5.0f, &button, 0);
+		button.HSplitTop(4.0f, 0, &button);
 		
 		float k = (*color_slider[s]) / 255.0f;
-		k = ui_do_scrollbar_h(color_slider[s], &button, k);
+		k = DoScrollbarH(color_slider[s], &button, k);
 		*color_slider[s] = (int)(k*255.0f);
-		ui_do_label(&text, labels[s], 15.0f, -1);
+		UI()->DoLabel(&text, labels[s], 15.0f, -1);
 	}		
 }
 
-void MENUS::render_settings_sound(RECT main_view)
+void MENUS::render_settings_sound(CUIRect main_view)
 {
-	RECT button;
-	ui_vsplit_l(&main_view, 300.0f, &main_view, 0);
+	CUIRect button;
+	main_view.VSplitLeft(300.0f, &main_view, 0);
 	
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.snd_enable, localize("Use sounds"), config.snd_enable, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.snd_enable, localize("Use sounds"), config.snd_enable, &button))
 	{
 		config.snd_enable ^= 1;
 		need_restart = true;
@@ -589,19 +656,19 @@ void MENUS::render_settings_sound(RECT main_view)
 	if(!config.snd_enable)
 		return;
 	
-	ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-	if (ui_do_button(&config.snd_nonactive_mute, localize("Mute when not active"), config.snd_nonactive_mute, &button, ui_draw_checkbox, 0))
+	main_view.HSplitTop(20.0f, &button, &main_view);
+	if(DoButton_CheckBox(&config.snd_nonactive_mute, localize("Mute when not active"), config.snd_nonactive_mute, &button))
 		config.snd_nonactive_mute ^= 1;
 		
 	// sample rate box
 	{
 		char buf[64];
 		str_format(buf, sizeof(buf), "%d", config.snd_rate);
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		ui_do_label(&button, localize("Sample rate"), 14.0f, -1);
-		ui_vsplit_l(&button, 110.0f, 0, &button);
-		ui_vsplit_l(&button, 180.0f, &button, 0);
-		ui_do_edit_box(&config.snd_rate, &button, buf, sizeof(buf), 14.0f);
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		UI()->DoLabel(&button, localize("Sample rate"), 14.0f, -1);
+		button.VSplitLeft(110.0f, 0, &button);
+		button.VSplitLeft(180.0f, &button, 0);
+		DoEditBox(&config.snd_rate, &button, buf, sizeof(buf), 14.0f);
 		int before = config.snd_rate;
 		config.snd_rate = atoi(buf);
 		
@@ -614,14 +681,14 @@ void MENUS::render_settings_sound(RECT main_view)
 	
 	// volume slider
 	{
-		RECT button, label;
-		ui_hsplit_t(&main_view, 5.0f, &button, &main_view);
-		ui_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		ui_vsplit_l(&button, 110.0f, &label, &button);
-		ui_hmargin(&button, 2.0f, &button);
-		ui_do_label(&label, localize("Sound volume"), 14.0f, -1);
-		config.snd_volume = (int)(ui_do_scrollbar_h(&config.snd_volume, &button, config.snd_volume/100.0f)*100.0f);
-		ui_hsplit_t(&main_view, 20.0f, 0, &main_view);
+		CUIRect button, label;
+		main_view.HSplitTop(5.0f, &button, &main_view);
+		main_view.HSplitTop(20.0f, &button, &main_view);
+		button.VSplitLeft(110.0f, &label, &button);
+		button.HMargin(2.0f, &button);
+		UI()->DoLabel(&label, localize("Sound volume"), 14.0f, -1);
+		config.snd_volume = (int)(DoScrollbarH(&config.snd_volume, &button, config.snd_volume/100.0f)*100.0f);
+		main_view.HSplitTop(20.0f, 0, &main_view);
 	}
 }
 
@@ -660,7 +727,7 @@ void gather_languages(const char *name, int is_dir, void *user)
 	languages.add(LANGUAGE(nicename, filename));
 }
 
-void MENUS::render_settings_general(RECT main_view)
+void MENUS::render_settings_general(CUIRect main_view)
 {
 	static int lanuagelist = 0;
 	static int selected_language = 0;
@@ -680,7 +747,7 @@ void MENUS::render_settings_general(RECT main_view)
 	
 	int old_selected = selected_language;
 	
-	RECT list = main_view;
+	CUIRect list = main_view;
 	ui_do_listbox_start(&lanuagelist, &list, 24.0f, localize("Language"), languages.size(), selected_language);
 	
 	for(sorted_array<LANGUAGE>::range r = languages.all(); !r.empty(); r.pop_front())
@@ -688,7 +755,7 @@ void MENUS::render_settings_general(RECT main_view)
 		LISTBOXITEM item = ui_do_listbox_nextitem(&r.front());
 		
 		if(item.visible)
-			ui_do_label(&item.rect, r.front().name, 16.0f, -1);
+			UI()->DoLabel(&item.rect, r.front().name, 16.0f, -1);
 	}
 	
 	selected_language = ui_do_listbox_end();
@@ -700,20 +767,20 @@ void MENUS::render_settings_general(RECT main_view)
 	}
 }
 
-void MENUS::render_settings(RECT main_view)
+void MENUS::render_settings(CUIRect main_view)
 {
 	static int settings_page = 0;
 	
 	// render background
-	RECT temp, tabbar;
-	ui_vsplit_r(&main_view, 120.0f, &main_view, &tabbar);
-	ui_draw_rect(&main_view, color_tabbar_active, CORNER_B|CORNER_TL, 10.0f);
-	ui_hsplit_t(&tabbar, 50.0f, &temp, &tabbar);
-	ui_draw_rect(&temp, color_tabbar_active, CORNER_R, 10.0f);
+	CUIRect temp, tabbar;
+	main_view.VSplitRight(120.0f, &main_view, &tabbar);
+	RenderTools()->DrawUIRect(&main_view, color_tabbar_active, CUI::CORNER_B|CUI::CORNER_TL, 10.0f);
+	tabbar.HSplitTop(50.0f, &temp, &tabbar);
+	RenderTools()->DrawUIRect(&temp, color_tabbar_active, CUI::CORNER_R, 10.0f);
 	
-	ui_hsplit_t(&main_view, 10.0f, 0, &main_view);
+	main_view.HSplitTop(10.0f, 0, &main_view);
 	
-	RECT button;
+	CUIRect button;
 	
 	const char *tabs[] = {
 		localize("General"),
@@ -721,17 +788,18 @@ void MENUS::render_settings(RECT main_view)
 		localize("Controls"),
 		localize("Graphics"),
 		localize("Sound")};
+		
 	int num_tabs = (int)(sizeof(tabs)/sizeof(*tabs));
 
 	for(int i = 0; i < num_tabs; i++)
 	{
-		ui_hsplit_t(&tabbar, 10, &button, &tabbar);
-		ui_hsplit_t(&tabbar, 26, &button, &tabbar);
-		if(ui_do_button(tabs[i], tabs[i], settings_page == i, &button, ui_draw_settings_tab_button, 0))
+		tabbar.HSplitTop(10, &button, &tabbar);
+		tabbar.HSplitTop(26, &button, &tabbar);
+		if(DoButton_SettingsTab(tabs[i], tabs[i], settings_page == i, &button))
 			settings_page = i;
 	}
 	
-	ui_margin(&main_view, 10.0f, &main_view);
+	main_view.Margin(10.0f, &main_view);
 	
 	if(settings_page == 0)
 		render_settings_general(main_view);
@@ -746,8 +814,8 @@ void MENUS::render_settings(RECT main_view)
 
 	if(need_restart)
 	{
-		RECT restart_warning;
-		ui_hsplit_b(&main_view, 40, &main_view, &restart_warning);
-		ui_do_label(&restart_warning, localize("You must restart the game for all settings to take effect."), 15.0f, -1, 220);
+		CUIRect restart_warning;
+		main_view.HSplitBottom(40, &main_view, &restart_warning);
+		UI()->DoLabel(&restart_warning, localize("You must restart the game for all settings to take effect."), 15.0f, -1, 220);
 	}
 }