projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d8f8ba
)
Revert "Restore a safety check removed in the previous merge commit and put it in...
author
terencehill <piuntn@gmail.com>
Wed, 8 Feb 2023 21:40:34 +0000
(22:40 +0100)
committer
terencehill <piuntn@gmail.com>
Wed, 8 Feb 2023 21:40:34 +0000
(22:40 +0100)
This reverts commit
1d8f8ba43f23e2d949571624ba2ae2de9cdd24a8
.
qcsrc/common/physics/movetypes/movetypes.qc
patch
|
blob
|
history
diff --git
a/qcsrc/common/physics/movetypes/movetypes.qc
b/qcsrc/common/physics/movetypes/movetypes.qc
index a6ac13c1d5650b879db2ddccb7b6ff4427f0bbd4..651b6f3d642e7f861fe1cb4adcb439b5a7d6a8e3 100644
(file)
--- a/
qcsrc/common/physics/movetypes/movetypes.qc
+++ b/
qcsrc/common/physics/movetypes/movetypes.qc
@@
-717,7
+717,7
@@
bool _Movetype_PushEntity(entity this, vector push, bool dolink) // SV_PushEnti
_Movetype_LinkEdict(this, dolink);
- if((this.solid >= SOLID_TRIGGER && trace_
ent && trace_
fraction < 1 && (!IS_ONGROUND(this) || this.groundentity != trace_ent)))
+ if((this.solid >= SOLID_TRIGGER && trace_fraction < 1 && (!IS_ONGROUND(this) || this.groundentity != trace_ent)))
_Movetype_Impact(this, trace_ent);
return (this.origin == last_origin); // false if teleported by touch