Merge branch 'master' into Mario/cursor

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index ce70cef5ad5016ffa83790c677c86745934d6151..df13ca7f62fad43879b6ba209b78153d2e4cc9b9 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -230,7 +230,7 @@ void Shutdown()
 .float has_team;
 float SetTeam(entity o, int Team)
 {
-    TC(int, Team);
+       TC(int, Team);
        devassert_once(Team);
        entity tm;
        if(teamplay)
@@ -363,9 +363,11 @@ void PostInit()
 // In the case of mouse input after a setcursormode(1) call, nPrimary is xpos, nSecondary is ypos.
 float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
-    TC(int, bInputType);
-    bool override = false;
+       TC(int, bInputType);
+       bool override = false;
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
+       if (override)
+               return true;
 
        override |= QuickMenu_InputEvent(bInputType, nPrimary, nSecondary);