REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_TELEPORT)
#ifdef SVQC
-void trigger_teleport_use()
-{SELFPARAM();
+void trigger_teleport_use(entity this, entity actor, entity trigger)
+{
if(teamplay)
- self.team = activator.team;
+ this.team = actor.team;
#ifdef SVQC
- self.SendFlags |= SF_TRIGGER_UPDATE;
+ this.SendFlags |= SF_TRIGGER_UPDATE;
#endif
}
#endif
if(IS_TURRET(other))
return;
+#elif defined(CSQC)
+ if(!IS_PLAYER(other))
+ return;
#endif
- if(PHYS_DEAD(other))
+ if(IS_DEAD(other))
return;
if(self.team)
e = Simple_TeleportPlayer(self, other);
#ifdef SVQC
- activator = other;
string s = self.target; self.target = string_null;
- SUB_UseTargets();
+ SUB_UseTargets(self, other, other); // TODO: should we be using other for trigger too?
if (!self.target) self.target = s;
- WITH(entity, self, e, SUB_UseTargets());
+ SUB_UseTargets(e, other, other);
#endif
}
float trigger_teleport_send(entity this, entity to, float sf)
{
WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_TELEPORT);
- WriteByte(MSG_ENTITY, sf);
-
- if(sf & 1)
- {
- WriteByte(MSG_ENTITY, self.team);
- WriteInt24_t(MSG_ENTITY, self.spawnflags);
- WriteByte(MSG_ENTITY, self.active);
- WriteCoord(MSG_ENTITY, self.speed);
- trigger_common_write(true);
- }
+ WriteByte(MSG_ENTITY, this.team);
+ WriteInt24_t(MSG_ENTITY, this.spawnflags);
+ WriteByte(MSG_ENTITY, this.active);
+ WriteCoord(MSG_ENTITY, this.speed);
- if(sf & 2)
- {
- WriteByte(MSG_ENTITY, self.team);
- WriteByte(MSG_ENTITY, self.active);
- }
+ trigger_common_write(this, true);
return true;
}
void trigger_teleport_link(entity this)
{
- Net_LinkEntity(this, false, 0, trigger_teleport_send);
+ //trigger_link(this, trigger_teleport_send);
}
spawnfunc(trigger_teleport)
{
self.angles = '0 0 0';
- EXACTTRIGGER_INIT;
-
self.active = ACTIVE_ACTIVE;
-
+ //trigger_init(self); // only for predicted triggers?
+ EXACTTRIGGER_INIT;
self.use = trigger_teleport_use;
+ if(self.noise != "")
+ FOREACH_WORD(self.noise, true, precache_sound(it));
+
// this must be called to spawn the teleport waypoints for bots
InitializeEntity(self, teleport_findtarget, INITPRIO_FINDTARGET);
#elif defined(CSQC)
NET_HANDLE(ENT_CLIENT_TRIGGER_TELEPORT, bool isnew)
{
- int sf = ReadByte();
+ self.classname = "trigger_teleport";
+ int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; }
+ self.spawnflags = ReadInt24_t();
+ self.active = ReadByte();
+ self.speed = ReadCoord();
+
+ trigger_common_read(true);
+
+ self.entremove = trigger_remove_generic;
+ self.solid = SOLID_TRIGGER;
+ //self.draw = trigger_draw_generic;
+ //self.move_touch = trigger_push_touch;
+ self.drawmask = MASK_NORMAL;
+ self.move_time = time;
+ defer(self, 0.25, teleport_findtarget);
- if(sf & 1)
- {
- self.classname = "trigger_teleport";
- int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; }
- self.spawnflags = ReadInt24_t();
- self.active = ReadByte();
- self.speed = ReadCoord();
-
- trigger_common_read(true);
-
- self.entremove = trigger_remove_generic;
- self.solid = SOLID_TRIGGER;
- //self.draw = trigger_draw_generic;
- //self.move_touch = trigger_push_touch;
- self.drawmask = MASK_NORMAL;
- self.move_time = time;
- teleport_findtarget();
-
- self.teleport_next = teleport_first;
- teleport_first = self;
- }
+ self.teleport_next = teleport_first;
+ teleport_first = self;
- if(sf & 2)
- {
- self.team = ReadByte();
- self.active = ReadByte();
- }
return true;
}