Update the gametype_icon images for all of the themes -- now just gotta clean up...

diff --git a/gfx/menu/luminos/gametype-icon-ar.tga b/gfx/menu/luminos/gametype-icon-ar.tga
deleted file mode 100644 (file)
index f49fa28..0000000
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 (file)
index 59bdfc1..0000000
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 (file)
index c82a992..0000000
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 (file)
index cc3bc7c..0000000
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 (file)
index bc917ec..0000000
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 (file)
index 1266f59..0000000
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 (file)
index f7637f9..0000000
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 (file)
index 03fe067..0000000
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 (file)
index 8028b67..0000000
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 (file)
index 21e472c..0000000
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 (file)
index ca0d2aa..0000000
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 (file)
index 5549651..0000000
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 (file)
index b4f7441..0000000
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 (file)
index a224866..0000000
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 (file)
index 9874c7e..0000000
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 (file)
index 6906411..0000000
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 (file)
index cc0b938..0000000
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 (file)
index 0000000..f49fa28
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 (file)
index 0000000..59bdfc1
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 (file)
index 0000000..c82a992
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 (file)
index 0000000..cc3bc7c
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 (file)
index 0000000..bc917ec
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 (file)
index 0000000..1266f59
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 (file)
index 0000000..f7637f9
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 (file)
index 0000000..03fe067
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 (file)
index 0000000..8028b67
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 (file)
index 0000000..21e472c
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 (file)
index 0000000..ca0d2aa
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 (file)
index 0000000..5549651
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 (file)
index 0000000..b4f7441
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 (file)
index 0000000..a224866
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 (file)
index 0000000..9874c7e
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 (file)
index 0000000..6906411
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 (file)
index 0000000..cc0b938
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 (file)
index 0000000..f49fa28
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 (file)
index 0000000..59bdfc1
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 (file)
index 0000000..c82a992
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 (file)
index 0000000..cc3bc7c
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 (file)
index 0000000..bc917ec
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 (file)
index 0000000..1266f59
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 (file)
index 0000000..f7637f9
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 (file)
index 0000000..03fe067
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 (file)
index 0000000..8028b67
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 (file)
index 0000000..21e472c
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 (file)
index 0000000..ca0d2aa
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 (file)
index 0000000..5549651
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 (file)
index 0000000..b4f7441
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 (file)
index 0000000..a224866
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 (file)
index 0000000..9874c7e
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 (file)
index 0000000..6906411
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 (file)
index 0000000..cc0b938
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 (file)
index 0000000..ca720bc
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 (file)
index 0000000..750c43f
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 (file)
index 0000000..9275e2d
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 (file)
index 0000000..99499fe
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 (file)
index 0000000..ae241c5
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 (file)
index 0000000..9778335
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 (file)
index 0000000..5663a27
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 (file)
index 0000000..2e0cac0
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 (file)
index 0000000..cfcea61
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 (file)
index 0000000..c65ffba
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 (file)
index 0000000..e44ade0
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 (file)
index 0000000..c732414
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 (file)
index 0000000..fa4bf49
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 (file)
index 0000000..e1e00cf
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 (file)
index 0000000..4500c0f
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 (file)
index 0000000..79c8f30
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 (file)
index 0000000..e20b7fa
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 1411244db7f2e3d5f2ddb9046909f5a479e0f269..9b0bdc8250b88d69b864cb544d32f436720654ec 100644 (file)
--- 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);