Put GameLogInit() code in there instead of in spawnfunc(worldspawn)

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

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc
index 41b5c9f55ae29475409f763a7e09000c57ad37a7..ded656605c58829cdc79be4ddc2c928e8bc3e1e4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc
@@ -3,6 +3,7 @@
 #include <common/gamemodes/_mod.qh>
 #include "bigbutton.qh"
 #include "commandbutton.qh"
+#include "leavematchbutton.qh"
 #include "radiobutton.qh"
 #include "textlabel.qh"
 #include "campaign.qh"
@@ -139,16 +140,6 @@ void InstantAction_LoadMap(entity btn, entity dummy)
        cvar_set("lastlevel", "1");
 }
 
-.entity quitGameButton;
-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);
-}
-
 void XonoticSingleplayerDialog_fill(entity me)
 {
        entity e, btnPrev, btnNext, lblTitle;
@@ -162,7 +153,7 @@ void XonoticSingleplayerDialog_fill(entity me)
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, btnPrev = makeXonoticButton("<<", '0 0 0'));
-               me.TD(me, 1, me.columns - 2, lblTitle = makeXonoticTextLabel(0.5, _("???")));
+               me.TD(me, 1, me.columns - 2, lblTitle = makeXonoticTextLabel(0.5, "???"));
                me.TD(me, 1, 1, btnNext = makeXonoticButton(">>", '0 0 0'));
        me.TR(me);
                me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeXonoticCampaignList());
@@ -181,7 +172,7 @@ void XonoticSingleplayerDialog_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "2", ZCTX(_("CSKL^Hard"))));
        me.TR(me);
                me.TDempty(me, me.columns * 1/13);
-               me.TD(me, 1, me.columns * 5/13, me.quitGameButton = makeXonoticCommandButton(string_null, '0 0 0', QUITGAME_CMD, 0));
+               me.TD(me, 1, me.columns * 5/13, e = makeXonoticLeaveMatchButton('0 0 0', 0));
                me.TDempty(me, me.columns * 1/13);
                me.TD(me, 1, me.columns * 5/13, e = makeXonoticButton(_("Play campaign!"), '0 0 0'));
                        e.onClick = CampaignList_LoadMap;