Merge branch 'Mario/use1' into 'master'

Merge branch Mario/use1 (XL merge request)

Cleans out the use of self from .use, a necessary step towards supporting the Daemon engine and NaCl.

See merge request !298

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 2e204974a00427cfd3d7512df27e8b7512c47a0e..4537e56a444becda3d5c38f1629aa7a17e5b8440 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1309,6 +1309,7 @@ void HUD_Crosshair()
 
 void HUD_Draw()
 {
+       if(!intermission)
        if (MUTATOR_CALLHOOK(HUD_Draw_overlay))
        {
                drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, MUTATOR_ARGV(0, vector), autocvar_hud_colorflash_alpha * MUTATOR_ARGV(0, float), DRAWFLAG_ADDITIVE);

diff --git a/qcsrc/menu/xonotic/cvarlist.qc b/qcsrc/menu/xonotic/cvarlist.qc
index 74d85ca04ce059fb29abe7bcf520de3bbf97dab3..f23af46d9ea017839dc159122168db91a9146fef 100644 (file)
--- a/qcsrc/menu/xonotic/cvarlist.qc
+++ b/qcsrc/menu/xonotic/cvarlist.qc
@@ -2,6 +2,7 @@
 
 #include "inputbox.qh"
 #include "../item/container.qh"
+#include "../item/checkbox.qh"
 
 entity makeXonoticCvarList()
 {

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc
index d34588ce80861dde233ed77289a2ac289bafa0f6..f35e0d22db2633a47e34043eda73d04819769a04 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc
@@ -1,5 +1,6 @@
 #include "dialog_settings_misc_cvars.qh"
 
+#include "checkbox.qh"
 #include "cvarlist.qh"
 #include "textlabel.qh"
 #include "inputbox.qh"