X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fjumppads.qh;h=76d244da55b2d0b8e814b1d3574b53f293c01ff6;hp=bb0f4750eebbc2af005c12a86123bb02470270d7;hb=7c19cc7613de325a0e43236ee4e202fd6c9f7a7a;hpb=ff442844108257ce535eae6dc08eaf659ff5efd7 diff --git a/qcsrc/common/triggers/trigger/jumppads.qh b/qcsrc/common/triggers/trigger/jumppads.qh index bb0f4750ee..76d244da55 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qh +++ b/qcsrc/common/triggers/trigger/jumppads.qh @@ -1,5 +1,4 @@ -#ifndef T_JUMPPADS_H -#define T_JUMPPADS_H +#pragma once const float PUSH_ONCE = 1; const float PUSH_SILENT = 2; @@ -15,14 +14,8 @@ const int NUM_JUMPPADSUSED = 3; float trigger_push_calculatevelocity_flighttime; #ifdef SVQC -void() SUB_UseTargets; -void trigger_push_use(); -#endif - -#ifdef CSQC -void ent_trigger_push(); - -void ent_target_push(); +void SUB_UseTargets(entity this, entity actor, entity trigger); +void trigger_push_use(entity this, entity actor, entity trigger); #endif /* @@ -41,10 +34,10 @@ void ent_target_push(); vector trigger_push_calculatevelocity(vector org, entity tgt, float ht); -void trigger_push_touch(); +void trigger_push_touch(entity this, entity toucher); .vector dest; -void trigger_push_findtarget(); +void trigger_push_findtarget(entity this); /* * ENTITY PARAMETERS: @@ -59,10 +52,9 @@ void trigger_push_findtarget(); * movedir: if target is not set, this * speed * 10 is the velocity to be reached. */ #ifdef SVQC -void spawnfunc_trigger_push(); +spawnfunc(trigger_push); -void spawnfunc_target_push(); -void spawnfunc_info_notnull(); -void spawnfunc_target_position(); -#endif +spawnfunc(target_push); +spawnfunc(info_notnull); +spawnfunc(target_position); #endif