From: Samual <samual@xonotic.org>
Date: Mon, 16 Jan 2012 02:26:19 +0000 (-0500)
Subject: Update the gametype_icon images for all of the themes -- now just gotta clean up... 
X-Git-Tag: xonotic-v0.6.0~159
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e79c20ee78e7e27be269b63e2dbd6ddf6e8a9bb4;p=xonotic%2Fxonotic-data.pk3dir.git

Update the gametype_icon images for all of the themes -- now just gotta clean up the code a bit
---

diff --git a/gfx/menu/luminos/gametype-icon-ar.tga b/gfx/menu/luminos/gametype-icon-ar.tga
deleted file mode 100644
index f49fa28ff..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ar.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-as.tga b/gfx/menu/luminos/gametype-icon-as.tga
deleted file mode 100644
index 59bdfc1fc..000000000
Binary files a/gfx/menu/luminos/gametype-icon-as.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-ca.tga b/gfx/menu/luminos/gametype-icon-ca.tga
deleted file mode 100644
index c82a9929a..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ca.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-ctf.tga b/gfx/menu/luminos/gametype-icon-ctf.tga
deleted file mode 100644
index cc3bc7cdf..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ctf.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-cts.tga b/gfx/menu/luminos/gametype-icon-cts.tga
deleted file mode 100644
index bc917ecc5..000000000
Binary files a/gfx/menu/luminos/gametype-icon-cts.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-dm.tga b/gfx/menu/luminos/gametype-icon-dm.tga
deleted file mode 100644
index 1266f599c..000000000
Binary files a/gfx/menu/luminos/gametype-icon-dm.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-dom.tga b/gfx/menu/luminos/gametype-icon-dom.tga
deleted file mode 100644
index f7637f96b..000000000
Binary files a/gfx/menu/luminos/gametype-icon-dom.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-duel.tga b/gfx/menu/luminos/gametype-icon-duel.tga
deleted file mode 100644
index 03fe067c9..000000000
Binary files a/gfx/menu/luminos/gametype-icon-duel.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-ft.tga b/gfx/menu/luminos/gametype-icon-ft.tga
deleted file mode 100644
index 8028b67a7..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ft.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-ka.tga b/gfx/menu/luminos/gametype-icon-ka.tga
deleted file mode 100644
index 21e472c01..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ka.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-kh.tga b/gfx/menu/luminos/gametype-icon-kh.tga
deleted file mode 100644
index ca0d2aa05..000000000
Binary files a/gfx/menu/luminos/gametype-icon-kh.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-lms.tga b/gfx/menu/luminos/gametype-icon-lms.tga
deleted file mode 100644
index 55496515e..000000000
Binary files a/gfx/menu/luminos/gametype-icon-lms.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-nb.tga b/gfx/menu/luminos/gametype-icon-nb.tga
deleted file mode 100644
index b4f7441a7..000000000
Binary files a/gfx/menu/luminos/gametype-icon-nb.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-ons.tga b/gfx/menu/luminos/gametype-icon-ons.tga
deleted file mode 100644
index a2248667a..000000000
Binary files a/gfx/menu/luminos/gametype-icon-ons.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-race.tga b/gfx/menu/luminos/gametype-icon-race.tga
deleted file mode 100644
index 9874c7e85..000000000
Binary files a/gfx/menu/luminos/gametype-icon-race.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-rune.tga b/gfx/menu/luminos/gametype-icon-rune.tga
deleted file mode 100644
index 6906411d3..000000000
Binary files a/gfx/menu/luminos/gametype-icon-rune.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype-icon-tdm.tga b/gfx/menu/luminos/gametype-icon-tdm.tga
deleted file mode 100644
index cc0b938d7..000000000
Binary files a/gfx/menu/luminos/gametype-icon-tdm.tga and /dev/null differ
diff --git a/gfx/menu/luminos/gametype_arena.tga b/gfx/menu/luminos/gametype_arena.tga
new file mode 100644
index 000000000..f49fa28ff
Binary files /dev/null and b/gfx/menu/luminos/gametype_arena.tga differ
diff --git a/gfx/menu/luminos/gametype_as.tga b/gfx/menu/luminos/gametype_as.tga
new file mode 100644
index 000000000..59bdfc1fc
Binary files /dev/null and b/gfx/menu/luminos/gametype_as.tga differ
diff --git a/gfx/menu/luminos/gametype_ca.tga b/gfx/menu/luminos/gametype_ca.tga
new file mode 100644
index 000000000..c82a9929a
Binary files /dev/null and b/gfx/menu/luminos/gametype_ca.tga differ
diff --git a/gfx/menu/luminos/gametype_ctf.tga b/gfx/menu/luminos/gametype_ctf.tga
new file mode 100644
index 000000000..cc3bc7cdf
Binary files /dev/null and b/gfx/menu/luminos/gametype_ctf.tga differ
diff --git a/gfx/menu/luminos/gametype_cts.tga b/gfx/menu/luminos/gametype_cts.tga
new file mode 100644
index 000000000..bc917ecc5
Binary files /dev/null and b/gfx/menu/luminos/gametype_cts.tga differ
diff --git a/gfx/menu/luminos/gametype_dm.tga b/gfx/menu/luminos/gametype_dm.tga
new file mode 100644
index 000000000..1266f599c
Binary files /dev/null and b/gfx/menu/luminos/gametype_dm.tga differ
diff --git a/gfx/menu/luminos/gametype_dom.tga b/gfx/menu/luminos/gametype_dom.tga
new file mode 100644
index 000000000..f7637f96b
Binary files /dev/null and b/gfx/menu/luminos/gametype_dom.tga differ
diff --git a/gfx/menu/luminos/gametype_duel.tga b/gfx/menu/luminos/gametype_duel.tga
new file mode 100644
index 000000000..03fe067c9
Binary files /dev/null and b/gfx/menu/luminos/gametype_duel.tga differ
diff --git a/gfx/menu/luminos/gametype_freezetag.tga b/gfx/menu/luminos/gametype_freezetag.tga
new file mode 100644
index 000000000..8028b67a7
Binary files /dev/null and b/gfx/menu/luminos/gametype_freezetag.tga differ
diff --git a/gfx/menu/luminos/gametype_keepaway.tga b/gfx/menu/luminos/gametype_keepaway.tga
new file mode 100644
index 000000000..21e472c01
Binary files /dev/null and b/gfx/menu/luminos/gametype_keepaway.tga differ
diff --git a/gfx/menu/luminos/gametype_kh.tga b/gfx/menu/luminos/gametype_kh.tga
new file mode 100644
index 000000000..ca0d2aa05
Binary files /dev/null and b/gfx/menu/luminos/gametype_kh.tga differ
diff --git a/gfx/menu/luminos/gametype_lms.tga b/gfx/menu/luminos/gametype_lms.tga
new file mode 100644
index 000000000..55496515e
Binary files /dev/null and b/gfx/menu/luminos/gametype_lms.tga differ
diff --git a/gfx/menu/luminos/gametype_nexball.tga b/gfx/menu/luminos/gametype_nexball.tga
new file mode 100644
index 000000000..b4f7441a7
Binary files /dev/null and b/gfx/menu/luminos/gametype_nexball.tga differ
diff --git a/gfx/menu/luminos/gametype_ons.tga b/gfx/menu/luminos/gametype_ons.tga
new file mode 100644
index 000000000..a2248667a
Binary files /dev/null and b/gfx/menu/luminos/gametype_ons.tga differ
diff --git a/gfx/menu/luminos/gametype_rc.tga b/gfx/menu/luminos/gametype_rc.tga
new file mode 100644
index 000000000..9874c7e85
Binary files /dev/null and b/gfx/menu/luminos/gametype_rc.tga differ
diff --git a/gfx/menu/luminos/gametype_rune.tga b/gfx/menu/luminos/gametype_rune.tga
new file mode 100644
index 000000000..6906411d3
Binary files /dev/null and b/gfx/menu/luminos/gametype_rune.tga differ
diff --git a/gfx/menu/luminos/gametype_tdm.tga b/gfx/menu/luminos/gametype_tdm.tga
new file mode 100644
index 000000000..cc0b938d7
Binary files /dev/null and b/gfx/menu/luminos/gametype_tdm.tga differ
diff --git a/gfx/menu/wickedx/gametype_arena.tga b/gfx/menu/wickedx/gametype_arena.tga
new file mode 100644
index 000000000..f49fa28ff
Binary files /dev/null and b/gfx/menu/wickedx/gametype_arena.tga differ
diff --git a/gfx/menu/wickedx/gametype_as.tga b/gfx/menu/wickedx/gametype_as.tga
new file mode 100644
index 000000000..59bdfc1fc
Binary files /dev/null and b/gfx/menu/wickedx/gametype_as.tga differ
diff --git a/gfx/menu/wickedx/gametype_ca.tga b/gfx/menu/wickedx/gametype_ca.tga
new file mode 100644
index 000000000..c82a9929a
Binary files /dev/null and b/gfx/menu/wickedx/gametype_ca.tga differ
diff --git a/gfx/menu/wickedx/gametype_ctf.tga b/gfx/menu/wickedx/gametype_ctf.tga
new file mode 100644
index 000000000..cc3bc7cdf
Binary files /dev/null and b/gfx/menu/wickedx/gametype_ctf.tga differ
diff --git a/gfx/menu/wickedx/gametype_cts.tga b/gfx/menu/wickedx/gametype_cts.tga
new file mode 100644
index 000000000..bc917ecc5
Binary files /dev/null and b/gfx/menu/wickedx/gametype_cts.tga differ
diff --git a/gfx/menu/wickedx/gametype_dm.tga b/gfx/menu/wickedx/gametype_dm.tga
new file mode 100644
index 000000000..1266f599c
Binary files /dev/null and b/gfx/menu/wickedx/gametype_dm.tga differ
diff --git a/gfx/menu/wickedx/gametype_dom.tga b/gfx/menu/wickedx/gametype_dom.tga
new file mode 100644
index 000000000..f7637f96b
Binary files /dev/null and b/gfx/menu/wickedx/gametype_dom.tga differ
diff --git a/gfx/menu/wickedx/gametype_duel.tga b/gfx/menu/wickedx/gametype_duel.tga
new file mode 100644
index 000000000..03fe067c9
Binary files /dev/null and b/gfx/menu/wickedx/gametype_duel.tga differ
diff --git a/gfx/menu/wickedx/gametype_freezetag.tga b/gfx/menu/wickedx/gametype_freezetag.tga
new file mode 100644
index 000000000..8028b67a7
Binary files /dev/null and b/gfx/menu/wickedx/gametype_freezetag.tga differ
diff --git a/gfx/menu/wickedx/gametype_keepaway.tga b/gfx/menu/wickedx/gametype_keepaway.tga
new file mode 100644
index 000000000..21e472c01
Binary files /dev/null and b/gfx/menu/wickedx/gametype_keepaway.tga differ
diff --git a/gfx/menu/wickedx/gametype_kh.tga b/gfx/menu/wickedx/gametype_kh.tga
new file mode 100644
index 000000000..ca0d2aa05
Binary files /dev/null and b/gfx/menu/wickedx/gametype_kh.tga differ
diff --git a/gfx/menu/wickedx/gametype_lms.tga b/gfx/menu/wickedx/gametype_lms.tga
new file mode 100644
index 000000000..55496515e
Binary files /dev/null and b/gfx/menu/wickedx/gametype_lms.tga differ
diff --git a/gfx/menu/wickedx/gametype_nexball.tga b/gfx/menu/wickedx/gametype_nexball.tga
new file mode 100644
index 000000000..b4f7441a7
Binary files /dev/null and b/gfx/menu/wickedx/gametype_nexball.tga differ
diff --git a/gfx/menu/wickedx/gametype_ons.tga b/gfx/menu/wickedx/gametype_ons.tga
new file mode 100644
index 000000000..a2248667a
Binary files /dev/null and b/gfx/menu/wickedx/gametype_ons.tga differ
diff --git a/gfx/menu/wickedx/gametype_rc.tga b/gfx/menu/wickedx/gametype_rc.tga
new file mode 100644
index 000000000..9874c7e85
Binary files /dev/null and b/gfx/menu/wickedx/gametype_rc.tga differ
diff --git a/gfx/menu/wickedx/gametype_rune.tga b/gfx/menu/wickedx/gametype_rune.tga
new file mode 100644
index 000000000..6906411d3
Binary files /dev/null and b/gfx/menu/wickedx/gametype_rune.tga differ
diff --git a/gfx/menu/wickedx/gametype_tdm.tga b/gfx/menu/wickedx/gametype_tdm.tga
new file mode 100644
index 000000000..cc0b938d7
Binary files /dev/null and b/gfx/menu/wickedx/gametype_tdm.tga differ
diff --git a/gfx/menu/xaw/gametype_arena.tga b/gfx/menu/xaw/gametype_arena.tga
new file mode 100644
index 000000000..ca720bc72
Binary files /dev/null and b/gfx/menu/xaw/gametype_arena.tga differ
diff --git a/gfx/menu/xaw/gametype_as.tga b/gfx/menu/xaw/gametype_as.tga
new file mode 100644
index 000000000..750c43f59
Binary files /dev/null and b/gfx/menu/xaw/gametype_as.tga differ
diff --git a/gfx/menu/xaw/gametype_ca.tga b/gfx/menu/xaw/gametype_ca.tga
new file mode 100644
index 000000000..9275e2de2
Binary files /dev/null and b/gfx/menu/xaw/gametype_ca.tga differ
diff --git a/gfx/menu/xaw/gametype_ctf.tga b/gfx/menu/xaw/gametype_ctf.tga
new file mode 100644
index 000000000..99499fec4
Binary files /dev/null and b/gfx/menu/xaw/gametype_ctf.tga differ
diff --git a/gfx/menu/xaw/gametype_cts.tga b/gfx/menu/xaw/gametype_cts.tga
new file mode 100644
index 000000000..ae241c599
Binary files /dev/null and b/gfx/menu/xaw/gametype_cts.tga differ
diff --git a/gfx/menu/xaw/gametype_dm.tga b/gfx/menu/xaw/gametype_dm.tga
new file mode 100644
index 000000000..97783352d
Binary files /dev/null and b/gfx/menu/xaw/gametype_dm.tga differ
diff --git a/gfx/menu/xaw/gametype_dom.tga b/gfx/menu/xaw/gametype_dom.tga
new file mode 100644
index 000000000..5663a2755
Binary files /dev/null and b/gfx/menu/xaw/gametype_dom.tga differ
diff --git a/gfx/menu/xaw/gametype_duel.tga b/gfx/menu/xaw/gametype_duel.tga
new file mode 100644
index 000000000..2e0cac09b
Binary files /dev/null and b/gfx/menu/xaw/gametype_duel.tga differ
diff --git a/gfx/menu/xaw/gametype_freezetag.tga b/gfx/menu/xaw/gametype_freezetag.tga
new file mode 100644
index 000000000..cfcea617d
Binary files /dev/null and b/gfx/menu/xaw/gametype_freezetag.tga differ
diff --git a/gfx/menu/xaw/gametype_keepaway.tga b/gfx/menu/xaw/gametype_keepaway.tga
new file mode 100644
index 000000000..c65ffba71
Binary files /dev/null and b/gfx/menu/xaw/gametype_keepaway.tga differ
diff --git a/gfx/menu/xaw/gametype_kh.tga b/gfx/menu/xaw/gametype_kh.tga
new file mode 100644
index 000000000..e44ade005
Binary files /dev/null and b/gfx/menu/xaw/gametype_kh.tga differ
diff --git a/gfx/menu/xaw/gametype_lms.tga b/gfx/menu/xaw/gametype_lms.tga
new file mode 100644
index 000000000..c7324141f
Binary files /dev/null and b/gfx/menu/xaw/gametype_lms.tga differ
diff --git a/gfx/menu/xaw/gametype_nexball.tga b/gfx/menu/xaw/gametype_nexball.tga
new file mode 100644
index 000000000..fa4bf496c
Binary files /dev/null and b/gfx/menu/xaw/gametype_nexball.tga differ
diff --git a/gfx/menu/xaw/gametype_ons.tga b/gfx/menu/xaw/gametype_ons.tga
new file mode 100644
index 000000000..e1e00cf1b
Binary files /dev/null and b/gfx/menu/xaw/gametype_ons.tga differ
diff --git a/gfx/menu/xaw/gametype_rc.tga b/gfx/menu/xaw/gametype_rc.tga
new file mode 100644
index 000000000..4500c0fc1
Binary files /dev/null and b/gfx/menu/xaw/gametype_rc.tga differ
diff --git a/gfx/menu/xaw/gametype_rune.tga b/gfx/menu/xaw/gametype_rune.tga
new file mode 100644
index 000000000..79c8f30b0
Binary files /dev/null and b/gfx/menu/xaw/gametype_rune.tga differ
diff --git a/gfx/menu/xaw/gametype_tdm.tga b/gfx/menu/xaw/gametype_tdm.tga
new file mode 100644
index 000000000..e20b7fa7c
Binary files /dev/null and b/gfx/menu/xaw/gametype_tdm.tga differ
diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c
index 1411244db..9b0bdc825 100644
--- a/qcsrc/menu/xonotic/gametypelist.c
+++ b/qcsrc/menu/xonotic/gametypelist.c
@@ -74,7 +74,7 @@ void XonoticGametypeList_drawListBoxItem(entity me, float i, vector absSize, flo
 	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);
+	draw_Picture(me.columnIconOrigin * eX, strcat("gametype_", MapInfo_Type_ToString(GameType_GetID(i))), me.columnIconSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
 	s = MapInfo_Type_ToText(GameType_GetID(i));
 	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);