[nexuiz-commits] r8441 - trunk/data/qcsrc/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Dec 20 17:09:24 EST 2009
Author: div0
Date: 2009-12-20 17:09:24 -0500 (Sun, 20 Dec 2009)
New Revision: 8441
Modified:
trunk/data/qcsrc/client/View.qc
Log:
fix crosshair effects
Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc 2009-12-20 14:15:01 UTC (rev 8440)
+++ trunk/data/qcsrc/client/View.qc 2009-12-20 22:09:24 UTC (rev 8441)
@@ -721,8 +721,6 @@
wcross_scale *= 1 - cvar("_menu_alpha");
wcross_alpha *= 1 - cvar("_menu_alpha");
- wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
-
// ring around crosshair representing bullets left in camping rifle clip
if (activeweapon == WEP_CAMPINGRIFLE)
{
@@ -757,14 +755,10 @@
#define CROSSHAIR_DRAW(sz,wcross_name,wcross_alpha) \
CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_SINGLE,sz,wcross_name,wcross_alpha)
- if(bullets)
- {
- CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
- }
-
if(time < wcross_name_changedonetime && wcross_name != wcross_name_goal_prev_prev && wcross_name_goal_prev_prev)
{
f = (wcross_name_changedonetime - time) / (wcross_name_changedonetime - wcross_name_changestarttime);
+ wcross_size = drawgetimagesize(wcross_name_goal_prev_prev) * wcross_scale;
CROSSHAIR_DRAW(wcross_resolution_goal_prev_prev, wcross_name_goal_prev_prev, wcross_alpha * f * wcross_name_alpha_goal_prev_prev);
f = 1 - f;
}
@@ -772,6 +766,12 @@
{
f = 1;
}
+
+ wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
+ if(bullets)
+ {
+ CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
+ }
CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
wcross_name_alpha_goal_prev = f;
}
More information about the nexuiz-commits
mailing list