From 6056857cab47b336edf6d91653c493df36634b2b Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Fri, 14 Apr 2017 20:16:38 -1000
Subject: [PATCH] Windows build fixes

---
 Runtime/AutoMapper/CAutoMapper.cpp | 4 ++--
 Runtime/CMakeLists.txt             | 4 ++--
 Runtime/MkCastTo.py                | 2 +-
 Runtime/RetroTypes.cpp             | 7 -------
 Runtime/Weapon/CExplosion.cpp      | 0
 Runtime/Weapon/CExplosion.hpp      | 0
 Runtime/Weapon/CMakeLists.txt      | 1 -
 Runtime/World/CExplosion.hpp       | 1 +
 Runtime/World/CHUDMemoParms.cpp    | 1 -
 Runtime/World/CMakeLists.txt       | 2 +-
 Runtime/rstl.cpp                   | 6 ------
 11 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 Runtime/RetroTypes.cpp
 delete mode 100644 Runtime/Weapon/CExplosion.cpp
 delete mode 100644 Runtime/Weapon/CExplosion.hpp
 delete mode 100644 Runtime/World/CHUDMemoParms.cpp
 delete mode 100644 Runtime/rstl.cpp

diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp
index c069a84ee..92b846453 100644
--- a/Runtime/AutoMapper/CAutoMapper.cpp
+++ b/Runtime/AutoMapper/CAutoMapper.cpp
@@ -29,7 +29,7 @@ void CAutoMapper::SAutoMapperRenderState::InterpolateWithClamp(const SAutoMapper
     else
         easeInOut = zeus::clamp(0.f, 1.f - (0.5f * std::sqrt(2.f * omt - 1.f) + 0.5f), 1.f);
 
-    float eases[] = {};
+    float eases[5] = {};
     eases[1] = t;
     eases[2] = easeOut;
     eases[3] = easeIn;
@@ -766,7 +766,7 @@ zeus::CVector2i CAutoMapper::GetMiniMapViewportSize()
 
 zeus::CVector2i CAutoMapper::GetMapScreenViewportSize()
 {
-    return {g_Viewport.x8_width, g_Viewport.xc_height};
+    return {int(g_Viewport.x8_width), int(g_Viewport.xc_height)};
 }
 
 float CAutoMapper::GetMapAreaMaxDrawDepth(const CStateManager&, TAreaId aid) const
diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index 637adeed5..1a3a9975a 100644
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@@ -49,7 +49,7 @@ if(APPLE)
 endif()
 
 add_library(RuntimeCommon
-            RetroTypes.hpp RetroTypes.cpp
+            RetroTypes.hpp
             ${CLIENT_SOURCES}
             ${MP1_SOURCES}
             ${AUDIO_SOURCES}
@@ -109,7 +109,7 @@ add_library(RuntimeCommon
             CPlayMovieBase.hpp
             CGameDebug.hpp CGameDebug.cpp
             CGameHintInfo.hpp CGameHintInfo.cpp
-            rstl.hpp rstl.cpp
+            rstl.hpp
             GameGlobalObjects.hpp GameGlobalObjects.cpp
             MkCastTo.py
             TCastTo.hpp TCastTo.cpp
diff --git a/Runtime/MkCastTo.py b/Runtime/MkCastTo.py
index 8627b4870..808f253cf 100644
--- a/Runtime/MkCastTo.py
+++ b/Runtime/MkCastTo.py
@@ -17,7 +17,7 @@ CENTITY_TYPES = (
     ('CDestroyableRock', 'World/CDestroyableRock.hpp'),
     ('CEnergyProjectile', 'Weapon/CEnergyProjectile.hpp'),
     ('CEntity', 'World/CEntity.hpp'),
-    ('CExplosion', 'Weapon/CExplosion.hpp'),
+    ('CExplosion', 'World/CExplosion.hpp'),
     ('CFirstPersonCamera', 'Camera/CFirstPersonCamera.hpp'),
     ('CFishCloud', 'World/CFishCloud.hpp'),
     ('CGameCamera', 'Camera/CGameCamera.hpp'),
diff --git a/Runtime/RetroTypes.cpp b/Runtime/RetroTypes.cpp
deleted file mode 100644
index f04787012..000000000
--- a/Runtime/RetroTypes.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-
-namespace urde
-{
-
-}
diff --git a/Runtime/Weapon/CExplosion.cpp b/Runtime/Weapon/CExplosion.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Runtime/Weapon/CExplosion.hpp b/Runtime/Weapon/CExplosion.hpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Runtime/Weapon/CMakeLists.txt b/Runtime/Weapon/CMakeLists.txt
index 9e935aba4..7e9fa28a9 100644
--- a/Runtime/Weapon/CMakeLists.txt
+++ b/Runtime/Weapon/CMakeLists.txt
@@ -24,7 +24,6 @@ set(WEAPON_SOURCES
     CPlasmaProjectile.hpp CPlasmaProjectile.cpp
     CEnergyProjectile.cpp CEnergyProjectile.cpp
     CProjectileWeapon.hpp CProjectileWeapon.cpp
-    CExplosion.hpp CExplosion.cpp
     CBomb.hpp CBomb.cpp
     CPowerBomb.hpp CPowerBomb.cpp)
 
diff --git a/Runtime/World/CExplosion.hpp b/Runtime/World/CExplosion.hpp
index 0891ac2c5..5ccffd901 100644
--- a/Runtime/World/CExplosion.hpp
+++ b/Runtime/World/CExplosion.hpp
@@ -3,6 +3,7 @@
 
 #include "CEffect.hpp"
 #include "Particle/CElementGen.hpp"
+#include "Particle/CGenDescription.hpp"
 
 namespace urde
 {
diff --git a/Runtime/World/CHUDMemoParms.cpp b/Runtime/World/CHUDMemoParms.cpp
deleted file mode 100644
index 2b8b46011..000000000
--- a/Runtime/World/CHUDMemoParms.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "CHUDMemoParms.hpp"
diff --git a/Runtime/World/CMakeLists.txt b/Runtime/World/CMakeLists.txt
index 710ba24f4..1e0e7c4be 100644
--- a/Runtime/World/CMakeLists.txt
+++ b/Runtime/World/CMakeLists.txt
@@ -105,7 +105,7 @@ set(WORLD_SOURCES
     CPatternedInfo.hpp CPatternedInfo.cpp
     CHealthInfo.hpp CHealthInfo.cpp
     CPatterned.hpp CPatterned.cpp
-    CHUDMemoParms.hpp CHUDMemoParms.cpp
+    CHUDMemoParms.hpp
     CWorldShadow.hpp CWorldShadow.cpp
     CProjectedShadow.hpp CProjectedShadow.cpp
     CGameLight.hpp CGameLight.cpp
diff --git a/Runtime/rstl.cpp b/Runtime/rstl.cpp
deleted file mode 100644
index 1e0c6e4b2..000000000
--- a/Runtime/rstl.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "rstl.hpp"
-
-namespace rstl
-{
-
-}