Fix compilation unit tester

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qc

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 5e98da110504c06e7a4dc433e03b4edd6e34db37..2617634af8912fad9870cbcbe726695439715177 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -152,18 +152,18 @@ void m_init_delayed()
        if (cvar_string("menu_skin") != "")
        {
                draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
-               fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
+               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
        }
        if (fh < 0 && cvar_defstring("menu_skin") != "")
        {
                cvar_set("menu_skin", cvar_defstring("menu_skin"));
                draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
-               fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
+               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
        }
        if (fh < 0)
        {
                draw_currentSkin = "gfx/menu/default";
-               fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
+               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
        }
        if (fh < 0) error("cannot load any menu skin\n");
        draw_currentSkin = strzone(draw_currentSkin);
@@ -524,12 +524,11 @@ void m_tooltip(vector pos)
        {
                float f = bound(0, frametime * 2, 1);
                menuTooltipAveragedMousePos = menuTooltipAveragedMousePos * (1 - f) + pos * f;
-               f = vlen(pos - menuTooltipAveragedMousePos);
-               if (f < 0.01)
+               if (vdist(pos - menuTooltipAveragedMousePos, <, 0.01))
                {
                        it = m_findtooltipitem(main, pos);
 
-                       if (it.instanceOfListBox && it.isScrolling(it)) it = world;
+                       if (it.instanceOfListBox && it.isScrolling(it)) it = NULL;
 
                        if (it && prev_tooltip != it.tooltip)
                        {