X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qc;h=aa771649d663fa705e6980d4870ef3d5174624b0;hb=4a82dec0e0b84e3ab88f8dc64abbb0af55e86d75;hp=1e4caf78a0972fcea91f2b5e32a04a2150d8508e;hpb=bc20da5a3271b337049a25f68ddecad472b8db98;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 1e4caf78a..aa771649d 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -53,10 +53,8 @@ void m_init() prvm_language = strzone(prvm_language); cvar_set("_menu_prvm_language", prvm_language); - check_unacceptable_compiler_bugs(); - #ifdef WATERMARK - print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK)); + dprintf("^4MQC Build information: ^1%s\n", WATERMARK); #endif // list all game dirs (TEST) @@ -67,7 +65,7 @@ void m_init() for(i = 0; ; ++i) { s = getgamedirinfo(i, GETGAMEDIRINFO_NAME); - if not(s) + if (!s) break; dprint(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION)); } @@ -93,6 +91,7 @@ void m_init() m_hide(); cvar_set("_menu_initialized", "1"); } + } const float MENU_ASPECT = 1.25; // 1280x1024 @@ -443,7 +442,7 @@ float m_allocatetooltipbox(vector pos) v = pos + avoidplus; if(m_testtooltipbox(v)) return TRUE; - + // bottom center v_x = pos_x - menuTooltipSize_x * 0.5; if(m_testtooltipbox(v)) @@ -463,12 +462,12 @@ float m_allocatetooltipbox(vector pos) v_x = pos_x - menuTooltipSize_x * 0.5; if(m_testtooltipbox(v)) return TRUE; - + // top right v_x = pos_x + avoidplus_x; if(m_testtooltipbox(v)) return TRUE; - + return FALSE; } entity m_findtooltipitem(entity root, vector pos) @@ -666,7 +665,7 @@ void m_tooltip(vector pos) while(getWrappedLine_remaining) { s = getWrappedLine(SKINWIDTH_TOOLTIP, fontsize, draw_TextWidth_WithoutColors); - draw_Text(p, s, fontsize, '1 1 1', SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE); + draw_Text(p, s, fontsize, SKINCOLOR_TOOLTIP, SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE); p_y += fontsize_y; } } @@ -992,7 +991,7 @@ void m_goto(string itemname) for(e = NULL; (e = find(e, name, itemname)); ) if(e.classname != "vtbl") break; - + if((e) && (!e.requiresConnection || (gamestatus & (GAME_ISSERVER | GAME_CONNECTED)))) { m_hide();