projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c6cc38
)
do the size extension not for trigger_conveyor, only for func_conveyor
author
Rudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 11:15:01 +0000
(12:15 +0100)
committer
Rudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 11:15:01 +0000
(12:15 +0100)
qcsrc/server/t_plats.qc
patch
|
blob
|
history
diff --git
a/qcsrc/server/t_plats.qc
b/qcsrc/server/t_plats.qc
index 32975c146bdb53bf21abd8e07d47fd138e9cafba..9c9eb42ba4a77024f966c6ebaa7b01ba659f896d 100644
(file)
--- a/
qcsrc/server/t_plats.qc
+++ b/
qcsrc/server/t_plats.qc
@@
-2070,8
+2070,11
@@
void conveyor_think()
if(!e.conveyor.state)
if(e.movetype != MOVETYPE_NONE)
{
- vector emin = e.absmin - '1 1 1';
- vector emax = e.absmax + '1 1 1';
+ if(self.solid == SOLID_BSP)
+ {
+ vector emin = e.absmin - '1 1 1';
+ vector emax = e.absmax + '1 1 1';
+ }
if(boxesoverlap(emin, emax, self.absmin, self.absmax)) // quick
if(WarpZoneLib_BoxTouchesBrush(emin, emax, self, e)) // accurate
e.conveyor = self;