about summary refs log tree commit diff
path: root/src/engine/client/ui.c
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-10-06 17:01:06 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-10-06 17:01:06 +0000
commitf9162202b0ceb25fae4a0848a4a99dbe1158bd22 (patch)
tree1e6350bb0608f2a599e0a303fcf5b18aab691102 /src/engine/client/ui.c
parent449146a2753deb657e0ef641bd6065467ef75322 (diff)
downloadzcatch-f9162202b0ceb25fae4a0848a4a99dbe1158bd22.tar.gz
zcatch-f9162202b0ceb25fae4a0848a4a99dbe1158bd22.zip
fixed some C errors
Diffstat (limited to 'src/engine/client/ui.c')
-rw-r--r--src/engine/client/ui.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/engine/client/ui.c b/src/engine/client/ui.c
index eb07e7b5..434f776f 100644
--- a/src/engine/client/ui.c
+++ b/src/engine/client/ui.c
@@ -5,7 +5,6 @@
 /********************************************************
  UI                                                      
 *********************************************************/
-//static unsigned mouse_buttons_last = 0;
 
 struct pretty_font
 {
@@ -20,8 +19,8 @@ static void *hot_item = 0;
 static void *active_item = 0;
 static void *last_active_item = 0;
 static void *becomming_hot_item = 0;
-static float mouse_x, mouse_y; // in gui space
-static float mouse_wx, mouse_wy; // in world space
+static float mouse_x, mouse_y; /* in gui space */
+static float mouse_wx, mouse_wy; /* in world space */
 static unsigned mouse_buttons = 0;
 
 float ui_mouse_x() { return mouse_x; }
@@ -39,7 +38,6 @@ void *ui_last_active_item() { return last_active_item; }
 
 int ui_update(float mx, float my, float mwx, float mwy, int buttons)
 {
-    //mouse_buttons_last = mouse_buttons;
     mouse_x = mx;
     mouse_y = my;
     mouse_wx = mwx;
@@ -52,12 +50,6 @@ int ui_update(float mx, float my, float mwx, float mwy, int buttons)
     return 0;
 }
 
-/*
-static int ui_mouse_button_released(int index)
-{
-    return ((mouse_buttons_last>>index)&1) && !();
-}*/
-
 int ui_mouse_inside(float x, float y, float w, float h)
 {
     if(mouse_x >= x && mouse_x <= x+w && mouse_y >= y && mouse_y <= y+h)
@@ -72,10 +64,10 @@ void ui_do_image(int texture, float x, float y, float w, float h)
     gfx_quads_begin();
     gfx_setcolor(1,1,1,1);
     gfx_quads_setsubset(
-        0.0f, // startx
-        0.0f, // starty
-        1.0f, // endx
-        1.0f); // endy                                
+        0.0f, /* startx */
+        0.0f, /* starty */
+        1.0f, /* endx */
+        1.0f); /* endy */                              
     gfx_quads_drawTL(x,y,w,h);
     gfx_quads_end();
 }
@@ -89,7 +81,7 @@ void ui_do_label(float x, float y, const char *text, float size)
 
 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)
 {
-    // logic
+    /* logic */
     int r = 0;
     int inside = ui_mouse_inside(x,y,w,h);