todo item done: added "saveconfig" console command

[xonotic/darkplaces.git] / ui.c

diff --git a/ui.c b/ui.c
index e00fd7d60f3ef3268b738f861895a9ab5a04e8e1..bb9398e2cbd9ccca67776e574bc4ba44405c5c6a 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -23,7 +23,7 @@ static ui_item_t *ui_keyrealitem;
 static ui_t *ui_list[MAX_UI_COUNT];
 
 static void ui_start(void)
-{
+{      
        ui_mouse_x = vid.conwidth * 0.5;
        ui_mouse_y = vid.conheight * 0.5;
        ui_alive = true;
@@ -45,6 +45,7 @@ void ui_init(void)
        uimempool = Mem_AllocPool("UI");
 
        Cvar_RegisterVariable(&ui_showname);
+
        R_RegisterModule("UI", ui_start, ui_shutdown, ui_newmap);
 }
 
@@ -118,7 +119,7 @@ void ui_item
                ui->item_count++;
        }
        memset(it, 0, sizeof(ui_item_t));
-       strncpy(it->name, itemname, 32);
+       strlcpy (it->name, itemname, sizeof (it->name));
        it->flags = 0;
        if (picname || string)
        {
@@ -233,7 +234,7 @@ int ui_isactive(void)
 }
 
 #define UI_QUEUE_SIZE 256
-static byte ui_keyqueue[UI_QUEUE_SIZE];
+static qbyte ui_keyqueue[UI_QUEUE_SIZE];
 static int ui_keyqueuepos = 0;
 
 void ui_leftkeyupdate(int pressed)
@@ -405,6 +406,6 @@ void ui_draw(void)
                        DrawQ_String(it->draw_x, it->draw_y, it->draw_string, 0, 8, 8, 1, 1, 1, 1, DRAWFLAG_ADDITIVE);
 
                DrawQ_Pic(ui_mouse_x, ui_mouse_y, "ui/mousepointer.tga", 0, 0, 1, 1, 1, 1, 0);
-               //Draw_GenericPic(ui_mousepointertexture, 1, 1, 1, 1, ui_mouse_x, ui_mouse_y, 16, 16);
        }
 }
+