X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fvehicle%2Fracer.qc;h=41a31743f621d94fcd8c35db61f72d499feeeded;hb=ac9fba402abf745436adf0ecaa8f90347708ff53;hp=254f9bfc4a74b5772023f786f1425ad37fd97734;hpb=edf01df130d0d1877461561178b8833a9ab6051c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index 254f9bfc4a..41a31743f6 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -1,28 +1,4 @@ -#ifndef VEHICLE_RACER -#define VEHICLE_RACER - -#include "racer_weapon.qh" - -CLASS(Racer, Vehicle) -/* spawnflags */ ATTRIB(Racer, spawnflags, int, VHF_DMGSHAKE | VHF_DMGROLL); -/* mins */ ATTRIB(Racer, mins, vector, '-120 -120 -40' * 0.5); -/* maxs */ ATTRIB(Racer, maxs, vector, '120 120 40' * 0.5); -/* view offset*/ ATTRIB(Racer, view_ofs, vector, '0 0 50'); -/* view dist */ ATTRIB(Racer, height, float, 200); -/* model */ ATTRIB(Racer, mdl, string, "models/vehicles/wakizashi.dpm"); -/* model */ ATTRIB(Racer, model, string, "models/vehicles/wakizashi.dpm"); -/* head_model */ ATTRIB(Racer, head_model, string, "null"); -/* hud_model */ ATTRIB(Racer, hud_model, string, "models/vehicles/wakizashi_cockpit.dpm"); -/* tags */ ATTRIB(Racer, tag_head, string, ""); -/* tags */ ATTRIB(Racer, tag_hud, string, ""); -/* tags */ ATTRIB(Racer, tag_view, string, "tag_viewport"); -/* netname */ ATTRIB(Racer, netname, string, "racer"); -/* fullname */ ATTRIB(Racer, vehicle_name, string, _("Racer")); -/* icon */ ATTRIB(Racer, m_icon, string, "vehicle_racer"); -ENDCLASS(Racer) -REGISTER_VEHICLE(RACER, NEW(Racer)); - -#endif +#include "racer.qh" #ifdef IMPLEMENTATION @@ -170,15 +146,16 @@ void racer_fire_rocket_aim(entity player, string tagname, entity trg) racer_fire_rocket(player, v, v_forward, trg); } -bool racer_frame(entity this) +bool racer_frame(entity this, float dt) { entity vehic = this.vehicle; return = true; if(intermission_running) { - vehic.velocity = '0 0 0'; - vehic.avelocity = '0 0 0'; + vehic.solid = SOLID_NOT; + vehic.takedamage = DAMAGE_NO; + set_movetype(vehic, MOVETYPE_NONE); return; } @@ -186,7 +163,7 @@ bool racer_frame(entity this) traceline(vehic.origin, vehic.origin + '0 0 1', MOVE_NOMONSTERS, this); int cont = trace_dpstartcontents; - if(cont & DPCONTENTS_WATER) + if(!(cont & DPCONTENTS_WATER)) vehic.air_finished = time + autocvar_g_vehicle_racer_water_time; if(IS_DEAD(vehic)) @@ -195,28 +172,22 @@ bool racer_frame(entity this) return; } - racer_align4point(vehic, PHYS_INPUT_TIMELENGTH); + racer_align4point(vehic, dt); PHYS_INPUT_BUTTON_ZOOM(this) = PHYS_INPUT_BUTTON_CROUCH(this) = false; - if(time >= vehic.vehicle_last_trace) - { - crosshair_trace(this); - vehic.vehicle_last_trace = time + autocvar_g_vehicle_racer_thinkrate; - } - vehic.angles_x *= -1; // Yaw - float ftmp = autocvar_g_vehicle_racer_turnspeed * PHYS_INPUT_TIMELENGTH; + float ftmp = autocvar_g_vehicle_racer_turnspeed * dt; ftmp = bound(-ftmp, shortangle_f(this.v_angle_y - vehic.angles_y, vehic.angles_y), ftmp); vehic.angles_y = anglemods(vehic.angles_y + ftmp); // Roll - vehic.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * PHYS_INPUT_TIMELENGTH; + vehic.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * dt; // Pitch - ftmp = autocvar_g_vehicle_racer_pitchspeed * PHYS_INPUT_TIMELENGTH; + ftmp = autocvar_g_vehicle_racer_pitchspeed * dt; ftmp = bound(-ftmp, shortangle_f(this.v_angle_x - vehic.angles_x, vehic.angles_x), ftmp); vehic.angles_x = bound(-autocvar_g_vehicle_racer_pitchlimit, anglemods(vehic.angles_x + ftmp), autocvar_g_vehicle_racer_pitchlimit); @@ -262,7 +233,7 @@ bool racer_frame(entity this) #endif // Afterburn - if (PHYS_INPUT_BUTTON_JUMP(this) && vehic.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * PHYS_INPUT_TIMELENGTH)) + if (PHYS_INPUT_BUTTON_JUMP(this) && vehic.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * dt)) { #ifdef SVQC if(time - vehic.wait > 0.2) @@ -273,12 +244,12 @@ bool racer_frame(entity this) if(cont & DPCONTENTS_LIQUIDSMASK) { - vehic.vehicle_energy -= autocvar_g_vehicle_racer_waterburn_cost * PHYS_INPUT_TIMELENGTH; + vehic.vehicle_energy -= autocvar_g_vehicle_racer_waterburn_cost * dt; df += (v_forward * autocvar_g_vehicle_racer_waterburn_speed); } else { - vehic.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * PHYS_INPUT_TIMELENGTH; + vehic.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * dt; df += (v_forward * autocvar_g_vehicle_racer_speed_afterburn); } @@ -313,7 +284,7 @@ bool racer_frame(entity this) dforce = autocvar_g_vehicle_racer_water_downforce; df -= v_up * (vlen(vehic.velocity) * dforce); - this.movement = vehic.velocity += df * PHYS_INPUT_TIMELENGTH; + this.movement = vehic.velocity += df * dt; #ifdef SVQC @@ -337,10 +308,16 @@ bool racer_frame(entity this) if(autocvar_g_vehicle_racer_rocket_locktarget) { - if(vehic.vehicle_last_trace == time + autocvar_g_vehicle_racer_thinkrate) - vehicles_locktarget(vehic, (1 / autocvar_g_vehicle_racer_rocket_locking_time) * frametime, - (1 / autocvar_g_vehicle_racer_rocket_locking_releasetime) * frametime, - autocvar_g_vehicle_racer_rocket_locked_time); + if(time >= vehic.vehicle_last_trace) + { + crosshair_trace(this); + + vehicles_locktarget(vehic, (1 / autocvar_g_vehicle_racer_rocket_locking_time) * dt, + (1 / autocvar_g_vehicle_racer_rocket_locking_releasetime) * dt, + autocvar_g_vehicle_racer_rocket_locked_time); + + vehic.vehicle_last_trace = time + autocvar_g_vehicle_racer_thinkrate; + } if(vehic.lock_target) { @@ -382,13 +359,13 @@ bool racer_frame(entity this) this.vehicle_reload2 = bound(0, 100 * ((time - vehic.lip) / (vehic.delay - vehic.lip)), 100); if(vehic.vehicle_flags & VHF_SHIELDREGEN) - vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, true); + vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, dt, true); if(vehic.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, false); + vehicles_regen(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, dt, false); if(vehic.vehicle_flags & VHF_ENERGYREGEN) - vehicles_regen(vehic, vehic.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, false); + vehicles_regen(vehic, vehic.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, dt, false); VEHICLE_UPDATE_PLAYER(this, vehic, health, racer); VEHICLE_UPDATE_PLAYER(this, vehic, energy, racer); @@ -439,7 +416,7 @@ void racer_exit(entity this, int eject) setthink(this, racer_think); this.nextthink = time; - this.movetype = MOVETYPE_BOUNCE; + set_movetype(this, MOVETYPE_BOUNCE); sound (this.tur_head, CH_TRIGGER_SINGLE, SND_Null, VOL_VEHICLEENGINE, ATTEN_NORM); if(!this.owner) @@ -490,7 +467,7 @@ void racer_blowup(entity this) this.nextthink = time + autocvar_g_vehicle_racer_respawntime; setthink(this, vehicles_spawn); - this.movetype = MOVETYPE_NONE; + set_movetype(this, MOVETYPE_NONE); this.effects = EF_NODRAW; this.solid = SOLID_NOT; @@ -511,7 +488,7 @@ void racer_blowup_think(entity this) CSQCMODEL_AUTOUPDATE(this); } -void racer_deadtouch(entity this) +void racer_deadtouch(entity this, entity toucher) { this.avelocity_x *= 0.7; this.cnt -= 1; @@ -521,47 +498,12 @@ void racer_deadtouch(entity this) spawnfunc(vehicle_racer) { - if(!autocvar_g_vehicle_racer) { remove(this); return; } - if(!vehicle_initialize(this, VEH_RACER, false)) { remove(this); return; } + if(!autocvar_g_vehicle_racer) { delete(this); return; } + if(!vehicle_initialize(this, VEH_RACER, false)) { delete(this); return; } } #endif // SVQC -#ifdef CSQC -#if 0 -void racer_draw(entity this) -{ - float pushdeltatime = time - this.lastpushtime; - if (pushdeltatime > 0.15) pushdeltatime = 0; - this.lastpushtime = time; - if(!pushdeltatime) return; - - tracebox(this.move_origin, this.mins, this.maxs, this.move_origin - ('0 0 1' * STAT(VEH_RACER_SPRINGLENGTH)), MOVE_NOMONSTERS, this); - - vector df = this.move_velocity * -STAT(VEH_RACER_FRICTION); - df_z += (1 - trace_fraction) * STAT(VEH_RACER_HOVERPOWER) + sin(time * 2) * (STAT(VEH_RACER_SPRINGLENGTH) * 2); - - float forced = STAT(VEH_RACER_UPFORCEDAMPER); - - int cont = pointcontents(this.move_origin - '0 0 64'); - if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME) - { - forced = STAT(VEH_RACER_WATER_UPFORCEDAMPER); - this.move_velocity_z += 200; - } - - this.move_velocity += df * pushdeltatime; - if(this.move_velocity_z > 0) - this.move_velocity_z *= 1 - forced * pushdeltatime; - - this.move_angles_x *= 1 - (STAT(VEH_RACER_ANGLESTABILIZER) * pushdeltatime); - this.move_angles_z *= 1 - (STAT(VEH_RACER_ANGLESTABILIZER) * pushdeltatime); - - Movetype_Physics_MatchServer(this, false); -} -#endif -#endif - METHOD(Racer, vr_impact, void(Racer thisveh, entity instance)) { #ifdef SVQC @@ -573,14 +515,14 @@ METHOD(Racer, vr_impact, void(Racer thisveh, entity instance)) METHOD(Racer, vr_enter, void(Racer thisveh, entity instance)) { #ifdef SVQC - instance.movetype = MOVETYPE_BOUNCE; + set_movetype(instance, MOVETYPE_BOUNCE); instance.owner.vehicle_health = (instance.vehicle_health / autocvar_g_vehicle_racer_health) * 100; instance.owner.vehicle_shield = (instance.vehicle_shield / autocvar_g_vehicle_racer_shield) * 100; if(instance.owner.flagcarried) setorigin(instance.owner.flagcarried, '-190 0 96'); #elif defined(CSQC) - instance.move_movetype = MOVETYPE_BOUNCE; + set_movetype(instance, MOVETYPE_BOUNCE); #endif } @@ -607,7 +549,7 @@ METHOD(Racer, vr_spawn, void(Racer thisveh, entity instance)) instance.vehicle_health = autocvar_g_vehicle_racer_health; instance.vehicle_shield = autocvar_g_vehicle_racer_shield; - instance.movetype = MOVETYPE_TOSS; + set_movetype(instance, MOVETYPE_TOSS); instance.solid = SOLID_SLIDEBOX; instance.delay = time; instance.scale = 0.5; @@ -631,7 +573,7 @@ METHOD(Racer, vr_death, void(Racer thisveh, entity instance)) instance.solid = SOLID_CORPSE; instance.takedamage = DAMAGE_NO; instance.deadflag = DEAD_DYING; - instance.movetype = MOVETYPE_BOUNCE; + set_movetype(instance, MOVETYPE_BOUNCE); instance.wait = time; instance.delay = 2 + time + random() * 3; instance.cnt = 1 + random() * 2;