Net: register all types

[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 8b093f7adf745f8fc42a614b8d8a27210f71010b..b33de95f11b8e684d08aa3971009432814d240d5 100644 (file)
--- a/qcsrc/common/triggers/func/ladder.qc
+++ b/qcsrc/common/triggers/func/ladder.qc
@@ -1,9 +1,9 @@
 void func_ladder_touch()
-{
+{SELFPARAM();
 #ifdef SVQC
        if (!other.iscreature)
                return;
-       if (other.vehicle_flags & VHF_ISVEHICLE)
+       if(IS_VEHICLE(other))
                return;
 #endif
 #ifdef CSQC
@@ -18,13 +18,14 @@ void func_ladder_touch()
 }
 
 #ifdef SVQC
-float func_ladder_send(entity to, float sf)
+bool func_ladder_send(entity this, entity to, float sf)
 {
-       WriteByte(MSG_ENTITY, ENT_CLIENT_LADDER);
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_LADDER);
 
        WriteString(MSG_ENTITY, self.classname);
        WriteByte(MSG_ENTITY, self.skin);
        WriteByte(MSG_ENTITY, self.speed);
+       WriteString(MSG_ENTITY, self.mdl);
 
        trigger_common_write(false);
 
@@ -33,19 +34,23 @@ float func_ladder_send(entity to, float sf)
 
 void func_ladder_link()
 {
-       Net_LinkEntity(self, false, 0, func_ladder_send);
+       //self.SendEntity = func_ladder_send;
+       //self.SendFlags = 0xFFFFFF;
+       //self.model = "null";
 }
 
-void spawnfunc_func_ladder()
+spawnfunc(func_ladder)
 {
+       self.mdl = self.model;
        EXACTTRIGGER_INIT;
        self.touch = func_ladder_touch;
 
        func_ladder_link();
 }
 
-void spawnfunc_func_water()
+spawnfunc(func_water)
 {
+       self.mdl = self.model;
        EXACTTRIGGER_INIT;
        self.touch = func_ladder_touch;
 
@@ -56,12 +61,14 @@ void spawnfunc_func_water()
 .float speed;
 
 void ent_func_ladder()
-{
+{SELFPARAM();
        self.classname = strzone(ReadString());
        self.skin = ReadByte();
        self.speed = ReadByte();
+       self.model = strzone(ReadString());
 
        trigger_common_read(false);
+       self.mins = self.maxs = '0 0 0';
 
        self.solid = SOLID_TRIGGER;
        self.draw = trigger_draw_generic;
@@ -69,5 +76,8 @@ void ent_func_ladder()
        self.drawmask = MASK_NORMAL;
        self.move_time = time;
        self.entremove = trigger_remove_generic;
+
+       //precache_model(self.mdl);
+       EXACTTRIGGER_INIT;
 }
 #endif