From: FruitieX Date: Fri, 23 Jul 2010 19:02:16 +0000 (+0300) Subject: moving rifle_ring_*.tga to gfx/*, the crosshairs aren't hud specific, so why should... X-Git-Tag: xonotic-v0.1.0preview~362^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0637aaf99a0b93ef02d516ed30cb669e01e3175a;p=xonotic%2Fxonotic-data.pk3dir.git moving rifle_ring_*.tga to gfx/*, the crosshairs aren't hud specific, so why should the rifle ring be? --- diff --git a/gfx/hud/default/rifle_ring_1.tga b/gfx/hud/default/rifle_ring_1.tga deleted file mode 100644 index a90927cac..000000000 Binary files a/gfx/hud/default/rifle_ring_1.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_2.tga b/gfx/hud/default/rifle_ring_2.tga deleted file mode 100644 index 6f6ca4c9c..000000000 Binary files a/gfx/hud/default/rifle_ring_2.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_3.tga b/gfx/hud/default/rifle_ring_3.tga deleted file mode 100644 index 68f6df7ff..000000000 Binary files a/gfx/hud/default/rifle_ring_3.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_4.tga b/gfx/hud/default/rifle_ring_4.tga deleted file mode 100644 index 0a5db15dc..000000000 Binary files a/gfx/hud/default/rifle_ring_4.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_5.tga b/gfx/hud/default/rifle_ring_5.tga deleted file mode 100644 index d5cc95b93..000000000 Binary files a/gfx/hud/default/rifle_ring_5.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_6.tga b/gfx/hud/default/rifle_ring_6.tga deleted file mode 100644 index 4a126e7fe..000000000 Binary files a/gfx/hud/default/rifle_ring_6.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_7.tga b/gfx/hud/default/rifle_ring_7.tga deleted file mode 100644 index 846212b06..000000000 Binary files a/gfx/hud/default/rifle_ring_7.tga and /dev/null differ diff --git a/gfx/hud/default/rifle_ring_8.tga b/gfx/hud/default/rifle_ring_8.tga deleted file mode 100644 index 137e24d1d..000000000 Binary files a/gfx/hud/default/rifle_ring_8.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga deleted file mode 100644 index a90927cac..000000000 Binary files a/gfx/hud/old/rifle_ring_1.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga deleted file mode 100644 index 6f6ca4c9c..000000000 Binary files a/gfx/hud/old/rifle_ring_2.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga deleted file mode 100644 index 68f6df7ff..000000000 Binary files a/gfx/hud/old/rifle_ring_3.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga deleted file mode 100644 index 0a5db15dc..000000000 Binary files a/gfx/hud/old/rifle_ring_4.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga deleted file mode 100644 index d5cc95b93..000000000 Binary files a/gfx/hud/old/rifle_ring_5.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga deleted file mode 100644 index 4a126e7fe..000000000 Binary files a/gfx/hud/old/rifle_ring_6.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga deleted file mode 100644 index 846212b06..000000000 Binary files a/gfx/hud/old/rifle_ring_7.tga and /dev/null differ diff --git a/gfx/hud/old/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga deleted file mode 100644 index 137e24d1d..000000000 Binary files a/gfx/hud/old/rifle_ring_8.tga and /dev/null differ diff --git a/gfx/rifle_ring_1.tga b/gfx/rifle_ring_1.tga new file mode 100644 index 000000000..a90927cac Binary files /dev/null and b/gfx/rifle_ring_1.tga differ diff --git a/gfx/rifle_ring_2.tga b/gfx/rifle_ring_2.tga new file mode 100644 index 000000000..6f6ca4c9c Binary files /dev/null and b/gfx/rifle_ring_2.tga differ diff --git a/gfx/rifle_ring_3.tga b/gfx/rifle_ring_3.tga new file mode 100644 index 000000000..68f6df7ff Binary files /dev/null and b/gfx/rifle_ring_3.tga differ diff --git a/gfx/rifle_ring_4.tga b/gfx/rifle_ring_4.tga new file mode 100644 index 000000000..0a5db15dc Binary files /dev/null and b/gfx/rifle_ring_4.tga differ diff --git a/gfx/rifle_ring_5.tga b/gfx/rifle_ring_5.tga new file mode 100644 index 000000000..d5cc95b93 Binary files /dev/null and b/gfx/rifle_ring_5.tga differ diff --git a/gfx/rifle_ring_6.tga b/gfx/rifle_ring_6.tga new file mode 100644 index 000000000..4a126e7fe Binary files /dev/null and b/gfx/rifle_ring_6.tga differ diff --git a/gfx/rifle_ring_7.tga b/gfx/rifle_ring_7.tga new file mode 100644 index 000000000..846212b06 Binary files /dev/null and b/gfx/rifle_ring_7.tga differ diff --git a/gfx/rifle_ring_8.tga b/gfx/rifle_ring_8.tga new file mode 100644 index 000000000..137e24d1d Binary files /dev/null and b/gfx/rifle_ring_8.tga differ diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index c8076b350..6d89e8d89 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -778,7 +778,7 @@ void CSQC_UpdateView(float w, float h) bullets = 0; #define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \ - drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL) + drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL) #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \ do \