]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
new rifle ring
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:35:36 +0000 (02:35 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:35:36 +0000 (02:35 +0300)
gfx/rifle_ring_1.tga
gfx/rifle_ring_2.tga
gfx/rifle_ring_3.tga
gfx/rifle_ring_4.tga
gfx/rifle_ring_5.tga [deleted file]
gfx/rifle_ring_6.tga [deleted file]
gfx/rifle_ring_7.tga [deleted file]
gfx/rifle_ring_8.tga [deleted file]
qcsrc/client/View.qc

index a90927cac2c5c4280bc1ec3c8e1f87f4b9f5b97c..914de35ffa0f709f2f257554ca4187ebb079810c 100644 (file)
Binary files a/gfx/rifle_ring_1.tga and b/gfx/rifle_ring_1.tga differ
index 6f6ca4c9cf33528aa14a2469bbb81a93d4d76841..db0a8088be0106996cf474cd367365ad19c7db09 100644 (file)
Binary files a/gfx/rifle_ring_2.tga and b/gfx/rifle_ring_2.tga differ
index 68f6df7ffb0870e33b5d5a44b786a653d60f0121..20348c2588810cc2c791573a69deafe3be839dc8 100644 (file)
Binary files a/gfx/rifle_ring_3.tga and b/gfx/rifle_ring_3.tga differ
index 0a5db15dca9a1076d2c7e9aa0f7aa45e192c0b73..07975e27202d90216b12a08b34822d3063265f24 100644 (file)
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 (file)
index d5cc95b..0000000
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 (file)
index 4a126e7..0000000
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 (file)
index 846212b..0000000
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 (file)
index 137e24d..0000000
Binary files a/gfx/rifle_ring_8.tga and /dev/null differ
index 05f1fe97e247209bb4be8d83d07966b825c66d1a..d3a5ea6a2d87db4e3905d7a3090dcbfd75548471 100644 (file)
@@ -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;