Merge branch 'master' into Penguinum/Antiwall

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_triggers.qh

diff --git a/qcsrc/server/g_triggers.qh b/qcsrc/server/g_triggers.qh
index 35c39f290940fae9734872b7b8ee1bb4f7571b4f..46face3407e19da89df03f3789630d339be8588c 100644 (file)
--- a/qcsrc/server/g_triggers.qh
+++ b/qcsrc/server/g_triggers.qh
@@ -48,7 +48,7 @@ void multi_use();
 
 void multi_touch();
 
-void multi_eventdamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
+void multi_eventdamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
 
 void multi_reset();
 
@@ -193,7 +193,7 @@ void spawnfunc_func_pointparticles();
 
 void spawnfunc_func_sparks();
 
-float rainsnow_SendEntity(entity to, float sf);
+float rainsnow_SendEntity(entity to, int sf);
 
 /*QUAKED spawnfunc_func_rain (0 .5 .8) ?
 This is an invisible area like a trigger, which rain falls inside of.
@@ -385,4 +385,8 @@ void spawnfunc_relay_activatetoggle();
 void spawnfunc_target_changelevel_use();
 
 void spawnfunc_target_changelevel();
+
+.float antiwall_flag; // Variable to define what to do with func_clientwall
+// 0 == do nothing, 1 == deactivate, 2 == activate
+
 #endif