From: FruitieX Date: Fri, 30 Jul 2010 23:35:36 +0000 (+0300) Subject: new rifle ring X-Git-Tag: xonotic-v0.1.0preview~384 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb7498be766e4df7ea2eaba3a4c47cf5d4ed3943;p=xonotic%2Fxonotic-data.pk3dir.git new rifle ring --- diff --git a/gfx/rifle_ring_1.tga b/gfx/rifle_ring_1.tga index a90927cac..914de35ff 100644 Binary files a/gfx/rifle_ring_1.tga and b/gfx/rifle_ring_1.tga differ diff --git a/gfx/rifle_ring_2.tga b/gfx/rifle_ring_2.tga index 6f6ca4c9c..db0a8088b 100644 Binary files a/gfx/rifle_ring_2.tga and b/gfx/rifle_ring_2.tga differ diff --git a/gfx/rifle_ring_3.tga b/gfx/rifle_ring_3.tga index 68f6df7ff..20348c258 100644 Binary files a/gfx/rifle_ring_3.tga and b/gfx/rifle_ring_3.tga differ diff --git a/gfx/rifle_ring_4.tga b/gfx/rifle_ring_4.tga index 0a5db15dc..07975e272 100644 Binary files a/gfx/rifle_ring_4.tga and b/gfx/rifle_ring_4.tga differ diff --git a/gfx/rifle_ring_5.tga b/gfx/rifle_ring_5.tga deleted file mode 100644 index d5cc95b93..000000000 Binary files a/gfx/rifle_ring_5.tga and /dev/null differ diff --git a/gfx/rifle_ring_6.tga b/gfx/rifle_ring_6.tga deleted file mode 100644 index 4a126e7fe..000000000 Binary files a/gfx/rifle_ring_6.tga and /dev/null differ diff --git a/gfx/rifle_ring_7.tga b/gfx/rifle_ring_7.tga deleted file mode 100644 index 846212b06..000000000 Binary files a/gfx/rifle_ring_7.tga and /dev/null differ diff --git a/gfx/rifle_ring_8.tga b/gfx/rifle_ring_8.tga deleted file mode 100644 index 137e24d1d..000000000 Binary files a/gfx/rifle_ring_8.tga and /dev/null differ diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 05f1fe97e..d3a5ea6a2 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -775,7 +775,7 @@ void CSQC_UpdateView(float w, float h) if (activeweapon == WEP_CAMPINGRIFLE) { ring_scale = cvar("crosshair_campingrifle_ring_size"); - bullets = bound(0, getstati(STAT_BULLETS_LOADED), 8); + bullets = bound(0, getstati(STAT_BULLETS_LOADED), 4); } else bullets = 0;