diff options
author | aap <aap@papnet.eu> | 2020-04-20 20:17:43 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-04-20 20:17:43 +0200 |
commit | 56035468567032429727724d2ecf17f57d299d61 (patch) | |
tree | 49c847c062cf1cd40b79213064bf8dd2c7ae499e /src/render/Glass.cpp | |
parent | librw (diff) | |
parent | Merge pull request #477 from ShFil119/mingw (diff) | |
download | re3-56035468567032429727724d2ecf17f57d299d61.tar re3-56035468567032429727724d2ecf17f57d299d61.tar.gz re3-56035468567032429727724d2ecf17f57d299d61.tar.bz2 re3-56035468567032429727724d2ecf17f57d299d61.tar.lz re3-56035468567032429727724d2ecf17f57d299d61.tar.xz re3-56035468567032429727724d2ecf17f57d299d61.tar.zst re3-56035468567032429727724d2ecf17f57d299d61.zip |
Diffstat (limited to 'src/render/Glass.cpp')
-rw-r--r-- | src/render/Glass.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp index 33e22c87..9a4dbcfe 100644 --- a/src/render/Glass.cpp +++ b/src/render/Glass.cpp @@ -6,7 +6,7 @@ #include "General.h" #include "AudioScriptObject.h" #include "World.h" -#include "TimeCycle.h" +#include "Timecycle.h" #include "Particle.h" #include "Camera.h" #include "RenderBuffer.h" @@ -617,12 +617,12 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed, CVector c = object->GetMatrix() * col->vertices[2]; CVector d = object->GetMatrix() * col->vertices[3]; - float minx = min(min(a.x, b.x), min(c.x, d.x)); - float maxx = max(max(a.x, b.x), max(c.x, d.x)); - float miny = min(min(a.y, b.y), min(c.y, d.y)); - float maxy = max(max(a.y, b.y), max(c.y, d.y)); - float minz = min(min(a.z, b.z), min(c.z, d.z)); - float maxz = max(max(a.z, b.z), max(c.z, d.z)); + float minx = Min(Min(a.x, b.x), Min(c.x, d.x)); + float maxx = Max(Max(a.x, b.x), Max(c.x, d.x)); + float miny = Min(Min(a.y, b.y), Min(c.y, d.y)); + float maxy = Max(Max(a.y, b.y), Max(c.y, d.y)); + float minz = Min(Min(a.z, b.z), Min(c.z, d.z)); + float maxz = Max(Max(a.z, b.z), Max(c.z, d.z)); if ( amount > 300.0f ) |