X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_jumppads.qc;h=bf17e3faf0ece436d0508dc64c4a9bc517103566;hb=fb61c977ddeed686ef587fd54e40f55a4bdc2322;hp=07ed967fe3e700055cc2fb02afd10014d30c61b2;hpb=ad95c4f657533b07bf324305a00397d25c121f34;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index 07ed967fe..bf17e3faf 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -30,8 +30,8 @@ void trigger_push_use() vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) { - local float grav, sdist, zdist, vs, vz, jumpheight; - local vector sdir, torg; + float grav, sdist, zdist, vs, vz, jumpheight; + vector sdir, torg; torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5; @@ -175,12 +175,12 @@ void trigger_push_touch() sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); self.pushltime = time + 0.2; } - local float ct; + float ct; ct = clienttype(other); if( ct == CLIENTTYPE_REAL || ct == CLIENTTYPE_BOT) { - local float i; - local float found; + float i; + float found; found = FALSE; for(i = 0; i < other.jumppadcount && i < NUM_JUMPPADSUSED; ++i) if(other.(jumppadsused[i]) == self) @@ -247,13 +247,13 @@ void trigger_push_touch() self.think = SUB_Remove; self.nextthink = time; } -}; +} .vector dest; void trigger_push_findtarget() { - local entity e, t; - local vector org; + entity e, t; + vector org; // first calculate a typical start point for the jump org = (self.absmin + self.absmax) * 0.5; @@ -303,7 +303,7 @@ void trigger_push_findtarget() waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); remove(e); } -}; +} /* * ENTITY PARAMETERS: @@ -338,8 +338,8 @@ void spawnfunc_trigger_push() // this must be called to spawn the teleport waypoints for bots InitializeEntity(self, trigger_push_findtarget, INITPRIO_FINDTARGET); -}; +} -void spawnfunc_target_push() {}; -void spawnfunc_info_notnull() {}; -void spawnfunc_target_position() {}; +void spawnfunc_target_push() {} +void spawnfunc_info_notnull() {} +void spawnfunc_target_position() {}