Merge remote branch 'origin/master' into samual/menu_updates

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f5efdc6852acdae5537255c3e6ee12f780b2c222..ad04baea3769fc29b875c0efe55e89be43346b99 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1185,7 +1185,7 @@ set quit_and_redirect ""  "set to an IP to redirect all players at the end of the
 set g_campaign 0
 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
 seta g_campaign_name "xonoticbeta"
-set g_campaign_skill 0
+seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
 set g_campaignxonotic20_index 0
 set g_campaignxonotic25_index 1
 

diff --git a/gfx/menu/luminos/gametype-icon-ar.tga b/gfx/menu/luminos/gametype-icon-ar.tga
new file mode 100644 (file)
index 0000000..f49fa28
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-ar.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-as.tga b/gfx/menu/luminos/gametype-icon-as.tga
new file mode 100644 (file)
index 0000000..59bdfc1
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-as.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-ctf.tga b/gfx/menu/luminos/gametype-icon-ctf.tga
new file mode 100644 (file)
index 0000000..cc3bc7c
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-ctf.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-cts.tga b/gfx/menu/luminos/gametype-icon-cts.tga
new file mode 100644 (file)
index 0000000..bc917ec
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-cts.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-dm.tga b/gfx/menu/luminos/gametype-icon-dm.tga
new file mode 100644 (file)
index 0000000..1266f59
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-dm.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-dom.tga b/gfx/menu/luminos/gametype-icon-dom.tga
new file mode 100644 (file)
index 0000000..f7637f9
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-dom.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-duel.tga b/gfx/menu/luminos/gametype-icon-duel.tga
new file mode 100644 (file)
index 0000000..03fe067
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-duel.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-ft.tga b/gfx/menu/luminos/gametype-icon-ft.tga
new file mode 100644 (file)
index 0000000..8028b67
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-ft.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-kh.tga b/gfx/menu/luminos/gametype-icon-kh.tga
new file mode 100644 (file)
index 0000000..ca0d2aa
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-kh.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-lms.tga b/gfx/menu/luminos/gametype-icon-lms.tga
new file mode 100644 (file)
index 0000000..5549651
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-lms.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-nb.tga b/gfx/menu/luminos/gametype-icon-nb.tga
new file mode 100644 (file)
index 0000000..b4f7441
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-nb.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-race.tga b/gfx/menu/luminos/gametype-icon-race.tga
new file mode 100644 (file)
index 0000000..9874c7e
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-race.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-rune.tga b/gfx/menu/luminos/gametype-icon-rune.tga
new file mode 100644 (file)
index 0000000..6906411
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-rune.tga differ

diff --git a/gfx/menu/luminos/gametype-icon-tdm.tga b/gfx/menu/luminos/gametype-icon-tdm.tga
new file mode 100644 (file)
index 0000000..cc0b938
Binary files /dev/null and b/gfx/menu/luminos/gametype-icon-tdm.tga differ

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.c b/qcsrc/menu/xonotic/dialog_singleplayer.c
index 81eb68e39232bd09e078bcf9d9bb7d1990be6290..fa8da08ffc7c1ebdcad70d34aaf1df40389023f8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.c
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.c
@@ -76,7 +76,12 @@ void XonoticSingleplayerDialog_fill(entity me)
                        me.campaignBox.labelTitle = lblTitle;
                        me.campaignBox.campaignGo(me.campaignBox, 0);
 
-       me.gotoRC(me, me.rows - 1, 0);
+       me.gotoRC(me, me.rows - 2, 0);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Campaign Difficulty:")));
+               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "-2", _("Easy")));
+               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "-1", _("Medium")));
+               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "0", _("Hard")));
+               me.TR(me);
                me.TD(me, 1, me.columns, e = makeXonoticButton(_("Start Singleplayer!"), '0 0 0'));
                        e.onClick = CampaignList_LoadMap;
                        e.onClickEntity = me.campaignBox;

diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c
index ec21c65b97c4fd6b6be2466c96a922c5e89b3bef..2561b2e7253a5be852c32dbaaa9cbe0492203326 100644 (file)
--- a/qcsrc/menu/xonotic/gametypelist.c
+++ b/qcsrc/menu/xonotic/gametypelist.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
-       ATTRIB(XonoticGametypeList, rowsPerItem, float, 1)
+       ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
        METHOD(XonoticGametypeList, drawListBoxItem, void(entity, float, vector, float))
        METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticGametypeList, setSelected, void(entity, float))
@@ -9,7 +9,10 @@ CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
        METHOD(XonoticGametypeList, saveCvars, void(entity))
 
        ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
+       ATTRIB(XonoticGametypeList, realUpperMargin1, float, 0)
+       ATTRIB(XonoticGametypeList, realUpperMargin2, float, 0)
+       ATTRIB(XonoticGametypeList, columnIconOrigin, float, 0)
+       ATTRIB(XonoticGametypeList, columnIconSize, float, 0)
        ATTRIB(XonoticGametypeList, columnNameOrigin, float, 0)
        ATTRIB(XonoticGametypeList, columnNameSize, float, 0)
 ENDCLASS(XonoticGametypeList)
@@ -70,16 +73,25 @@ void XonoticGametypeList_drawListBoxItem(entity me, float i, vector absSize, flo
        string s;
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+               
+       draw_Picture(me.columnIconOrigin * eX, strcat("gametype-icon-", GameType_GetIcon(i)), me.columnIconSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
        s = GameType_GetName(i);
-       draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize)) * 0.5) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+       draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+       s = GameType_GetTeams(i);
+       draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 void XonoticGametypeList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
+       me.itemAbsSize = '0 0 0';
        SUPER(XonoticServerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
-       me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
-       me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
-       me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
-       me.columnNameOrigin = 0;
-       me.columnNameSize = 1;
+       
+       me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
+       me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
+       me.realUpperMargin1 = 0.5 * (1 - me.realFontSize_y);
+       me.realUpperMargin2 = me.realUpperMargin1 + me.realFontSize_y;
+       me.columnIconOrigin = 0;
+       me.columnIconSize = me.itemAbsSize_y / me.itemAbsSize_x;
+       me.columnNameOrigin = me.columnIconOrigin + me.columnIconSize;
+       me.columnNameSize = 1 - me.columnIconSize - 2 * me.realFontSize_x;
 }
 #endif

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 0bcee6a192352148b2465207a753392e2f14de4e..2b773ec039734577db5fe4f75c59e9ca462ca63c 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -520,29 +520,29 @@ float updateCompression()
 
 // note: include only those that should be in the menu!
 #define GAMETYPES \
-       GAMETYPE(MAPINFO_TYPE_ARENA, _("Arena")) \
-       GAMETYPE(MAPINFO_TYPE_ASSAULT, _("Assault")) \
-       GAMETYPE(MAPINFO_TYPE_CTF, _("Capture The Flag")) \
-       GAMETYPE(MAPINFO_TYPE_CA, _("Clan Arena")) \
-       GAMETYPE(MAPINFO_TYPE_DEATHMATCH, _("Deathmatch")) \
-       GAMETYPE(MAPINFO_TYPE_DOMINATION, _("Domination")) \
-       GAMETYPE(MAPINFO_TYPE_FREEZETAG, _("Freeze Tag")) \
-       GAMETYPE(MAPINFO_TYPE_KEEPAWAY, _("Keepaway")) \
-       GAMETYPE(MAPINFO_TYPE_KEYHUNT, _("Key Hunt")) \
-       GAMETYPE(MAPINFO_TYPE_LMS, _("Last Man Standing")) \
-       GAMETYPE(MAPINFO_TYPE_NEXBALL, _("Nexball")) \
-       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, _("Onslaught")) \
-       GAMETYPE(MAPINFO_TYPE_RACE, _("Race")) \
-       GAMETYPE(MAPINFO_TYPE_CTS, _("Race CTS")) \
-       GAMETYPE(MAPINFO_TYPE_RUNEMATCH, _("Runematch")) \
-       GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, _("Team Deathmatch")) \
+       GAMETYPE(MAPINFO_TYPE_ARENA, _("Arena"), "ar", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_ASSAULT, _("Assault"), "as", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CTF, _("Capture The Flag"), "ctf", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CA, _("Clan Arena"), "ca", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_DEATHMATCH, _("Deathmatch"), "dm", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_DOMINATION, _("Domination"), "dom", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_FREEZETAG, _("Freeze Tag"), "ft", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_KEEPAWAY, _("Keepaway"), "ka", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_KEYHUNT, _("Key Hunt"), "kh", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_LMS, _("Last Man Standing"), "lms", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_NEXBALL, _("Nexball"), "nb", _("free/teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, _("Onslaught"), "ons", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_RACE, _("Race"), "race", _("free/teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CTS, _("Race CTS"), "cts", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_RUNEMATCH, _("Runematch"), "rune", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, _("Team Deathmatch"), "tdm", _("teamplay")) \
        /* nothing */
 
 float GameType_GetID(float cnt)
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return id;
+#define GAMETYPE(id,name,icon,teams) if(i++ == cnt) return id;
        GAMETYPES
 #undef GAMETYPE
        return 0;
@@ -551,16 +551,34 @@ string GameType_GetName(float cnt)
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return name;
+#define GAMETYPE(id,name,icon,teams) if(i++ == cnt) return name;
        GAMETYPES
 #undef GAMETYPE
        return _("@!#%'n Tuba Throwing");
 }
+string GameType_GetIcon(float cnt)
+{
+       float i;
+       i = 0;
+#define GAMETYPE(id,name,icon,teams) if(i++ == cnt) return icon;
+       GAMETYPES
+#undef GAMETYPE
+       return "";
+}
+string GameType_GetTeams(float cnt)
+{
+       float i;
+       i = 0;
+#define GAMETYPE(id,name,icon,teams) if(i++ == cnt) return teams;
+       GAMETYPES
+#undef GAMETYPE
+       return _("tuba for all");
+}
 float GameType_GetCount()
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) ++i;
+#define GAMETYPE(id,name,icon) ++i;
        GAMETYPES
 #undef GAMETYPE
        return i;

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index 5962b9648ccc74ff091132952af3956ad0681fcf..9606bca082bb07e958f7973efb9592fc36dbc1d8 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -37,6 +37,8 @@ void URI_Get_Callback(float id, float status, string data);
 // types stay available via console)
 float GameType_GetID(float cnt);
 string GameType_GetName(float cnt);
+string GameType_GetIcon(float cnt);
+string GameType_GetTeams(float cnt);
 float GameType_GetCount();
 
 void dialog_hudpanel_common_notoggle(entity me, string panelname);