From: Samual Date: Tue, 16 Aug 2011 05:33:09 +0000 (-0400) Subject: Early X-Git-Tag: xonotic-v0.6.0~194 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=307bc17b8aec0039faaac9e15d8ce699ea3a0df1;p=xonotic%2Fxonotic-data.pk3dir.git Early --- diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c index ec21c65b9..2561b2e72 100644 --- 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 0bcee6a19..2b773ec03 100644 --- 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 5962b9648..9606bca08 100644 --- 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);