X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fjumppads.qc;h=b016dde9a19287d7e8c9e77ede292ee22c69c6cb;hb=db280a66b7b7ac88eaf779e80d71373c8d09cc98;hp=f4b3e455a1309e1f0a0d44b7542f4ae38689117c;hpb=bac31b218e747443d2e4c1f8d6b26b2bb71dddb8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc index f4b3e455a..b016dde9a 100644 --- a/qcsrc/common/mapobjects/trigger/jumppads.qc +++ b/qcsrc/common/mapobjects/trigger/jumppads.qc @@ -135,9 +135,9 @@ bool jumppad_push(entity this, entity targ) vector org = targ.origin; #ifdef SVQC - if(autocvar_sv_vq3compat) + if(autocvar_sv_q3defragcompat) #elif defined(CSQC) - if(STAT(VQ3COMPAT)) + if(STAT(Q3DEFRAGCOMPAT)) #endif { org.z += targ.mins_z; @@ -571,8 +571,6 @@ float trigger_push_send(entity this, entity to, float sf) WriteByte(MSG_ENTITY, this.active); WriteCoord(MSG_ENTITY, this.height); - WriteVector(MSG_ENTITY, this.movedir); - trigger_common_write(this, true); return true; @@ -636,9 +634,7 @@ bool target_push_send(entity this, entity to, float sf) WriteString(MSG_ENTITY, this.targetname); WriteVector(MSG_ENTITY, this.origin); - WriteAngle(MSG_ENTITY, this.angles_x); - WriteAngle(MSG_ENTITY, this.angles_y); - WriteAngle(MSG_ENTITY, this.angles_z); + WriteAngleVector(MSG_ENTITY, this.angles); return true; } @@ -704,8 +700,6 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew) this.active = ReadByte(); this.height = ReadCoord(); - this.movedir = ReadVector(); - trigger_common_read(this, true); this.entremove = trigger_remove_generic; @@ -730,9 +724,7 @@ NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew) this.targetname = strzone(ReadString()); this.origin = ReadVector(); - this.angles_x = ReadAngle(); - this.angles_y = ReadAngle(); - this.angles_z = ReadAngle(); + this.angles = ReadAngleVector(); return = true;