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 300a87a81c889933f6d14327276fa1300419f7b4..46face3407e19da89df03f3789630d339be8588c 100644 (file)
--- a/qcsrc/server/g_triggers.qh
+++ b/qcsrc/server/g_triggers.qh
@@ -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.
@@ -386,9 +386,7 @@ void spawnfunc_target_changelevel_use();
 
 void spawnfunc_target_changelevel();
 
-.float antiwall_flag; // Variable to define what to do with func_antiwall
+.float antiwall_flag; // Variable to define what to do with func_clientwall
 // 0 == do nothing, 1 == deactivate, 2 == activate
 
-.float illusion; // If not 0, func_antiwall will be non-solid
-
 #endif