Show "Quit multiplayer / Disconnect from the server" as tooltip when hovering over...

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
index b2c8de1f780a677ef8f5fbedd1d41827ff001431..8b2873e5d9c5ab75ffbc12be0b74779c1b7051c4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
@@ -71,6 +71,7 @@ void XonoticServerCreateTab_draw(entity me)
        entity e = me.quitGameButton;
        e.disabled = !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED));
        e.setText(e, quitGameButton_getText(e));
+       setZonedTooltip(e, quitGameButton_getTooltip(e), string_null);
        SUPER(XonoticServerCreateTab).draw(me);
 }
 

diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc
index 1bd90038ad48fead20918d686d9c79d03c30663b..dbab87aad3bda99b6ff2c15d98ec1680e2e72fa7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qc
+++ b/qcsrc/menu/xonotic/dialog_quit.qc
@@ -15,6 +15,7 @@ void XonoticQuitDialog_draw(entity me)
        entity e = me.disconnectButton;
        e.disabled = !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED));
        e.setText(e, quitGameButton_getText(e));
+       setZonedTooltip(e, quitGameButton_getTooltip(e), string_null);
        SUPER(XonoticQuitDialog).draw(me);
 }
 

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc
index 775f4a5b958ae1e0c7504ecd7a1bb6c99ebfb4e8..41b5c9f55ae29475409f763a7e09000c57ad37a7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc
@@ -145,6 +145,7 @@ void XonoticSingleplayerDialog_draw(entity me)
        entity e = me.quitGameButton;
        e.disabled = !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED));
        e.setText(e, quitGameButton_getText(e));
+       setZonedTooltip(e, quitGameButton_getTooltip(e), string_null);
        SUPER(XonoticSingleplayerDialog).draw(me);
 }
 

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 3283476b13b0eda9f1abe3c37b50a07b7f1a2c1f..5d5b2d166edd5758918c8e7850f9cffa83662b13 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -835,6 +835,18 @@ string quitGameButton_getText(entity btn)
                return _("Quit multiplayer");
 }
 
+string quitGameButton_getTooltip(entity btn)
+{
+       if (btn.disabled)
+               return "-";
+       else if(cvar("g_campaign"))
+               return "-";
+       else if (cvar_string("net_address") == "127.0.0.1" && cvar_string("net_address_ipv6") == "::1")
+               return "-";
+       else
+               return _("Quit multiplayer / Disconnect from the server");
+}
+
 float getFadedAlpha(float currentAlpha, float startAlpha, float targetAlpha)
 {
        if(startAlpha < targetAlpha)

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index a4e37c7c9593689fcad22aa3488b60bab299203a..4fa6e66db1d06ccd23010d3e26b715887d43716f 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -41,6 +41,7 @@ void dialog_hudpanel_main_settings(entity me, string panelname);
 
 void makeServerSingleplayer();
 string quitGameButton_getText(entity btn);
+string quitGameButton_getTooltip(entity btn);
 
 float getFadedAlpha(float currentAlpha, float startAlpha, float targetAlpha);