#define BUTTON_3 4
#define BUTTON_4 8
+float cl_notice_run();
void CSQC_UpdateView(float w, float h)
{
entity e;
eventchase_current_distance = 0; // start from 0 next time
}
}
-
+
// do lockview after event chase camera so that it still applies whenever necessary.
- if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
+ if(autocvar_cl_lockview)
{
setproperty(VF_ORIGIN, freeze_org);
setproperty(VF_ANGLES, freeze_ang);
if(autocvar_crosshair_hitindication)
{
- vector hitindication_color = stov(autocvar_crosshair_hitindication_color);
+ vector hitindication_color = ((autocvar_crosshair_color_per_weapon) ? stov(autocvar_crosshair_hitindication_per_weapon_color) : stov(autocvar_crosshair_hitindication_color));
+
if(hitindication_crosshair_time < hit_time)
{
if(time - hit_time < MAX_TIME_DIFF) // don't trigger the animation if it's too old
wcross_color = stov(autocvar_crosshair_dot_color);
CROSSHAIR_DRAW(wcross_resolution * autocvar_crosshair_dot_size, "gfx/crosshairdot.tga", f * autocvar_crosshair_dot_alpha);
- // FIXME why don't we use wcross_alpha here?
+ // FIXME why don't we use wcross_alpha here?cl_notice_run();
wcross_color = wcross_color_old;
}
}
CSQC_RAPTOR_HUD();
else if(hud == HUD_BUMBLEBEE)
CSQC_BUMBLE_HUD();
+ else if(hud == HUD_BUMBLEBEE_GUN)
+ CSQC_BUMBLE_GUN_HUD();
}
+
+ cl_notice_run();
+
// let's reset the view back to normal for the end
setproperty(VF_MIN, '0 0 0');
setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
acc_lev[i] = stof(argv(i)) / 100.0;
}
// let know that acc_col[] needs to be loaded
- acc_col_x[0] = -1;
+ acc_col[0] = '-1 0 0';
}
HUD_Main(); // always run these functions for alpha checks