From 201e09e1605d9e40ab9c40943ebc2f1bbf20f9b0 Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Thu, 9 Jun 2011 02:25:28 +0200 Subject: [PATCH] Get rid of unused codepaths --- qcsrc/client/Main.qc | 1 - qcsrc/client/progs.src | 3 - qcsrc/server/vehicles/racer.qc | 152 +------------------------- qcsrc/server/vehicles/raptor.qc | 75 +------------ qcsrc/server/vehicles/spiderbot.qc | 60 +--------- qcsrc/server/vehicles/vehicles.qc | 45 ++++---- qcsrc/server/vehicles/vehicles.qh | 2 - qcsrc/server/vehicles/vehicles_def.qh | 28 +---- 8 files changed, 34 insertions(+), 332 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 2ef1d3b7c..92c647c19 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -980,7 +980,6 @@ void(float bIsNewEntity) CSQC_Ent_Update = case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break; case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break; case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break; - case ENT_CLIENT_VEHICLE: read_vehicle(bIsNewEntity); break; default: //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype)); error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname)); diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 71f4c17bf..3fc65a672 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -33,7 +33,6 @@ teamplay.qh main.qh vehicles/vehicles.qh -../server/vehicles/vehicles_def.qh sortlist.qc miscfunctions.qc @@ -62,8 +61,6 @@ tuba.qc target_music.qc vehicles/vehicles.qc -../server/vehicles/network.qc -../server/vehicles/racer.qc shownames.qh shownames.qc diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 34302074d..fd6176728 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -262,18 +262,6 @@ float racer_frame() player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0; self = racer; - -#ifdef VEHICLES_CSQC - racer.SendFlags |= VSF_MOVEMENT; - - // Send a origin update every 10'th serevr frame. - racer.framecounter += 1; - if(racer.framecounter >= 600) - { - racer.SendFlags |= VSF_ORIGIN; - racer.framecounter = 0; - } -#endif if(player.BUTTON_USE) { @@ -293,40 +281,6 @@ float racer_frame() crosshair_trace(player); -#if VEHICLES_VIEWROTATE_CROSSHAIR - float ftmp2; - racer.angles_x *= -1; - df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32')); - if(df_x > 180) df_x -= 360; - if(df_x < -180) df_x += 360; - if(df_y > 180) df_y -= 360; - if(df_y < -180) df_y += 360; - - // Yaw - ftmp = autocvar_g_vehicle_racer_turnspeed * frametime; - ftmp2 = ftmp * -1; - - ftmp = bound(ftmp2, shortangle_f(df_y - racer.angles_y, racer.angles_y), ftmp); - ftmp2 = anglemods(racer.angles_y + ftmp); - - // Roll - ftmp = bound(-45, shortangle_f(df_z + ((racer.angles_y - ftmp2) * autocvar_g_vehicle_racer_turnroll), racer.angles_z), 45); - ftmp = anglemods(racer.angles_z + ftmp) * frametime; - racer.angles_z = bound(-65, racer.angles_z + ftmp, 65); - - // Turn - racer.angles_y = ftmp2; - - // Pitch - ftmp = autocvar_g_vehicle_racer_pitchspeed * frametime; - ftmp2 = ftmp * -1; - - ftmp = bound(ftmp2, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp); - racer.angles_x = anglemods(racer.angles_x + ftmp); - - makevectors(racer.angles); - racer.angles_x *= -1; -#else racer.angles_x *= -1; // Yaw @@ -344,7 +298,7 @@ float racer_frame() makevectors(racer.angles); racer.angles_x *= -1; -#endif + ftmp = racer.velocity_z; df = racer.velocity * -autocvar_g_vehicle_racer_friction; @@ -372,7 +326,7 @@ float racer_frame() { self.sounds = 1; self.sound_nexttime = time + 10.922667; //soundlength("vehicles/racer_move.wav"); - sound (self, CHAN_VOICE, "vehicles/racer_move.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } else @@ -381,7 +335,7 @@ float racer_frame() { self.sounds = 0; self.sound_nexttime = time + 11.888604; //soundlength("vehicles/racer_idle.wav"); - sound (self, CHAN_VOICE, "vehicles/racer_idle.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } @@ -396,13 +350,13 @@ float racer_frame() { //self.sounds = 2; self.strength_finished = time + 10.922667; //soundlength("vehicles/racer_boost.wav"); - sound (self, CHAN_PLAYER, "vehicles/racer_boost.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_PLAYER, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } else { self.strength_finished = 0; - sound (self, CHAN_PLAYER, "misc/null.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_PLAYER, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); } @@ -509,17 +463,7 @@ void racer_think() */ racer_align4point(); //time - self.nextthink); -#ifdef VEHICLES_CSQC - self.SendFlags |= VSF_MOVEMENT; - // Send a origin update every 10'th serevr frame. - self.framecounter += 1; - if(self.framecounter >= 10) - { - self.SendFlags |= VSF_ORIGIN; - self.framecounter = 0; - } -#endif /* //if(self.velocity_z > 0) // self.velocity_z *= 0.95; @@ -541,10 +485,6 @@ void racer_enter() self.movetype = MOVETYPE_BOUNCE; self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health); self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield); -#ifdef VEHICLES_CSQC - if(self.SendEntity) - self.SendFlags |= VSF_SETUP; -#endif } void racer_exit(float eject) @@ -658,13 +598,6 @@ void racer_die() self.nextthink = 2 + time + random() * 3; } -#ifdef VEHICLES_CSQC -void racer_send_exta(entity to) -{ - -} -#endif - void racer_dinit() { if not (vehicle_initialize( @@ -685,9 +618,7 @@ void racer_dinit() remove(self); return; } -#ifdef VEHICLES_CSQC - self.vehile_send_exta = racer_send_exta; -#endif + if(autocvar_g_vehicle_racer_hovertype != 0) racer_force_from_tag = vehicles_force_fromtag_maglev; else @@ -734,75 +665,4 @@ void spawnfunc_vehicle_racer() self.think = racer_dinit; self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } - #endif // SVQC - -#ifdef CSQC -#ifdef VEHICLES_CSQC -void racer_draw() -{ - /*float dt; - - dt = time - self.lastupdate; - self.lastupdate = time; - if(dt < 0) - return; - */ - //self.origin += dt * self.velocity; - //self.origin_z -= dt * getstatf(STAT_MOVEVARS_GRAVITY); - //setorigin(self, self.origin); - - if(vehicle_hudmodel.owner == self) - { - setorigin(vehicle_hudmodel, self.origin); - vehicle_hudmodel.angles = self.angles; - } - - -} - -void racer_draw2d() -{ - -} - -void racer_read_extra() -{ - -} - -entity racer_hud; -entity racer_vp; -void racer_hud_draw() -{ - -} - -void vehicle_racer_assemble() -{ - setmodel(self, "models/vehicles/wakizashi.dpm"); - self.scale = 0.5; - self.movetype = MOVETYPE_BOUNCE; - - //self.entremove = VehicleRacerRemove; - setsize(self, '-60 -60 -20', '60 60 20'); - self.draw = racer_draw; - self.drawmask = MASK_NORMAL; - self.solid = SOLID_BBOX; - self.lastupdate = time; - self.vehile_read_exta = racer_read_extra; - - if(racer_hud == world) - { - dprint("SpawnHUUUOOOUUUDDD\n"); - racer_hud = spawn(); - setmodel(racer_hud, "models/vehicles/wakizashi_cockpit.dpm"); - racer_hud.drawmask = MASK_NORMAL; - racer_hud.renderflags = RF_VIEWMODEL; - racer_hud.scale = 0.5; - } - vehicle_hudmodel = racer_hud; // FIXME!! - racer_hud.draw = racer_hud_draw; -} -#endif -#endif //CSQC diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index 7188328ff..37db0cf4b 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -64,8 +64,6 @@ float raptor_takeoff(); .entity bomb1; .entity bomb2; -//#define RAPTOR_RETARDCAMERA - float raptor_altitude(float amax) { tracebox(self.origin, self.mins, self.maxs, self.origin - ('0 0 1' * amax), TRUE, self); @@ -109,9 +107,6 @@ void raptor_bomb_burst() entity bomblet; float i; - //sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - //pointparticles(particleeffectnum("raptor_bomb_spread"), self.origin, self.velocity, 1); - Damage_DamageInfo(self.origin, 0, 0, 0, '0 0 0', DEATH_RAPTOR_BOMB_SPLIT, self); for(i = 0; i < autocvar_g_vehicle_raptor_bomblets; ++i) @@ -143,9 +138,6 @@ void raptor_bombdrop() { entity bomb_1, bomb_2; - //self.bomb1.alpha = 0; - //self.bomb2.alpha = 0; - bomb_1 = spawn(); bomb_2 = spawn(); @@ -205,9 +197,6 @@ void raptor_enter() self.delay = time + autocvar_g_vehicle_raptor_bombs_refire; self.lip = time; -#ifdef RAPTOR_RETARDCAMERA - setorigin(self.vehicle_viewport, self.origin); -#endif } void raptor_land() @@ -278,7 +267,7 @@ float raptor_takeoff() if(self.sound_nexttime < time) { self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); - sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", VOL_VEHICLEENGINE, ATTN_NORM); } // Takeoff sequense @@ -358,28 +347,7 @@ float raptor_frame() } crosshair_trace(player); -#if VEHICLES_VIEWROTATE_CROSSHAIR - df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32')); - if(df_x > 180) df_x -= 360; - if(df_x < -180) df_x += 360; - if(df_y > 180) df_y -= 360; - if(df_y < -180) df_y += 360; - // Rotate Body - ftmp = autocvar_g_vehicle_raptor_turnspeed * sys_frametime; - ftmp = bound(-ftmp, shortangle_f(df_y - raptor.angles_y, raptor.angles_y), ftmp); - - // Turn - //raptor.angles_y = anglemods(raptor.angles_y + ftmp); - raptor.avelocity_y = anglemods(raptor.angles_y + ftmp); - - // Pitch Body - ftmp = autocvar_g_vehicle_raptor_pitchspeed * sys_frametime; - ftmp = bound(-ftmp, shortangle_f(df_x - raptor.angles_x, raptor.angles_x), ftmp); - - //raptor.angles_x = bound(-autocvar_g_vehicle_raptor_pitchlimit, anglemods(raptor.angles_x + ftmp), autocvar_g_vehicle_raptor_pitchlimit); - raptor.avelocity_x = bound(-autocvar_g_vehicle_raptor_pitchlimit, anglemods(raptor.angles_x + ftmp), autocvar_g_vehicle_raptor_pitchlimit); -#else vector vang; vang = raptor.angles; df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32')); @@ -407,27 +375,12 @@ float raptor_frame() raptor.angles_y = anglemods(raptor.angles_y); raptor.angles_z = anglemods(raptor.angles_z); -#endif if(autocvar_g_vehicle_raptor_movestyle == 1) makevectors('0 1 0' * raptor.angles_y); else makevectors(player.v_angle); -#ifdef RAPTOR_RETARDCAMERA - float spd, back, up; - spd = vlen(self.velocity) + 0.01; - back = spd / autocvar_g_vehicle_raptor_speed_forward; - up = 1 - back; - back = back; - back = back * 1250; - back += 150; - up = up * 200; - up = up + 100; - - setorigin(self.vehicle_viewport, self.origin + (v_up * up) + (v_forward * -back)); -#endif - df = raptor.velocity * -autocvar_g_vehicle_raptor_friction; if(player.movement_x != 0) @@ -709,10 +662,6 @@ void raptor_dinit() self.gun1 = spawn(); self.gun2 = spawn(); -#ifdef RAPTOR_RETARDCAMERA - setattachment(self.vehicle_viewport, world, ""); -#endif - setmodel(self.bomb1,"models/vehicles/clusterbomb_folded.md3"); setmodel(self.bomb2,"models/vehicles/clusterbomb_folded.md3"); setmodel(self.gun1, "models/vehicles/raptor_gun.dpm"); @@ -798,25 +747,3 @@ void spawnfunc_vehicle_raptor() self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC - -#ifdef CSQC -void raptor_draw() -{ - -} - -void raptor_draw2d() -{ - -} - -void raptor_read_extra() -{ - -} - -void vehicle_raptor_assemble() -{ - -} -#endif //CSQC diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 693749c9b..051ad1912 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -177,6 +177,7 @@ float spiderbot_frame() player = self; spider = self.vehicle; + self = spider; player.BUTTON_ZOOM = 0; player.BUTTON_CROUCH = 0; @@ -184,39 +185,14 @@ float spiderbot_frame() if(player.BUTTON_USE) { - self = spider; vehicles_exit(VHEF_NORMAL); self = player; return 0; } - self = spider; - crosshair_trace(player); //UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload2) + ('0 1 0' * (1 - player.vehicle_reload2)), 2); -#if VEHICLES_VIEWROTATE_CROSSHAIR - ad = vectoangles(normalize(trace_endpos - gettaginfo(spider.tur_head,gettagindex(spider.tur_head,"tag_hud")))) - (spider.tur_head.angles + spider.angles); - if(ad_x > 180) ad_x -= 360; - if(ad_x < -180) ad_x += 360; - if(ad_y > 180) ad_y -= 360; - if(ad_y < -180) ad_y += 360; - - // Rotate head - ftmp = autocvar_g_vehicle_spiderbot_head_turnspeed * sys_frametime; - ad_y = bound(-ftmp, ad_y, ftmp); - spider.tur_head.angles_y = bound(autocvar_g_vehicle_spiderbot_head_turnlimit * -1, spider.tur_head.angles_y + ad_y, autocvar_g_vehicle_spiderbot_head_turnlimit); - - // Pitch head - ftmp = autocvar_g_vehicle_spiderbot_head_pitchspeed * sys_frametime; - //ad_x = bound(-ftmp, ad_x, ftmp); - spider.tur_head.angles_x = bound(autocvar_g_vehicle_spiderbot_head_pitchlimit_down, spider.tur_head.angles_x + ad_x, autocvar_g_vehicle_spiderbot_head_pitchlimit_up); - - // Turn Body - ftmp = autocvar_g_vehicle_spiderbot_turnspeed * sys_frametime; - ftmp = bound(-ftmp, spider.tur_head.angles_y, ftmp); -#else - player.v_angle_x *= -1; ad = player.v_angle - (spider.tur_head.angles + spider.angles); player.v_angle_x *= -1; @@ -244,7 +220,6 @@ float spiderbot_frame() ftmp = autocvar_g_vehicle_spiderbot_turnspeed * sys_frametime; ftmp = bound(-ftmp, spider.tur_head.angles_y, ftmp); -#endif makevectors(spider.angles + '-2 0 0' * spider.angles_x); /* @@ -261,13 +236,13 @@ float spiderbot_frame() { if(spider.frame == 4 && self.tur_head.wait != 0) { - sound (self, CHAN_VOICE, "vehicles/spiderbot_land.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/spiderbot_land.wav", VOL_VEHICLEENGINE, ATTN_NORM); spider.frame = 5; } if(player.BUTTON_JUMP && self.tur_head.wait < time) { - sound (self, CHAN_VOICE, "vehicles/spiderbot_jump.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/spiderbot_jump.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_jump:", ftos(soundlength("vehicles/spiderbot_jump.wav")), "\n"); self.delay = 0; @@ -285,7 +260,7 @@ float spiderbot_frame() self.delay = 3; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_idle.wav"); //dprint("spiderbot_idle:", ftos(soundlength("vehicles/spiderbot_idle.wav")), "\n"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_idle.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/spiderbot_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); } movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop); spider.frame = 5; @@ -314,7 +289,7 @@ float spiderbot_frame() { self.delay = 1; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_walk.wav"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_walk.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/spiderbot_walk.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_walk:", ftos(soundlength("vehicles/spiderbot_walk.wav")), "\n"); } } @@ -335,7 +310,7 @@ float spiderbot_frame() { self.delay = 2; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_strafe.wav"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_strafe.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_VOICE, "vehicles/spiderbot_strafe.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_strafe:", ftos(soundlength("vehicles/spiderbot_strafe.wav")), "\n"); } } @@ -599,7 +574,6 @@ void spiderbot_blowup() void spiderbot_die() { sound (self, CHAN_VOICE, "vehicles/spiderbot_die.wav", VOL_BASE, ATTN_NORM); - //sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); pointparticles(particleeffectnum("explosion_medium"), self.origin + '0 0 100', '0 0 0', 1); self.health = 0; @@ -686,25 +660,3 @@ void spawnfunc_vehicle_spiderbot() self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC - -#ifdef CSQC -void spiderbot_draw() -{ - -} - -void spiderbot_draw2d() -{ - -} - -void spiderbot_read_extra() -{ - -} - -void vehicle_spiderbot_assemble() -{ - -} -#endif //CSQC diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 5c7f4e593..5aee87946 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -13,7 +13,7 @@ void vehicles_setreturn(); /** AuxiliaryXhair* - Send addictional points of interest to be drawn, to vehicle owner + Send additional points of interest to be drawn, to vehicle owner **/ float MAX_AXH = 4; .entity AuxiliaryXhair[MAX_AXH]; @@ -82,6 +82,12 @@ void SendAuxiliaryXhair2(entity own, vector loc, vector clr, float axh_id) */ // End AuxiliaryXhair +/** + Notifies the client that he enterd a vehicle, and sends + realavent data. + + only sends vehicle_id atm (wich is a HUD_* constant, ex. HUD_SPIDERBOT) +**/ void CSQCVehicleSetup(entity own, float vehicle_id) { msg_entity = own; @@ -128,7 +134,6 @@ void vehicles_locktarget(float incr, float decr, float _lock_time) return; } - if(trace_ent != world) { @@ -315,7 +320,7 @@ entity vehicles_projectile(string _mzlfx, string _mzlsound, // End generic vehile projectile system /** vehicles_spawn - Exetuted for all vehiles on (re)spawn. + Exetuted for all vehicles on (re)spawn. Sets defaults for newly spawned units. **/ void vehicles_spawn() @@ -432,9 +437,7 @@ void vehicles_enter() // .viewmodelforclient works better. //self.vehicle_hudmodel.drawonlytoclient = self.owner; -#ifndef VEHICLES_CSQC - self.vehicle_hudmodel.viewmodelforclient = self.owner; -#endif + self.vehicle_hudmodel.viewmodelforclient = self.owner; self.event_damage = vehicles_damage; self.nextthink = 0; @@ -468,7 +471,6 @@ void vehicles_enter() self.team = self.owner.team; self.flags -= FL_NOTARGET; -#ifndef VEHICLES_CSQC msg_entity = other; WriteByte (MSG_ONE, SVC_SETVIEWPORT); WriteEntity(MSG_ONE, self.vehicle_viewport); @@ -487,8 +489,6 @@ void vehicles_enter() WriteAngle(MSG_ONE, self.angles_y); // yaw WriteAngle(MSG_ONE, 0); // roll } -#endif -//#endif vehicles_clearrturn(); @@ -497,6 +497,11 @@ void vehicles_enter() self.vehicle_enter(); } +/** vehicles_findgoodexit + Locates a valid location for the player to exit the vehicle. + Will first try prefer_spot, then up 100 random spots arround the vehicle + wich are in direct line of sight and empty enougth to hold a players bbox +**/ vector vehicles_findgoodexit(vector prefer_spot) { vector exitspot; @@ -545,6 +550,10 @@ vector vehicles_findgoodexit(vector prefer_spot) return self.origin; } +/** vehicles_exit + Standarrd vehicle release fucntion. + custom code goes in self.vehicle_exit +**/ void vehicles_exit(float eject) { self.flags |= FL_NOTARGET; @@ -695,7 +704,6 @@ void vehicles_clearrturn() ret.nextthink = time + 0.1; return; } - ret = ret.chain; } } @@ -711,15 +719,7 @@ void vehicles_setreturn() ret.enemy = self; ret.think = vehicles_return; ret.nextthink = time + self.vehicle_respawntime; -} - -float vehicles_customizeentityforclient() -{ - if(self.deadflag == DEAD_DEAD) - return FALSE; - else - return TRUE; -} +} void vehicles_configcheck(string configname, float check_cvar) { @@ -830,7 +830,6 @@ float vehicle_initialize(string net_name, self.iscreature = TRUE; self.hud = vhud; - //self.customizeentityforclient = vehicles_customizeentityforclient; self.vehicle_die = dieproc; self.vehicle_exit = exitfunc; self.vehicle_enter = enterproc; @@ -876,14 +875,10 @@ float vehicle_initialize(string net_name, self.pos1 = self.origin; self.pos2 = self.angles; -#ifdef VEHICLES_CSQC - if(use_csqc) - net_link_vehile(); -#endif + return TRUE; } - void bugmenot() { self.vehicle_exit = self.vehicle_exit; diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh index a66427367..79fc9cbf9 100644 --- a/qcsrc/server/vehicles/vehicles.qh +++ b/qcsrc/server/vehicles/vehicles.qh @@ -1,6 +1,4 @@ #ifdef VEHICLES_ENABLED -//#include "collision.qc" -#include "network.qc" #include "vehicles.qc" #include "racer.qc" diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh index 67c889cff..9f21eaf7b 100644 --- a/qcsrc/server/vehicles/vehicles_def.qh +++ b/qcsrc/server/vehicles/vehicles_def.qh @@ -1,9 +1,7 @@ -//#define VEHICLES_CSQC // #define VEHICLES_USE_ODE #define VEHICLES_ENABLED #ifdef VEHICLES_ENABLED -//#define VEHICLES_VIEWROTATE_CROSSHAIR //#message "with tZork vehicles (experimental)" .float vehicle_flags; @@ -30,12 +28,12 @@ float VHF_MOVE_FLY = 512; /// Vehicle is airborn .float vehicle_ammo2; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real ammo2 value. .float vehicle_reload2; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real reload2 value. -#ifdef SVQC .entity vehicle; .entity vehicle_viewport; .entity vehicle_hudmodel; .float sound_nexttime; +#define VOL_VEHICLEENGINE 1 .float hud; .float dmg_time; @@ -55,30 +53,6 @@ var .void() vehicle_enter; /// Vehicles custom funciton to be executed when own var .void() vehicle_die; /// Vehicles custom function to be executed when vehile die var .void() vehicle_spawn; /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns -#ifdef VEHICLES_CSQC -.float framecounter; /// Used to count server frames, so that we may send soem updates less often -var .void(entity to, float sflags) vehile_send_exta; /// Vehicles custom send func -void net_link_vehile(); /// Initiates csqc networking for vehicle -#endif //VEHICLES_CSQC -#endif //SVQC - -#ifdef CSQC -#ifdef VEHICLES_CSQC -.float vehicle_hud; - -entity vehicle; -entity vehicle_viewport; -entity vehicle_hudmodel; - -void vehicle_spiderbot_assemble(); -void vehicle_racer_assemble(); -void vehicle_raptor_assemble(); -void vehicle_bumblebee_assemble(); -void read_vehicle(float bIsNew); -var .void (float sf)vehile_read_exta; -#endif //VEHICLES_CSQC -#endif //CSQC - #ifdef VEHICLES_USE_ODE void(entity e, float physics_enabled) physics_enable = #540; // enable or disable physics on object void(entity e, vector force, vector force_pos) physics_addforce = #541; // apply a force from certain origin, length of force vector is power of force -- 2.39.2