summaryrefslogtreecommitdiffstats
path: root/src/control/TrafficLights.cpp
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2020-04-20 19:50:12 +0200
committerGitHub <noreply@github.com>2020-04-20 19:50:12 +0200
commit7794cca429163429e9a4b216d717002ae1034040 (patch)
tree10f23f0a163b2a7b3011b5570eb9af93010a25a1 /src/control/TrafficLights.cpp
parentupdated librw again (diff)
parentTry to build with mingw (diff)
downloadre3-7794cca429163429e9a4b216d717002ae1034040.tar
re3-7794cca429163429e9a4b216d717002ae1034040.tar.gz
re3-7794cca429163429e9a4b216d717002ae1034040.tar.bz2
re3-7794cca429163429e9a4b216d717002ae1034040.tar.lz
re3-7794cca429163429e9a4b216d717002ae1034040.tar.xz
re3-7794cca429163429e9a4b216d717002ae1034040.tar.zst
re3-7794cca429163429e9a4b216d717002ae1034040.zip
Diffstat (limited to 'src/control/TrafficLights.cpp')
-rw-r--r--src/control/TrafficLights.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp
index 096bb484..c8d3f79f 100644
--- a/src/control/TrafficLights.cpp
+++ b/src/control/TrafficLights.cpp
@@ -1,19 +1,19 @@
#include "common.h"
-#include "General.h"
#include "Camera.h"
-#include "World.h"
-#include "PathFind.h"
-#include "Timer.h"
#include "Clock.h"
-#include "Weather.h"
-#include "Timecycle.h"
-#include "Pointlights.h"
-#include "Shadows.h"
#include "Coronas.h"
+#include "General.h"
+#include "PathFind.h"
+#include "PointLights.h"
+#include "Shadows.h"
#include "SpecialFX.h"
-#include "Vehicle.h"
+#include "Timecycle.h"
+#include "Timer.h"
#include "TrafficLights.h"
+#include "Vehicle.h"
+#include "Weather.h"
+#include "World.h"
// TODO: figure out the meaning of this
enum { SOME_FLAG = 0x80 };
@@ -39,10 +39,10 @@ CTrafficLights::DisplayActualLight(CEntity *ent)
float zMax = mi->Get2dEffect(0)->pos.z;
for(i = 1; i < 6; i++){
assert(mi->Get2dEffect(i));
- yMin = min(yMin, mi->Get2dEffect(i)->pos.y);
- yMax = max(yMax, mi->Get2dEffect(i)->pos.y);
- zMin = min(zMin, mi->Get2dEffect(i)->pos.z);
- zMax = max(zMax, mi->Get2dEffect(i)->pos.z);
+ yMin = Min(yMin, mi->Get2dEffect(i)->pos.y);
+ yMax = Max(yMax, mi->Get2dEffect(i)->pos.y);
+ zMin = Min(zMin, mi->Get2dEffect(i)->pos.z);
+ zMax = Max(zMax, mi->Get2dEffect(i)->pos.z);
}
CVector pos1, pos2;