From abaca86fb6ecabe3784fcbad185dfbadfdcdf1b7 Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 21 Jun 2013 00:51:09 +0200 Subject: [PATCH] Fix a few typos in function names --- qcsrc/server/cl_impulse.qc | 4 ++-- qcsrc/server/mutators/gamemode_assault.qc | 4 ++-- qcsrc/server/vehicles/bumblebee.qc | 6 ++---- qcsrc/server/vehicles/racer.qc | 4 ++-- qcsrc/server/vehicles/raptor.qc | 6 +++--- qcsrc/server/vehicles/spiderbot.qc | 6 +++--- qcsrc/server/vehicles/vehicles.qc | 11 +++++------ qcsrc/server/vehicles/vehicles_def.qh | 4 +--- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index 3288bbc72..2fc131ddb 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -55,8 +55,8 @@ void ImpulseCommands (void) if(self.vehicle) if(self.vehicle.deadflag == DEAD_NO) - if(self.vehicle.vehicles_impusle) - if(self.vehicle.vehicles_impusle(imp)) + if(self.vehicle.vehicles_impulse) + if(self.vehicle.vehicles_impulse(imp)) return; if(CheatImpulse(imp)) diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc index 94e104728..e857af9c0 100644 --- a/qcsrc/server/mutators/gamemode_assault.qc +++ b/qcsrc/server/mutators/gamemode_assault.qc @@ -212,7 +212,7 @@ void assault_wall_think() // trigger new round // reset objectives, toggle spawnpoints, reset triggers, ... -void vehicles_clearrturn(); +void vehicles_clearreturn(); void vehicles_spawn(); void assault_new_round() { @@ -230,7 +230,7 @@ void assault_new_round() self = findchainflags(vehicle_flags, VHF_ISVEHICLE); while(self) { - vehicles_clearrturn(); + vehicles_clearreturn(); vehicles_spawn(); self = self.chain; } diff --git a/qcsrc/server/vehicles/bumblebee.qc b/qcsrc/server/vehicles/bumblebee.qc index 4330966dc..c4efa8c8c 100644 --- a/qcsrc/server/vehicles/bumblebee.qc +++ b/qcsrc/server/vehicles/bumblebee.qc @@ -792,10 +792,8 @@ void bumb_die() void bumb_impact() { - if(autocvar_g_vehicle_bumblebee_bouncepain_x) - vehilces_impact(autocvar_g_vehicle_bumblebee_bouncepain_x, - autocvar_g_vehicle_bumblebee_bouncepain_y, - autocvar_g_vehicle_bumblebee_bouncepain_z); + if(autocvar_g_vehicle_bumblebee_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_bumblebee_bouncepain_x, autocvar_g_vehicle_bumblebee_bouncepain_y, autocvar_g_vehicle_bumblebee_bouncepain_z); } void bumb_spawn(float _f) diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index f5788c60b..43c73c249 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -529,8 +529,8 @@ void racer_exit(float eject) void racer_impact() { - if(autocvar_g_vehicle_racer_bouncepain_x) - vehilces_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z); + if(autocvar_g_vehicle_racer_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z); } void racer_blowup() diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index e899d4a31..40a491fb2 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -742,8 +742,8 @@ void raptor_die() void raptor_impact() { - if(autocvar_g_vehicle_raptor_bouncepain_x) - vehilces_impact(autocvar_g_vehicle_raptor_bouncepain_x, autocvar_g_vehicle_raptor_bouncepain_y, autocvar_g_vehicle_raptor_bouncepain_z); + if(autocvar_g_vehicle_raptor_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_raptor_bouncepain_x, autocvar_g_vehicle_raptor_bouncepain_y, autocvar_g_vehicle_raptor_bouncepain_z); } // If we dont do this ever now and then, the raptors rotors @@ -798,7 +798,7 @@ void raptor_spawn(float _f) //FIXME: Camera is in a bad place in HUD model. //setorigin(self.vehicle_viewport, '25 0 5'); - self.vehicles_impusle = raptor_impulse; + self.vehicles_impulse = raptor_impulse; self.frame = 0; diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index a66b56477..fbfc8b8ce 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -639,8 +639,8 @@ void spiderbot_exit(float eject) void spider_impact() { - if(autocvar_g_vehicle_spiderbot_bouncepain_x) - vehilces_impact(autocvar_g_vehicle_spiderbot_bouncepain_x, autocvar_g_vehicle_spiderbot_bouncepain_y, autocvar_g_vehicle_spiderbot_bouncepain_z); + if(autocvar_g_vehicle_spiderbot_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_spiderbot_bouncepain_x, autocvar_g_vehicle_spiderbot_bouncepain_y, autocvar_g_vehicle_spiderbot_bouncepain_z); } void spiderbot_headfade() @@ -789,7 +789,7 @@ void spiderbot_spawn(float _f) { if(!self.gun1) { - self.vehicles_impusle = spiderbot_impulse; + self.vehicles_impulse = spiderbot_impulse; self.gun1 = spawn(); self.gun2 = spawn(); setmodel(self.gun1, "models/vehicles/spiderbot_barrels.dpm"); diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 172f85000..10be37f8f 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -16,7 +16,7 @@ void vehicles_return(); void vehicles_enter(); void vehicles_touch(); void vehicles_reset_colors(); -void vehicles_clearrturn(); +void vehicles_clearreturn(); void vehicles_setreturn(); @@ -512,7 +512,7 @@ float vehicles_crushable(entity e) return FALSE; } -void vehilces_impact(float _minspeed, float _speedfac, float _maxpain) +void vehicles_impact(float _minspeed, float _speedfac, float _maxpain) { if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) return; @@ -658,7 +658,7 @@ void vehicles_enter() } } - vehicles_clearrturn(); + vehicles_clearreturn(); CSQCVehicleSetup(self.owner, self.hud); @@ -964,7 +964,7 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat } } -void vehicles_clearrturn() +void vehicles_clearreturn() { entity ret; // Remove "return helper", if any. @@ -1055,7 +1055,7 @@ void vehicles_setreturn() { entity ret; - vehicles_clearrturn(); + vehicles_clearreturn(); ret = spawn(); ret.classname = "vehicle_return"; @@ -1075,7 +1075,6 @@ void vehicles_setreturn() setmodel(ret, "null"); setorigin(ret, self.pos1 + '0 0 96'); - } void vehicles_reset_colors() diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh index 7d5a787d0..549616ffd 100644 --- a/qcsrc/server/vehicles/vehicles_def.qh +++ b/qcsrc/server/vehicles/vehicles_def.qh @@ -62,11 +62,9 @@ float SVC_UPDATEENTITY = 128; // Net.Protocol 0x80 #define VHSF_NORMAL 0 #define VHSF_FACTORY 2 .void(float _spawnflag) vehicle_spawn; /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns -.float(float _imp) vehicles_impusle; +.float(float _imp) vehicles_impulse; .float vehicle_weapon2mode = volly_counter; -//ยง .void() vehicle_factory() - #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