Merge branch 'master' into Mario/use1

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / jumppads.qh

diff --git a/qcsrc/common/triggers/trigger/jumppads.qh b/qcsrc/common/triggers/trigger/jumppads.qh
index bb0f4750eebbc2af005c12a86123bb02470270d7..6fd61dc9da7561fb0bd684d30e50f95113267917 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qh
+++ b/qcsrc/common/triggers/trigger/jumppads.qh
@@ -15,14 +15,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
 
 /*
@@ -44,7 +38,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht);
 void trigger_push_touch();
 
 .vector dest;
-void trigger_push_findtarget();
+void trigger_push_findtarget(entity this);
 
 /*
  * ENTITY PARAMETERS:
@@ -59,10 +53,10 @@ 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();
+spawnfunc(target_push);
+spawnfunc(info_notnull);
+spawnfunc(target_position);
 #endif
 #endif