float contentavgalpha, liquidalpha_prev;
vector liquidcolor_prev;
+float chase_current_distance;
+
void CSQC_UpdateView(float w, float h)
{
entity e;
vid_height = vf_size_y;
vector reticle_pos, reticle_size;
+ vector splash_pos, splash_size;
WaypointSprite_Load();
input_angles = warpzone_fixview_cl_viewangles;
view_angles = warpzone_fixview_angles;
+ // event chase cam
+ if(spectatee_status >= 0 && (autocvar_cl_chase_death || autocvar_cl_chase_intermission))
+ if(autocvar_chase_active <= 0) // greater than 0 means it's enabled manually
+ {
+ if((autocvar_cl_chase_death && getstati(STAT_HEALTH) <= 0 && !intermission) || (autocvar_cl_chase_intermission && intermission) && intermission <= 1) // not during the map voting screen
+ {
+ if(!autocvar_chase_active)
+ cvar_set("chase_active", "-1"); // -1 enables chase_active as well as marking it as set by this code, and not by the user (which would be 1)
+
+ // make the camera smooth back
+ if(autocvar_cl_chase_speed && chase_current_distance < autocvar_cl_chase_distance)
+ chase_current_distance += autocvar_cl_chase_speed * (autocvar_cl_chase_distance - chase_current_distance) * frametime; // slow down smoothly
+ else if(chase_current_distance != autocvar_cl_chase_distance)
+ chase_current_distance = autocvar_cl_chase_distance;
+
+ vector target_origin;
+ target_origin = pmove_org - view_forward * chase_current_distance;
+
+ // don't allow the camera to go through walls
+ traceline(pmove_org, target_origin, MOVE_NORMAL, self);
+ if(trace_fraction == 1)
+ {
+ makevectors(view_angles);
+ R_SetView(VF_ORIGIN, target_origin);
+ }
+ }
+ else if(autocvar_chase_active < 0)
+ {
+ cvar_set("chase_active", "0");
+ chase_current_distance = 0; // start from 0
+ }
+ }
+
if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0))
{
pmove_org = freeze_pmove_org;
if(autocvar_hud_damage)
{
+ splash_size_x = max(vid_conwidth, vid_conheight);
+ splash_size_y = max(vid_conwidth, vid_conheight);
+ splash_pos_x = (vid_conwidth - splash_size_x) / 2;
+ splash_pos_y = (vid_conheight - splash_size_y) / 2;
+
float myhealth_flash_temp;
myhealth = getstati(STAT_HEALTH);
drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, autocvar_hud_damage_gentle_alpha_multiplier * bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
}
else
- drawpic(reticle_pos, "gfx/blood", reticle_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
+ drawpic(splash_pos, "gfx/blood", splash_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
}
// Draw the mouse cursor
wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
// crosshair rings for weapon stats
- if (autocvar_crosshair_ring)
+ if (autocvar_crosshair_ring || autocvar_crosshair_ring_reload)
{
// declarations and stats
float ring_value, ring_scale, ring_alpha, ring_inner_value, ring_inner_alpha;
ring_inner_value = bound(0, autocvar_crosshair_ring_nex_currentcharge_scale * (nex_charge - nex_charge_movingavg), 1);
}
- ring_inner_alpha = wcross_alpha * autocvar_crosshair_ring_nex_inner_alpha;
- ring_inner_image = "gfx/crosshair_ring_inner.tga";
+ ring_inner_alpha = autocvar_crosshair_ring_nex_inner_alpha;
ring_inner_rgb = eX * autocvar_crosshair_ring_nex_inner_color_red + eY * autocvar_crosshair_ring_nex_inner_color_green + eZ * autocvar_crosshair_ring_nex_inner_color_blue;
-
+ ring_inner_image = "gfx/crosshair_ring_inner.tga";
+
// draw the outer ring to show the current charge of the weapon
ring_value = nex_charge;
- ring_alpha = wcross_alpha * autocvar_crosshair_ring_nex_alpha;
+ ring_alpha = autocvar_crosshair_ring_nex_alpha;
ring_rgb = wcross_color;
ring_image = "gfx/crosshair_ring_nexgun.tga";
}
else if (activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer)
{
ring_value = bound(0, getstati(STAT_LAYED_MINES) / minelayer_maxmines, 1); // if you later need to use the count of bullets in another place, then add a float for it. For now, no need to.
- ring_alpha = wcross_alpha * autocvar_crosshair_ring_minelayer_alpha;
+ ring_alpha = autocvar_crosshair_ring_minelayer_alpha;
ring_rgb = wcross_color;
ring_image = "gfx/crosshair_ring.tga";
}
// Note: This is to stop Taoki from complaining that the image doesn't match all potential balances.
// if a new image for another weapon is added, add the code (and its respective file/value) here
- if ((activeweapon == WEP_SNIPERRIFLE) && (weapon_clipsize == 8))
+ if ((activeweapon == WEP_SNIPERRIFLE) && (weapon_clipsize == 80))
ring_image = "gfx/crosshair_ring_sniperrifle.tga";
else
ring_image = "gfx/crosshair_ring.tga";
}
if (autocvar_crosshair_ring_inner && ring_inner_value) // lets draw a ring inside a ring so you can ring while you ring
- DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_inner_image, ring_inner_value, ring_inner_rgb, ring_inner_alpha, DRAWFLAG_ADDITIVE);
+ DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_inner_image, ring_inner_value, ring_inner_rgb, wcross_alpha * ring_inner_alpha, DRAWFLAG_ADDITIVE);
if (ring_value)
- DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_image, ring_value, ring_rgb, ring_alpha, DRAWFLAG_ADDITIVE);
+ DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_image, ring_value, ring_rgb, wcross_alpha * ring_alpha, DRAWFLAG_ADDITIVE);
}
#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
projects / xonotic / xonotic-data.pk3dir.git / blobdiff