]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Message and icon for rebooting
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 20:42:08 +0000 (22:42 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 20:42:08 +0000 (22:42 +0200)
data/gfx/hud/sb_power_reboot.tga [new file with mode: 0644]
data/gfx/hud/sb_power_reboot_icon.tga [new file with mode: 0644]
data/qcsrc/client/sbar.qc
misc/source/media/hud/psd/sb_power_reboot.psd [new file with mode: 0644]

diff --git a/data/gfx/hud/sb_power_reboot.tga b/data/gfx/hud/sb_power_reboot.tga
new file mode 100644 (file)
index 0000000..c4bc3d5
Binary files /dev/null and b/data/gfx/hud/sb_power_reboot.tga differ
diff --git a/data/gfx/hud/sb_power_reboot_icon.tga b/data/gfx/hud/sb_power_reboot_icon.tga
new file mode 100644 (file)
index 0000000..2437b97
Binary files /dev/null and b/data/gfx/hud/sb_power_reboot_icon.tga differ
index ec49dc45a94e639bf99738d75b78dd20cac436fa..a7c6e570a65101af9e793003c247f54b23c396c3 100644 (file)
@@ -3082,11 +3082,11 @@ void Sbar_Draw (void)
 \r
                if(getstati(STAT_HEALTH) > 0)\r
                {\r
+                       vector warn_pos;\r
+                       warn_pos_x = vid_conwidth / 2;\r
+                       warn_pos_y = vid_conheight - vid_conheight / 2.5;\r
                        if(getstati(STAT_ARMOR) < g_power)\r
                        {\r
-                               vector warn_pos;\r
-                               warn_pos_x = vid_conwidth / 2;\r
-                               warn_pos_y = vid_conheight - vid_conheight / 2.5;\r
                                drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_fail", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_fail_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
 \r
@@ -3095,6 +3095,9 @@ void Sbar_Draw (void)
                        }\r
                        else if(time < power_boot)\r
                        {\r
+                               drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_reboot", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_reboot_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r
+\r
                                return;\r
                        }\r
                }\r
diff --git a/misc/source/media/hud/psd/sb_power_reboot.psd b/misc/source/media/hud/psd/sb_power_reboot.psd
new file mode 100644 (file)
index 0000000..480bf43
Binary files /dev/null and b/misc/source/media/hud/psd/sb_power_reboot.psd differ