From: Samual Date: Tue, 3 Jan 2012 23:46:28 +0000 (-0500) Subject: Merge remote branch 'origin/master' into samual/menu_updates X-Git-Tag: xonotic-v0.6.0~189 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26ec33d6d19e627b43ac2cb51f83f890b5176293;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into samual/menu_updates Conflicts: defaultXonotic.cfg qcsrc/menu/xonotic/gametypelist.c qcsrc/menu/xonotic/util.qc qcsrc/menu/xonotic/util.qh --- 26ec33d6d19e627b43ac2cb51f83f890b5176293 diff --cc defaultXonotic.cfg index ad04baea3,5dcfb3f7c..62a8686cd --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -1185,9 -1231,8 +1231,8 @@@ set quit_and_redirect "" "set to an IP 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 + alias warp "sv_cmd warp $*" alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0" alias singleplayer_continue "set scmenu_campaign_goto -1" diff --cc qcsrc/menu/xonotic/gametypelist.c index 2561b2e72,cbc239946..1411244db --- a/qcsrc/menu/xonotic/gametypelist.c +++ b/qcsrc/menu/xonotic/gametypelist.c @@@ -73,12 -70,8 +73,12 @@@ void XonoticGametypeList_drawListBoxIte 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); + s = MapInfo_Type_ToText(GameType_GetID(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) { diff --cc qcsrc/menu/xonotic/util.qc index 2b773ec03,74fe810fe..77fedc372 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@@ -520,65 -543,38 +543,56 @@@ float updateCompression( // note: include only those that should be in the menu! #define GAMETYPES \ - 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")) \ - GAMETYPE(MAPINFO_TYPE_ARENA) \ - GAMETYPE(MAPINFO_TYPE_ASSAULT) \ - GAMETYPE(MAPINFO_TYPE_CTF) \ - GAMETYPE(MAPINFO_TYPE_CA) \ - GAMETYPE(MAPINFO_TYPE_DEATHMATCH) \ - GAMETYPE(MAPINFO_TYPE_DOMINATION) \ - GAMETYPE(MAPINFO_TYPE_FREEZETAG) \ - GAMETYPE(MAPINFO_TYPE_KEEPAWAY) \ - GAMETYPE(MAPINFO_TYPE_KEYHUNT) \ - GAMETYPE(MAPINFO_TYPE_LMS) \ - GAMETYPE(MAPINFO_TYPE_NEXBALL) \ - GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \ - GAMETYPE(MAPINFO_TYPE_RACE) \ - GAMETYPE(MAPINFO_TYPE_CTS) \ - GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \ - GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \ ++ GAMETYPE(MAPINFO_TYPE_ARENA, "ar", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_ASSAULT, "as", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_CTF, "ctf", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_CA, "ca", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_DEATHMATCH, "dm", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_DOMINATION, "dom", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_FREEZETAG, "ft", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_KEEPAWAY, "ka", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_KEYHUNT, "kh", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_LMS, "lms", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_NEXBALL, "nb", _("free/teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, "ons", _("teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_RACE, "race", _("free/teamplay")) \ ++ GAMETYPE(MAPINFO_TYPE_CTS, "cts", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_RUNEMATCH, "rune", _("free for all")) \ ++ GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, "tdm", _("teamplay")) \ /* nothing */ float GameType_GetID(float cnt) { float i; i = 0; - #define GAMETYPE(id,name,icon,teams) if(i++ == cnt) return id; -#define GAMETYPE(id) if(i++ == cnt) return id; ++#define GAMETYPE(id,icon,teams) if(i++ == cnt) return id; GAMETYPES #undef GAMETYPE return 0; } - string GameType_GetName(float cnt) - { - float i; - i = 0; - #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; ++#define GAMETYPE(id,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; ++#define GAMETYPE(id,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,icon) ++i; -#define GAMETYPE(id) ++i; ++#define GAMETYPE(id,icon,teams) ++i; GAMETYPES #undef GAMETYPE return i; diff --cc qcsrc/menu/xonotic/util.qh index 9606bca08,6165fb360..c3bc54f90 --- a/qcsrc/menu/xonotic/util.qh +++ b/qcsrc/menu/xonotic/util.qh @@@ -36,9 -37,6 +37,8 @@@ void URI_Get_Callback(float id, float s // game type list box stuff (does not NEED to contain all game types, other // 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);