Add a button to properly quit the campaign, a "Game menu" (on ESC) and remove the Disconnect dialogue
See merge request xonotic/xonotic-data.pk3dir!900
bind PAUSE pause
bind F9 "cl_cmd hud minigame"
bind F10 menu_showquitdialog
-bind F11 menu_showdisconnectdialog
bind F12 screenshot
bind F4 ready
alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
alias menu_showquitdialog "menu_cmd directmenu Quit"
-alias menu_showdisconnectdialog "menu_cmd directmenu Disconnect"
+alias menu_showgamemenudialog "menu_cmd directmenu GameMenu"
alias menu_showmonstertools "menu_cmd directmenu MonsterTools"
// command executed before loading a map by the menu
if(override)
return true;
+ if(bInputType == 3 || bInputType == 2)
+ return false;
+
+ // at this point bInputType can only be 0 or 1 (key pressed or released)
+ bool key_pressed = (bInputType == 0);
+
+ if(key_pressed) {
+ if(nPrimary == K_ALT) hudShiftState |= S_ALT;
+ if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+ if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+ }
+ else {
+ if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+ if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+ if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+ }
+
+ if (nPrimary == K_ESCAPE && !(hudShiftState & S_SHIFT) && key_pressed)
+ {
+ if (cvar("_menu_gamemenu_dialog_available"))
+ {
+ localcmd("\nmenu_showgamemenudialog\n");
+ return true;
+ }
+ }
+
return false;
}
localcmd("\n");
localcmd("disconnect\nmaxplayers 16\n");
MapInfo_LoadMap(campaign_mapname[n], 1);
+ #ifdef MENUQC
+ makeServerSingleplayer();
+ #endif
}
return;
}
+ if (argv(0) == "nexposee")
+ {
+ m_goto("nexposee");
+ return;
+ }
+
+ if (argv(0) == "servers")
+ {
+ m_goto("servers");
+ return;
+ }
+
+ if (argv(0) == "profile")
+ {
+ m_goto("profile");
+ return;
+ }
+
if (argv(0) == "skinselect")
{
m_goto("skinselector");
return;
}
+ if (argv(0) == "inputsettings")
+ {
+ m_goto("inputsettings");
+ return;
+ }
+
if (argv(0) == "videosettings")
{
m_goto("videosettings");
}
float autocvar_menu_force_on_disconnection;
+bool autocvar_g_campaign;
void m_draw(float width, float height)
{
if (autocvar_menu_force_on_disconnection > 0)
static float connected_time;
if (clientstate() == CS_DISCONNECTED)
{
+ if (autocvar_g_campaign)
+ {
+ // in the case player uses the disconnect command (in the console or with a key)
+ // reset g_campaign and update menu items to reflect cvar values that may have been restored after quiting the campaign
+ // see also LEAVEMATCH_CMD
+ cvar_set("g_campaign", "0");
+ m_sync();
+ }
if (connected_time && time - connected_time > autocvar_menu_force_on_disconnection)
{
m_toggle(true);
if (gamestatus & (GAME_ISSERVER | GAME_CONNECTED))
{
m_hide();
+ return;
}
- else
- {
- m_activate_window(main.mainNexposee);
- m_display();
- }
+ itemname = "nexposee";
+ }
+
+ if (itemname == "nexposee")
+ {
+ // unlike 'togglemenu 1', this closes modal and root dialogs if opened
+ m_activate_window(main.mainNexposee);
+ m_display();
}
else
{
#include <menu/xonotic/demolist.qc>
#include <menu/xonotic/dialog.qc>
#include <menu/xonotic/dialog_credits.qc>
-#include <menu/xonotic/dialog_disconnect.qc>
#include <menu/xonotic/dialog_firstrun.qc>
+#include <menu/xonotic/dialog_gamemenu.qc>
#include <menu/xonotic/dialog_hudpanel_ammo.qc>
#include <menu/xonotic/dialog_hudpanel_centerprint.qc>
#include <menu/xonotic/dialog_hudpanel_chat.qc>
#include <menu/xonotic/playerlist.qc>
#include <menu/xonotic/playermodel.qc>
#include <menu/xonotic/playlist.qc>
+#include <menu/xonotic/leavematchbutton.qc>
#include <menu/xonotic/radiobutton.qc>
#include <menu/xonotic/rootdialog.qc>
#include <menu/xonotic/screenshotimage.qc>
#include <menu/xonotic/demolist.qh>
#include <menu/xonotic/dialog.qh>
#include <menu/xonotic/dialog_credits.qh>
-#include <menu/xonotic/dialog_disconnect.qh>
#include <menu/xonotic/dialog_firstrun.qh>
+#include <menu/xonotic/dialog_gamemenu.qh>
#include <menu/xonotic/dialog_hudpanel_ammo.qh>
#include <menu/xonotic/dialog_hudpanel_centerprint.qh>
#include <menu/xonotic/dialog_hudpanel_chat.qh>
#include <menu/xonotic/playerlist.qh>
#include <menu/xonotic/playermodel.qh>
#include <menu/xonotic/playlist.qh>
+#include <menu/xonotic/leavematchbutton.qh>
#include <menu/xonotic/radiobutton.qh>
#include <menu/xonotic/rootdialog.qh>
#include <menu/xonotic/screenshotimage.qh>
#include "commandbutton.qh"
+#include "dialog.qh"
entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, int theFlags, string theTooltip)
{
//if(me.flags & COMMANDBUTTON_REVERT)
// loadAllCvars(me.parent);
if(me.flags & COMMANDBUTTON_CLOSE)
- m_goto(string_null);
+ me.parent.close(me.parent);
}
void XonoticCommandButton_configureXonoticCommandButton(entity me, string theText, vector theColor, string theCommand, int theFlags, string theTooltip)
+++ /dev/null
-#include "dialog_disconnect.qh"
-
-#include "textlabel.qh"
-#include "button.qh"
-
-void Disconnect_Click(entity btn, entity me)
-{
- localcmd("disconnect\n");
- Dialog_Close(btn, me);
-}
-
-void XonoticDisconnectDialog_fill(entity me)
-{
- entity e;
- me.TR(me);
- me.TD(me, 1, 2, makeXonoticTextLabel(0.5, _("Are you sure to disconnect from server?")));
- me.TR(me);
- me.TR(me);
- me.TD(me, 1, 1, e = makeXonoticButton_T(_("Yes"), '1 0 0', _("I would disconnect from server...")));
- e.onClick = Disconnect_Click;
- e.onClickEntity = me;
- me.TD(me, 1, 1, e = makeXonoticButton_T(_("No"), '0 1 0', _("I would play more!")));
- e.onClick = Dialog_Close;
- e.onClickEntity = me;
-}
+++ /dev/null
-#pragma once
-
-#include "dialog.qh"
-CLASS(XonoticDisconnectDialog, XonoticDialog)
- METHOD(XonoticDisconnectDialog, fill, void(entity));
- ATTRIB(XonoticDisconnectDialog, title, string, _("Disconnect"));
- ATTRIB(XonoticDisconnectDialog, tooltip, string, _("Disconnect from the server you are connected to"));
- ATTRIB(XonoticDisconnectDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
- ATTRIB(XonoticDisconnectDialog, intendedWidth, float, 0.5);
- ATTRIB(XonoticDisconnectDialog, rows, float, 3);
- ATTRIB(XonoticDisconnectDialog, colums, float, 2);
- ATTRIB(XonoticDisconnectDialog, name, string, "Disconnect");
-ENDCLASS(XonoticDisconnectDialog)
--- /dev/null
+#include "dialog_gamemenu.qh"
+
+#include "textlabel.qh"
+#include "commandbutton.qh"
+#include "leavematchbutton.qh"
+#include "button.qh"
+
+void XonoticGameMenuDialog_destroy(entity me)
+{
+ cvar_set("_menu_gamemenu_dialog_available", "0");
+}
+
+void XonoticGameMenuDialog_fill(entity me)
+{
+ registercvar("_menu_gamemenu_dialog_available", "0", 0);
+ cvar_set("_menu_gamemenu_dialog_available", "1");
+
+ entity e;
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Main menu"), '0 0 0', "menu_cmd nexposee", 0));
+ me.TR(me);
+ me.TDempty(me, 0.1);
+ me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Servers"), '0 0 0', "menu_cmd servers", 0));
+ me.TR(me);
+ me.TDempty(me, 0.1);
+ me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Profile"), '0 0 0', "menu_cmd profile", 0));
+ me.TR(me);
+ me.TDempty(me, 0.1);
+ me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Settings"), '0 0 0', "menu_cmd videosettings", 0));
+ me.TR(me);
+ me.TDempty(me, 0.1);
+ me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Input"), '0 0 0', "menu_cmd inputsettings", 0));
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quick menu"), '0 0 0', "quickmenu", COMMANDBUTTON_CLOSE));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Join!"), '0 0 0', "join", COMMANDBUTTON_CLOSE));
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Spectate"), '0 0 0', "spec", COMMANDBUTTON_CLOSE));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit Xonotic"), '1 0 0', "echo ]quit; quit", 0));
+}
--- /dev/null
+#pragma once
+
+#include "rootdialog.qh"
+CLASS(XonoticGameMenuDialog, XonoticRootDialog)
+ METHOD(XonoticGameMenuDialog, destroy, void(entity));
+ METHOD(XonoticGameMenuDialog, fill, void(entity));
+ ATTRIB(XonoticGameMenuDialog, title, string, _("Game menu"));
+ ATTRIB(XonoticGameMenuDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
+ ATTRIB(XonoticGameMenuDialog, intendedWidth, float, 0.3);
+ ATTRIB(XonoticGameMenuDialog, rows, float, 12);
+ ATTRIB(XonoticGameMenuDialog, columns, float, 1);
+ ATTRIB(XonoticGameMenuDialog, name, string, "GameMenu");
+ ATTRIB(XonoticGameMenuDialog, requiresConnection, bool, true);
+ENDCLASS(XonoticGameMenuDialog)
#include "slider.qh"
#include "mainwindow.qh"
#include "button.qh"
+#include "commandbutton.qh"
+#include "leavematchbutton.qh"
#include "inputbox.qh"
void GameType_ConfigureSliders(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip)
_("The maximum amount of players or bots that can be connected to your server at once")));
me.TR(me);
me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Number of bots:")));
+ setDependent(e, "g_campaign", 0, 0);
me.TD(me, 1, 2, e = makeXonoticSlider_T(0, 9, 1, "bot_number",
_("Amount of bots on your server")));
+ setDependent(e, "g_campaign", 0, 0);
me.TR(me);
me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Bot skill:")));
- setDependent(e, "bot_number", 0, -1);
+ setDependentAND(e, "bot_number", 0, -1, "g_campaign", 0, 0);
me.TD(me, 1, 2, e = makeXonoticTextSlider_T("skill",
_("Specify how experienced the bots will be")));
e.addValue(e, _("Botlike"), "0");
e.addValue(e, _("Unhuman"), "9");
e.addValue(e, _("Godlike"), "10");
e.configureXonoticTextSliderValues(e);
- setDependent(e, "bot_number", 0, -1);
+ setDependentAND(e, "bot_number", 0, -1, "g_campaign", 0, 0);
me.gotoRC(me, me.rows - 3.8, 0);
me.TD(me, 1, 3, e0 = makeXonoticTextLabel(0.5, string_null));
e0.textEntity = main.mutatorsDialog;
e0.allowCut = 1;
//e0.allowWrap = 1;
+ setDependent(e0, "g_campaign", 0, 0);
// mapListBox is in the right column but the ref is needed for mutators dialog here
me.mapListBox = makeXonoticMapList();
e.onClick = DialogOpenButton_Click;
e.onClickEntity = main.mutatorsDialog;
main.mutatorsDialog.refilterEntity = me.mapListBox;
+ setDependent(e, "g_campaign", 0, 0);
// The right half begins here
e.onClick = MapList_Remove_All;
e.onClickEntity = me.mapListBox;
- // The big button at the bottom
-
+ // bottom row
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, e = makeXonoticButton(_("Start Multiplayer!"), '0 0 0'));
+ me.TDempty(me, me.columns * 1/12);
+ me.TD(me, 1, me.columns * 5/12, e = makeXonoticLeaveMatchButton('0 0 0', 0));
+ me.TD(me, 1, me.columns * 5/12, e = makeXonoticButton(_("Start multiplayer!"), '0 0 0'));
e.onClick = MapList_LoadMap;
e.onClickEntity = me.mapListBox;
me.mapListBox.startButton = e;
me.TD(me, 1, me.columns - 5.5, me.startButton = e = makeXonoticButton(ZCTX(_("MAP^Play")), '0 0 0'));
me.startButton.onClick = MapList_LoadMap;
me.startButton.onClickEntity = NULL; // filled later
+ setDependent(e, "g_campaign", 0, 0);
}
#include "inputbox.qh"
#include "checkbox.qh"
#include "commandbutton.qh"
+#include "leavematchbutton.qh"
#include "button.qh"
entity makeXonoticServerListTab()
e.onClickEntity = slist;
slist.infoButton = e;
me.TR(me);
- /*
- me.TD(me, 1, 1, e = makeXonoticCommandButton_T(_("Disconnect"), '0 0 0', "disconnect", 0,
- _("Disconnect from the server")));
- slist.disconnectButton = e;
- */
- me.TD(me, 1, me.columns, e = makeXonoticButton(_("Join!"), '0 0 0'));
+ me.TD(me, 1, me.columns * 0.5, e = makeXonoticLeaveMatchButton('0 0 0', 0));
+ me.TD(me, 1, me.columns * 0.5, e = makeXonoticButton(_("Join!"), '0 0 0'));
e.onClick = ServerList_Connect_Click;
e.onClickEntity = slist;
slist.connectButton = e;
ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9);
ATTRIB(XonoticServerListTab, rows, float, 23);
ATTRIB(XonoticServerListTab, columns, float, 6.5);
+
+ ATTRIB(XonoticServerListTab, name, string, "servers");
ENDCLASS(XonoticServerListTab)
entity makeXonoticServerListTab();
ATTRIB(XonoticProfileTab, columns, float, 6.1); // added extra .2 for center space
ATTRIB(XonoticProfileTab, playerNameLabel, entity);
ATTRIB(XonoticProfileTab, playerNameLabelAlpha, float, SKINALPHA_HEADER);
+ ATTRIB(XonoticProfileTab, name, string, "profile");
ENDCLASS(XonoticProfileTab)
entity makeXonoticProfileTab();
#include "textlabel.qh"
#include "commandbutton.qh"
+#include "leavematchbutton.qh"
#include "button.qh"
void XonoticQuitDialog_fill(entity me)
{
entity e;
me.TR(me);
- me.TD(me, 1, 2, makeXonoticTextLabel(0.5, _("Are you sure you want to quit?")));
+ me.TDempty(me, 0.5);
+ me.TD(me, 1, 1, e = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
me.TR(me);
me.TR(me);
- me.TD(me, 1, 1, e = makeXonoticCommandButton_T(_("Yes"), '1 0 0', "echo ]quit; quit", 0,
- _("Back to work...")));
- me.TD(me, 1, 1, e = makeXonoticButton_T(_("No"), '0 1 0',
- _("I got some more fragging to do!")));
+ me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit Xonotic"), '1 0 0', "echo ]quit; quit", 0));
+ me.TD(me, 1, 1, e = makeXonoticButton(_("Cancel"), '0 1 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
}
#include "dialog.qh"
CLASS(XonoticQuitDialog, XonoticDialog)
METHOD(XonoticQuitDialog, fill, void(entity));
- ATTRIB(XonoticQuitDialog, title, string, _("Quit"));
- ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game"));
+ ATTRIB(XonoticQuitDialog, title, string, _("Quit / Leave match"));
+ ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game / Leave current match"));
ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5);
ATTRIB(XonoticQuitDialog, rows, float, 3);
ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9);
ATTRIB(XonoticInputSettingsTab, rows, float, 15.5);
ATTRIB(XonoticInputSettingsTab, columns, float, 6.2); // added extra .2 for center space
+ ATTRIB(XonoticInputSettingsTab, name, string, "inputsettings");
ENDCLASS(XonoticInputSettingsTab)
entity makeXonoticInputSettingsTab();
#include <common/gamemodes/_mod.qh>
#include "bigbutton.qh"
+#include "commandbutton.qh"
+#include "leavematchbutton.qh"
#include "radiobutton.qh"
#include "textlabel.qh"
#include "campaign.qh"
localcmd("disconnect\n");
localcmd("g_campaign 0\n");
+ makeServerSingleplayer();
+
MapInfo_LoadMap(s, 1);
// configure bots
me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "-2", ZCTX(_("CSKL^Easy"))));
me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "0", ZCTX(_("CSKL^Medium"))));
me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "2", ZCTX(_("CSKL^Hard"))));
- me.TR(me);
- me.TD(me, 1, me.columns, e = makeXonoticButton(_("Start Singleplayer!"), '0 0 0'));
+ me.TR(me);
+ me.TDempty(me, me.columns * 1/13);
+ 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;
e.onClickEntity = me.campaignBox;
}
KEYBIND_DEF("toggleconsole" , _("enter console"));
string console_shortcut = strcat(translate_key("SHIFT"), "+", translate_key("ESCAPE"));
KEYBIND_SPECIAL_DEF(console_shortcut, _("enter console"));
- KEYBIND_DEF("disconnect" , _("disconnect"));
- KEYBIND_DEF("menu_showquitdialog" , _("quit"));
+ KEYBIND_DEF("menu_showquitdialog" , _("quit / leave match"));
KEYBIND_EMPTY_LINE();
KEYBIND_HEADER(_("Teamplay"));
--- /dev/null
+#include "leavematchbutton.qh"
+
+// resets g_campaign and updates menu items to reflect cvar values that may have been restored after leaving the campaign
+// the delay is for allowing listening to the button sound (if enabled), since the disconnect command stops all sounds
+// menu_sync is also useful when leaving Instant Action mode
+// see also m_draw
+const string LEAVEMATCH_CMD = "defer 0.4 disconnect; defer 0.4 wait; defer 0.4 \"g_campaign 0\"; defer 0.4 menu_sync\n";
+
+string leaveMatchButton_getText(entity me)
+{
+ if (me.disabled)
+ return _("Leave current match");
+ else if(cvar("g_campaign"))
+ return _("Leave campaign");
+ else if (isServerSingleplayer())
+ return _("Leave singleplayer");
+ else
+ return _("Leave multiplayer");
+}
+
+string leaveMatchButton_getTooltip(entity me)
+{
+ if (me.disabled)
+ return "-";
+ else if(cvar("g_campaign"))
+ return _("Leave current campaign level");
+ else if (isServerSingleplayer())
+ return _("Leave current singleplayer match");
+ else
+ return _("Leave current multiplayer match / Disconnect from the server");
+}
+
+entity makeXonoticLeaveMatchButton(vector theColor, int theFlags)
+{
+ entity me;
+ me = NEW(XonoticLeaveMatchButton);
+ me.configureXonoticLeaveMatchButton(me, theColor, theFlags);
+ return me;
+}
+
+void XonoticLeaveMatchButton_draw(entity me)
+{
+ SUPER(XonoticCommandButton).draw(me);
+ me.disabled = !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED));
+ me.setText(me, leaveMatchButton_getText(me));
+ setZonedTooltip(me, leaveMatchButton_getTooltip(me), string_null);
+}
+
+void XonoticLeaveMatchButton_configureXonoticLeaveMatchButton(entity me, vector theColor, int theFlags)
+{
+ me.configureXonoticCommandButton(me, string_null, theColor, LEAVEMATCH_CMD, theFlags, string_null);
+ me.draw = XonoticLeaveMatchButton_draw;
+}
--- /dev/null
+#pragma once
+
+#include "commandbutton.qh"
+CLASS(XonoticLeaveMatchButton, XonoticCommandButton)
+ METHOD(XonoticLeaveMatchButton, draw, void(entity));
+ METHOD(XonoticLeaveMatchButton, configureXonoticLeaveMatchButton, void(entity, vector, int));
+ENDCLASS(XonoticLeaveMatchButton)
+
+entity makeXonoticLeaveMatchButton(vector theColor, int theFlags);
#include "dialog_multiplayer_create_mutators.qh"
#include "dialog_sandboxtools.qh"
#include "dialog_monstertools.qh"
+#include "dialog_gamemenu.qh"
#include "dialog_welcome.qh"
#include "dialog_teamselect.qh"
#include "dialog_uid2name.qh"
#include "dialog_credits.qh"
#include "dialog_quit.qh"
-#include "dialog_disconnect.qh"
-
-
-
void MainWindow_draw(entity me)
{
SUPER(MainWindow).draw(me);
me.firstDraw = false;
}
-
- //-------------------------------------
- // Part of Disconnect Dialog button:
- // In case of this function is recalling every time, need to use condition of visibility
-
- if (me.disconnectDialogVisibility && !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED)))
- {
- // If gamestate is not "ingame" (and it is a first "frame" of drawing (or dialog is visible)),
- // disconnect button is unnecessary, remove it
- me.removeItem(me.mainNexposee, me.disconnectDialog);
- me.disconnectDialogVisibility = 0;
-
- } else if(!me.disconnectDialogVisibility && (gamestatus & (GAME_ISSERVER | GAME_CONNECTED))) {
-
- // If gamestate is "ingame" (and dialog is not visible),
- // make disconnect button visible
- entity n, i;
- n = me.mainNexposee;
- i = me.disconnectDialog;
- n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
- n.setNexposee(n, i, '0.5 1.2 0.0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
- me.disconnectDialogVisibility = 1;
- }
-
- // I haven't found the best solution for making button visible.
- // Alpha channel is the worst thing, because dialog with alpha is also clickable
- //-------------------------------------
}
void DemoButton_Click(entity me, entity other)
// miscellaneous dialogs
+ i = NEW(XonoticGameMenuDialog);
+ i.configureDialog(i);
+ me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
i = NEW(XonoticTeamSelectDialog);
i.configureDialog(i);
me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
n.setNexposee(n, i, SKINPOSITION_DIALOG_CREDITS, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
- //Disconnect dialog at center of screen (between credits and quit)
- i = NEW(XonoticDisconnectDialog);
- i.configureDialog(i);
- n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
- n.setNexposee(n, i, '0.5 1.2 0.0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
- n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
- me.disconnectDialog = i;
-
i = NEW(XonoticQuitDialog);
i.configureDialog(i);
n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
me.moveItemAfter(me, n, NULL);
me.initializeDialog(me, n);
- me.disconnectDialogVisibility = 1;
}
ATTRIB(MainWindow, demostartconfirmDialog, entity);
ATTRIB(MainWindow, demotimeconfirmDialog, entity);
ATTRIB(MainWindow, resetDialog, entity);
- ATTRIB(MainWindow, disconnectDialog, entity);
- ATTRIB(MainWindow, disconnectDialogVisibility, float, 1);
ENDCLASS(MainWindow)
void XonoticMapList_draw(entity me)
{
if(me.startButton)
- me.startButton.disabled = ((me.selectedItem < 0) || (me.selectedItem >= me.nItems));
+ me.startButton.disabled = ((me.selectedItem < 0) || (me.selectedItem >= me.nItems)
+ || (gamestatus & (GAME_ISSERVER | GAME_CONNECTED) && cvar("g_campaign")));
SUPER(XonoticMapList).draw(me);
}
}
me.connectButton.disabled = (me.ipAddressBox.text == "");
- //me.disconnectButton.disabled = (!(gamestatus & (GAME_ISSERVER | GAME_CONNECTED)));
me.infoButton.disabled = !owned;
me.favoriteButton.disabled = (me.ipAddressBox.text == "");
ATTRIB(XonoticServerList, sortButton4, entity);
ATTRIB(XonoticServerList, sortButton5, entity);
ATTRIB(XonoticServerList, connectButton, entity);
- //ATTRIB(XonoticServerList, disconnectButton, entity);
ATTRIB(XonoticServerList, infoButton, entity);
ATTRIB(XonoticServerList, currentSortOrder, float, 0);
ATTRIB(XonoticServerList, currentSortField, float, -1);
e.configureXonoticTextSliderValues(e);
}
+bool isServerSingleplayer()
+{
+ return (cvar_string("net_address") == "127.0.0.1" && cvar_string("net_address_ipv6") == "::1");
+}
+
+void makeServerSingleplayer()
+{
+ // it doesn't allow clients to connect from different machines
+ localcmd("defer 0.1 \"sv_cmd settemp net_address 127.0.0.1\"\n");
+ localcmd("defer 0.1 \"sv_cmd settemp net_address_ipv6 ::1\"\n");
+}
+
float getFadedAlpha(float currentAlpha, float startAlpha, float targetAlpha)
{
if(startAlpha < targetAlpha)
void dialog_hudpanel_main_checkbox(entity me, string panelname);
void dialog_hudpanel_main_settings(entity me, string panelname);
+bool isServerSingleplayer();
+void makeServerSingleplayer();
+
float getFadedAlpha(float currentAlpha, float startAlpha, float targetAlpha);
string _Nex_ExtResponseSystem_BannedServers;
projects / xonotic / xonotic-data.pk3dir.git / commitdiff