summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Fluff.cpp2
-rw-r--r--src/render/Fluff.h2
-rw-r--r--src/render/Hud.cpp20
-rw-r--r--src/render/Shadows.cpp2
-rw-r--r--src/render/VisibilityPlugins.cpp16
-rw-r--r--src/render/WaterLevel.cpp2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index 7c35319f..fc68d315 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -10,7 +10,7 @@
#include "Clock.h"
#include "Weather.h"
#include "Stats.h"
-#include "math/maths.h"
+#include "maths.h"
#include "Frontend.h"
uint8 ScrollCharSet[59][5] = {
diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index f33b016e..b189b9a2 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -1,6 +1,6 @@
#pragma once
#include "common.h"
-#include "math/Vector.h"
+#include "Vector.h"
class CMovingThings
{
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 1db7b07c..2dae7551 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -1128,7 +1128,7 @@ void CHud::DrawAfterFade()
switch (OddJob2On) {
case 0:
OddJob2On = 1;
- OddJob2XOffset = 380.0;
+ OddJob2XOffset = 380.0f;
break;
case 1:
if (OddJob2XOffset <= 2.0f) {
@@ -1136,27 +1136,27 @@ void CHud::DrawAfterFade()
OddJob2On = 2;
}
else {
- fStep = 40.0;
- if ((OddJob2XOffset * 0.16667) <= 40.0)
- fStep = OddJob2XOffset * 0.16667;
+ fStep = 40.0f;
+ if ((OddJob2XOffset * 0.16667f) <= 40.0f)
+ fStep = OddJob2XOffset * 0.16667f;
OddJob2XOffset = OddJob2XOffset - fStep;
}
break;
case 2:
- OddJob2Timer += (20.0 * CTimer::GetTimeStep());
+ OddJob2Timer += (20.0f * CTimer::GetTimeStep());
if (OddJob2Timer > 1500) {
OddJob2On = 3;
}
break;
case 3:
- fStep = 30.0;
- if ((OddJob2XOffset * 0.2) >= 30.0)
- fStep = OddJob2XOffset * 0.2;
+ fStep = 30.0f;
+ if ((OddJob2XOffset * 0.2f) >= 30.0f)
+ fStep = OddJob2XOffset * 0.2f;
OddJob2XOffset = OddJob2XOffset - fStep;
- if (OddJob2XOffset < -380.0) {
- OddJob2OffTimer = 5000.0;
+ if (OddJob2XOffset < -380.0f) {
+ OddJob2OffTimer = 5000.0f;
OddJob2On = 0;
}
break;
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index ccdc457c..4d2e4605 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -4,7 +4,7 @@
#include "TxdStore.h"
#include "Timer.h"
#include "Camera.h"
-#include "TimeCycle.h"
+#include "Timecycle.h"
#include "CutsceneMgr.h"
#include "Automobile.h"
#include "Ped.h"
diff --git a/src/render/VisibilityPlugins.cpp b/src/render/VisibilityPlugins.cpp
index ca3a0195..2107813b 100644
--- a/src/render/VisibilityPlugins.cpp
+++ b/src/render/VisibilityPlugins.cpp
@@ -103,14 +103,14 @@ CVisibilityPlugins::SetRenderWareCamera(RwCamera *camera)
else
ms_cullCompsDist = sq(TheCamera.LODDistMultiplier * 20.0f);
- ms_vehicleLod0Dist = sq(70.0 * TheCamera.GenerationDistMultiplier);
- ms_vehicleLod1Dist = sq(90.0 * TheCamera.GenerationDistMultiplier);
- ms_vehicleFadeDist = sq(100.0 * TheCamera.GenerationDistMultiplier);
- ms_bigVehicleLod0Dist = sq(60.0 * TheCamera.GenerationDistMultiplier);
- ms_bigVehicleLod1Dist = sq(150.0 * TheCamera.GenerationDistMultiplier);
- ms_pedLod0Dist = sq(25.0 * TheCamera.LODDistMultiplier);
- ms_pedLod1Dist = sq(60.0 * TheCamera.LODDistMultiplier);
- ms_pedFadeDist = sq(70.0 * TheCamera.LODDistMultiplier);
+ ms_vehicleLod0Dist = sq(70.0f * TheCamera.GenerationDistMultiplier);
+ ms_vehicleLod1Dist = sq(90.0f * TheCamera.GenerationDistMultiplier);
+ ms_vehicleFadeDist = sq(100.0f * TheCamera.GenerationDistMultiplier);
+ ms_bigVehicleLod0Dist = sq(60.0f * TheCamera.GenerationDistMultiplier);
+ ms_bigVehicleLod1Dist = sq(150.0f * TheCamera.GenerationDistMultiplier);
+ ms_pedLod0Dist = sq(25.0f * TheCamera.LODDistMultiplier);
+ ms_pedLod1Dist = sq(60.0f * TheCamera.LODDistMultiplier);
+ ms_pedFadeDist = sq(70.0f * TheCamera.LODDistMultiplier);
}
RpMaterial*
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 48e8f83b..a1c2af93 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -9,7 +9,7 @@
#include "Boat.h"
#include "World.h"
#include "General.h"
-#include "TimeCycle.h"
+#include "Timecycle.h"
#include "ZoneCull.h"
#include "Clock.h"
#include "Particle.h"