From: Severin Meyer Date: Mon, 18 Jul 2016 08:53:55 +0000 (+0200) Subject: Add CTF stalemate indicator to HUD X-Git-Tag: xonotic-v0.8.2~700^2~11^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ee9a6b2c4288eebaeb0b3882e583c4ab4efc445;p=xonotic%2Fxonotic-data.pk3dir.git Add CTF stalemate indicator to HUD --- diff --git a/gfx/hud/default/flag_stalemate.tga b/gfx/hud/default/flag_stalemate.tga new file mode 100644 index 000000000..c52ebb8d1 Binary files /dev/null and b/gfx/hud/default/flag_stalemate.tga differ diff --git a/gfx/hud/luma/flag_blue_lost.tga b/gfx/hud/luma/flag_blue_lost.tga index 2c5229aa9..1609b782c 100644 Binary files a/gfx/hud/luma/flag_blue_lost.tga and b/gfx/hud/luma/flag_blue_lost.tga differ diff --git a/gfx/hud/luma/flag_neutral_lost.tga b/gfx/hud/luma/flag_neutral_lost.tga index e6fd5c5bc..85ef904c5 100644 Binary files a/gfx/hud/luma/flag_neutral_lost.tga and b/gfx/hud/luma/flag_neutral_lost.tga differ diff --git a/gfx/hud/luma/flag_pink_lost.tga b/gfx/hud/luma/flag_pink_lost.tga index 0cd546719..f636620b5 100644 Binary files a/gfx/hud/luma/flag_pink_lost.tga and b/gfx/hud/luma/flag_pink_lost.tga differ diff --git a/gfx/hud/luma/flag_red_lost.tga b/gfx/hud/luma/flag_red_lost.tga index 014a4163c..7260275ea 100644 Binary files a/gfx/hud/luma/flag_red_lost.tga and b/gfx/hud/luma/flag_red_lost.tga differ diff --git a/gfx/hud/luma/flag_stalemate.tga b/gfx/hud/luma/flag_stalemate.tga new file mode 100644 index 000000000..c52ebb8d1 Binary files /dev/null and b/gfx/hud/luma/flag_stalemate.tga differ diff --git a/gfx/hud/luma/flag_yellow_lost.tga b/gfx/hud/luma/flag_yellow_lost.tga index bd5f3def2..ec45f1174 100644 Binary files a/gfx/hud/luma/flag_yellow_lost.tga and b/gfx/hud/luma/flag_yellow_lost.tga differ diff --git a/gfx/hud/luma/notify_blue_lost.tga b/gfx/hud/luma/notify_blue_lost.tga index 2c5229aa9..1609b782c 100644 Binary files a/gfx/hud/luma/notify_blue_lost.tga and b/gfx/hud/luma/notify_blue_lost.tga differ diff --git a/gfx/hud/luma/notify_neutral_lost.tga b/gfx/hud/luma/notify_neutral_lost.tga index e6fd5c5bc..85ef904c5 100644 Binary files a/gfx/hud/luma/notify_neutral_lost.tga and b/gfx/hud/luma/notify_neutral_lost.tga differ diff --git a/gfx/hud/luma/notify_pink_lost.tga b/gfx/hud/luma/notify_pink_lost.tga index 0cd546719..f636620b5 100644 Binary files a/gfx/hud/luma/notify_pink_lost.tga and b/gfx/hud/luma/notify_pink_lost.tga differ diff --git a/gfx/hud/luma/notify_red_lost.tga b/gfx/hud/luma/notify_red_lost.tga index 014a4163c..7260275ea 100644 Binary files a/gfx/hud/luma/notify_red_lost.tga and b/gfx/hud/luma/notify_red_lost.tga differ diff --git a/gfx/hud/luma/notify_yellow_lost.tga b/gfx/hud/luma/notify_yellow_lost.tga index bd5f3def2..ec45f1174 100644 Binary files a/gfx/hud/luma/notify_yellow_lost.tga and b/gfx/hud/luma/notify_yellow_lost.tga differ diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index 54c835831..cff671724 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -264,6 +264,8 @@ void HUD_Mod_CTF(vector pos, vector mySize) #define X(team) MACRO_BEGIN { \ f = bound(0, team##flag_statuschange_elapsedtime * 2, 1); \ + if (team##_icon && 0) /* TODO Replace 0 with stalemate condition */ \ + drawpic_aspect_skin(team##flag_pos, "flag_stalemate", flag_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); \ if (team##_icon_prevstatus && f < 1) \ drawpic_aspect_skin_expanding(team##flag_pos, team##_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * team##_alpha_prevstatus, DRAWFLAG_NORMAL, f); \ if (team##_icon) \