From 8b3c16e6152a527f9aec1a88a9eed74119de7000 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Wed, 22 Aug 2007 07:52:33 +0000 Subject: major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell --- src/engine/client/ui.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/engine/client/ui.h') diff --git a/src/engine/client/ui.h b/src/engine/client/ui.h index fb9208c1..31757b3b 100644 --- a/src/engine/client/ui.h +++ b/src/engine/client/ui.h @@ -1,12 +1,9 @@ #ifndef _UI_H #define _UI_H -/* -extern void *hot_item; -extern void *active_item; -extern void *becomming_hot_item; -extern float mouse_x, mouse_y; // in gui space -extern float mouse_wx, mouse_wy; // in world space -extern unsigned mouse_buttons;*/ + +#ifdef __cplusplus +extern "C" { +#endif int ui_update(float mx, float my, float mwx, float mwy, int buttons); @@ -30,6 +27,9 @@ typedef void (*draw_button_callback)(void *id, const char *text, int checked, fl void ui_do_image(int texture, float x, float y, float w, float h); 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); -int ui_do_button(void *id, const char *text, int checked, float x, float y, float w, float h, draw_button_callback draw_func); + +#ifdef __cplusplus +} +#endif #endif -- cgit 1.4.1