X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fview.qc;h=2521548e15b0d1e4671c8029953cecfacb00ccae;hb=451e02a2857d8c671f6dcf6a0639ea7c609b3ba9;hp=8a583ba699ee74e5443c1afd1456eca77740d02c;hpb=393022c0e9b00481e68d1db786e96e4ffb7f37e0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 8a583ba69..2521548e1 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,6 +22,8 @@ #include #include +#include + #include #include #include @@ -122,7 +125,6 @@ void calc_followmodel_ofs(entity view) float frac; vector gunorg = '0 0 0'; static vector vel_average; - static vector gunorg_prev = '0 0 0'; static vector gunorg_adjustment_highpass; static vector gunorg_adjustment_lowpass; @@ -294,7 +296,7 @@ void viewmodel_draw(entity this) wasinvehicle = invehicle; Weapon wep = activeweapon; int c = entcs_GetClientColors(current_player); - vector g = weaponentity_glowmod(wep, c); + vector g = weaponentity_glowmod(wep, NULL, c); entity me = CSQCModel_server2csqc(player_localentnum - 1); int fx = ((me.csqcmodel_effects & EFMASK_CHEAP) | EF_NODEPTHTEST) @@ -311,6 +313,9 @@ void viewmodel_draw(entity this) { static string name_last; string name = wep.mdl; + string newname = wep.wr_viewmodel(wep, this); + if(newname) + name = newname; bool swap = name != name_last; // if (swap) { @@ -648,7 +653,7 @@ float TrueAimCheck() mv = MOVE_NORMAL; if(zoomscript_caught) { - tracebox(view_origin, '0 0 0', '0 0 0', view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta); + tracebox(view_origin, '0 0 0', '0 0 0', view_origin + view_forward * max_shot_distance, mv, ta); return EnemyHitCheck(); } break; @@ -674,7 +679,7 @@ float TrueAimCheck() vecs = decompressShotOrigin(STAT(SHOTORG)); - traceline(traceorigin, traceorigin + view_forward * MAX_SHOT_DISTANCE, mv, ta); + traceline(traceorigin, traceorigin + view_forward * max_shot_distance, mv, ta); trueaimpoint = trace_endpos; if(vdist((trueaimpoint - traceorigin), <, g_trueaim_minrange)) @@ -710,7 +715,6 @@ float TrueAimCheck() void PostInit(); void CSQC_Demo_Camera(); -float Scoreboard_WouldDraw(); float camera_mode; const float CAMERA_FREE = 1; const float CAMERA_CHASE = 2; @@ -743,7 +747,7 @@ bool WantEventchase(entity this) { if(autocvar_cl_orthoview) return false; - if(intermission) + if(STAT(GAMEOVER) || intermission) return true; if(this.viewloc) return true; @@ -818,8 +822,8 @@ void HitSound() float a = autocvar_cl_hitsound_max_pitch; float b = autocvar_cl_hitsound_min_pitch; float c = autocvar_cl_hitsound_nom_damage; - float x = unaccounted_damage; - float pitch_shift = (b*x*(a-1) + a*c*(1-b)) / (x*(a-1) + c*(1-b)); + float d = unaccounted_damage; + float pitch_shift = (b*d*(a-1) + a*c*(1-b)) / (d*(a-1) + c*(1-b)); // if sound variation is disabled, set pitch_shift to 1 if (autocvar_cl_hitsound == 1) @@ -871,7 +875,7 @@ vector crosshair_getcolor(entity this, float health_stat) case 2: // crosshair_color_by_health { - float x = health_stat; + float hp = health_stat; //x = red //y = green @@ -879,33 +883,33 @@ vector crosshair_getcolor(entity this, float health_stat) wcross_color.z = 0; - if(x > 200) + if(hp > 200) { wcross_color.x = 0; wcross_color.y = 1; } - else if(x > 150) + else if(hp > 150) { - wcross_color.x = 0.4 - (x-150)*0.02 * 0.4; - wcross_color.y = 0.9 + (x-150)*0.02 * 0.1; + wcross_color.x = 0.4 - (hp-150)*0.02 * 0.4; + wcross_color.y = 0.9 + (hp-150)*0.02 * 0.1; } - else if(x > 100) + else if(hp > 100) { - wcross_color.x = 1 - (x-100)*0.02 * 0.6; - wcross_color.y = 1 - (x-100)*0.02 * 0.1; - wcross_color.z = 1 - (x-100)*0.02; + wcross_color.x = 1 - (hp-100)*0.02 * 0.6; + wcross_color.y = 1 - (hp-100)*0.02 * 0.1; + wcross_color.z = 1 - (hp-100)*0.02; } - else if(x > 50) + else if(hp > 50) { wcross_color.x = 1; wcross_color.y = 1; - wcross_color.z = 0.2 + (x-50)*0.02 * 0.8; + wcross_color.z = 0.2 + (hp-50)*0.02 * 0.8; } - else if(x > 20) + else if(hp > 20) { wcross_color.x = 1; - wcross_color.y = (x-20)*90/27/100; - wcross_color.z = (x-20)*90/27/100 * 0.2; + wcross_color.y = (hp-20)*90/27/100; + wcross_color.z = (hp-20)*90/27/100 * 0.2; } else { @@ -936,7 +940,7 @@ void HUD_Crosshair(entity this) { float f, i, j; vector v; - if(!scoreboard_active && !camera_active && intermission != 2 && + if(!scoreboard_active && !camera_active && intermission != 2 && !STAT(GAMEOVER) && spectatee_status != -1 && !csqcplayer.viewloc && !MUTATOR_CALLHOOK(DrawCrosshair) && !HUD_MinigameMenu_IsOpened() ) { @@ -968,7 +972,7 @@ void HUD_Crosshair(entity this) float shottype; // wcross_origin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; - wcross_origin = project_3d_to_2d(view_origin + MAX_SHOT_DISTANCE * view_forward); + wcross_origin = project_3d_to_2d(view_origin + max_shot_distance * view_forward); wcross_origin.z = 0; if(autocvar_crosshair_hittest) { @@ -980,7 +984,7 @@ void HUD_Crosshair(entity this) v = wcross_origin - wcross_oldorigin; v.x /= vid_conwidth; v.y /= vid_conheight; - if(vlen(v) > 0.01) + if(vdist(v, >, 0.01)) shottype = SHOTTYPE_HITOBSTRUCTION; } if(!autocvar_crosshair_hittest_showimpact) @@ -1491,8 +1495,6 @@ void CSQC_UpdateView(entity this, float w, float h) cvar_set("chase_active", "0"); float vehicle_chase = (hud != HUD_NORMAL && (autocvar_cl_eventchase_vehicle || spectatee_status > 0)); - float ons_roundlost = (gametype == MAPINFO_TYPE_ONSLAUGHT && STAT(ROUNDLOST)); - entity gen = NULL; float vehicle_viewdist = 0; vector vehicle_viewofs = '0 0 0'; @@ -1507,18 +1509,18 @@ void CSQC_UpdateView(entity this, float w, float h) } } - if(ons_roundlost) // TODO: move this junk to a client mutator for onslaught (possible using the WantEventchase hook) + if(WantEventchase(this)) { - IL_EACH(g_onsgenerators, it.health <= 0, + vector current_view_origin_override = '0 0 0'; + vector view_offset_override = '0 0 0'; + float chase_distance_override = 0; + bool custom_eventchase = MUTATOR_CALLHOOK(CustomizeEventchase, this); + if(custom_eventchase) { - gen = it; - break; - }); - if(!gen) - ons_roundlost = false; // don't enforce the 3rd person camera if there is no dead generator to show - } - if(WantEventchase(this) || (!autocvar_cl_orthoview && ons_roundlost)) - { + current_view_origin_override = M_ARGV(0, vector); + view_offset_override = M_ARGV(1, vector); + chase_distance_override = M_ARGV(0, float); + } eventchase_running = true; entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); @@ -1527,7 +1529,8 @@ void CSQC_UpdateView(entity this, float w, float h) // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.) vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org); - if(ons_roundlost) { current_view_origin = gen.origin; } + if (custom_eventchase) + current_view_origin = current_view_origin_override; // detect maximum viewoffset and use it vector view_offset = autocvar_cl_eventchase_viewoffset; @@ -1538,7 +1541,8 @@ void CSQC_UpdateView(entity this, float w, float h) else view_offset = autocvar_cl_eventchase_vehicle_viewoffset; } - if(ons_roundlost) { view_offset = autocvar_cl_eventchase_generator_viewoffset; } + if (custom_eventchase) + view_offset = view_offset_override; if(view_offset) { @@ -1561,7 +1565,8 @@ void CSQC_UpdateView(entity this, float w, float h) else chase_distance = autocvar_cl_eventchase_vehicle_distance; } - if(ons_roundlost) { chase_distance = autocvar_cl_eventchase_generator_distance; } + if (custom_eventchase) + chase_distance = chase_distance_override; if(autocvar_cl_eventchase_speed && eventchase_current_distance < chase_distance) eventchase_current_distance += autocvar_cl_eventchase_speed * (chase_distance - eventchase_current_distance) * frametime; // slow down the further we get @@ -1743,8 +1748,8 @@ void CSQC_UpdateView(entity this, float w, float h) if(!postinit) PostInit(); - if(intermission && !gameover_time) - gameover_time = time; + if(intermission && !intermission_time) + intermission_time = time; if(intermission && !isdemo() && !(calledhooks & HOOK_END)) { @@ -2249,7 +2254,7 @@ void CSQC_UpdateView(entity this, float w, float h) if(autocvar__hud_configure) HUD_Panel_Mouse(); - else if ( HUD_MinigameMenu_IsOpened() || minigame_isactive() ) + else if (HUD_MinigameMenu_IsOpened() || active_minigame) HUD_Minigame_Mouse(); else if(QuickMenu_IsOpened()) QuickMenu_Mouse();