about summary refs log tree commit diff
path: root/src/engine/client/ui.cpp
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-06-01 02:21:46 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-06-01 02:21:46 +0000
commit821e6bbe538421556f516c671114b7d748629661 (patch)
tree1f9d9c8b42505b9a807e94aaee191934cd7f6590 /src/engine/client/ui.cpp
parent70a971d4a99675f65a0a4de9f1baa8352e464235 (diff)
downloadzcatch-821e6bbe538421556f516c671114b7d748629661.tar.gz
zcatch-821e6bbe538421556f516c671114b7d748629661.zip
gui things
Diffstat (limited to 'src/engine/client/ui.cpp')
-rw-r--r--src/engine/client/ui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/client/ui.cpp b/src/engine/client/ui.cpp
index 85ebeaf7..8f45bf5d 100644
--- a/src/engine/client/ui.cpp
+++ b/src/engine/client/ui.cpp
@@ -1,3 +1,4 @@
+#include <baselib/system.h>
 #include <engine/interface.h>
 #include "ui.h"
 
@@ -16,7 +17,6 @@ struct pretty_font
 extern pretty_font *current_font;
 void gfx_pretty_text(float x, float y, float size, const char *text);
 
-
 static void *hot_item = 0;
 static void *active_item = 0;
 static void *becomming_hot_item = 0;
@@ -76,11 +76,11 @@ void ui_do_image(int texture, float x, float y, float w, float h)
     gfx_quads_end();
 }
 
-void ui_do_label(float x, float y, char *text)
+void ui_do_label(float x, float y, const char *text, float size)
 {
     gfx_blend_normal();
     gfx_texture_set(current_font->font_texture);
-    gfx_pretty_text(x, y, 36.f, text);
+    gfx_pretty_text(x, y, size, text);
 }
 
 int ui_do_button(void *id, const char *text, int checked, float x, float y, float w, float h, draw_button_callback draw_func, void *extra)
@@ -97,7 +97,7 @@ int ui_do_button(void *id, const char *text, int checked, float x, float y, floa
 			ui_set_active_item(id);
 	}
 
-	// this gets rid of an annoying bug :<
+	// this gets rid of an annoying bug :< (but it creates another annoying bug :O)
 	if (!inside && ui_active_item() == id && !ui_mouse_button(0))
 		ui_set_active_item(0);