Merge branch 'master' into Mario/hagar_notfixed

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / ladder.qc

diff --git a/qcsrc/common/triggers/func/ladder.qc b/qcsrc/common/triggers/func/ladder.qc
index bcf994ff4e42de7b845ab1c319592ef6d649980d..04c5c2563d785a665685bd9d8888393f9a2ad9cb 100644 (file)
--- a/qcsrc/common/triggers/func/ladder.qc
+++ b/qcsrc/common/triggers/func/ladder.qc
@@ -7,6 +7,9 @@ void func_ladder_touch()
                return;
        if(IS_VEHICLE(other))
                return;
+#elif defined(CSQC)
+       if(!other.isplayermodel)
+               return;
 #endif
 
        EXACTTRIGGER_TOUCH;
@@ -31,6 +34,7 @@ bool func_ladder_send(entity to, int sf)
 
 void func_ladder_link()
 {
+    SELFPARAM();
        self.SendEntity = func_ladder_send;
        self.SendFlags = 0xFFFFFF;
        //self.model = "null";
@@ -38,6 +42,7 @@ void func_ladder_link()
 
 void func_ladder_init()
 {
+    SELFPARAM();
        self.touch = func_ladder_touch;
 
        trigger_init(self);
@@ -57,10 +62,10 @@ spawnfunc(func_water)
 #elif defined(CSQC)
 .float speed;
 
-void func_ladder_remove()
+void func_ladder_remove(entity this)
 {
-       if(self.classname) { strunzone(self.classname); }
-       self.classname = string_null;
+       if(this.classname) { strunzone(this.classname); }
+       this.classname = string_null;
 }
 
 NET_HANDLE(ENT_CLIENT_LADDER, bool isnew)