From c8e22a68738b488a295ad72875e423127244a315 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sun, 19 Mar 2017 20:59:46 -1000
Subject: [PATCH] Windows fixes

---
 DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp | 2 +-
 Runtime/AutoMapper/CAutoMapper.cpp            | 5 +++--
 Runtime/AutoMapper/CMapUniverse.hpp           | 2 +-
 Runtime/AutoMapper/CMapWorld.hpp              | 2 +-
 Runtime/World/CScriptVisorFlare.cpp           | 1 +
 hecl                                          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
index 7cc674a36..f3d30b2ea 100644
--- a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
+++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
@@ -10,7 +10,7 @@ namespace DataSpec
 
 struct ITweakPlayerRes : ITweak
 {
-    using ResId = int64_t;
+    using ResId = uint64_t;
     using EBeamId = urde::CPlayerState::EBeamId;
 
     ResId x4_saveStationIcon;
diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp
index ae215f0b4..c13df5b2e 100644
--- a/Runtime/AutoMapper/CAutoMapper.cpp
+++ b/Runtime/AutoMapper/CAutoMapper.cpp
@@ -6,6 +6,7 @@
 #include "AutoMapper/CMapArea.hpp"
 #include "zeus/CEulerAngles.hpp"
 #include "World/CPlayer.hpp"
+#include "Particle/CGenDescription.hpp"
 
 namespace urde
 {
@@ -118,8 +119,8 @@ zeus::CVector2i CAutoMapper::GetMiniMapViewportSize()
 {
     float scaleX = g_Viewport.x8_width / 640.f;
     float scaleY = g_Viewport.xc_height / 480.f;
-    return {scaleX * g_tweakAutoMapper->GetMiniMapViewportWidth(),
-            scaleY * g_tweakAutoMapper->GetMiniMapViewportHeight()};
+    return {int(scaleX * g_tweakAutoMapper->GetMiniMapViewportWidth()),
+            int(scaleY * g_tweakAutoMapper->GetMiniMapViewportHeight())};
 }
 
 float CAutoMapper::GetMapAreaMiniMapDrawAlphaSurfaceVisited(const CStateManager& stateMgr)
diff --git a/Runtime/AutoMapper/CMapUniverse.hpp b/Runtime/AutoMapper/CMapUniverse.hpp
index 5a4e53ea5..35ab153a8 100644
--- a/Runtime/AutoMapper/CMapUniverse.hpp
+++ b/Runtime/AutoMapper/CMapUniverse.hpp
@@ -7,11 +7,11 @@
 #include "zeus/CTransform.hpp"
 #include "IFactory.hpp"
 #include "CToken.hpp"
+#include "CMapArea.hpp"
 
 namespace urde
 {
 class CStateManager;
-class CMapArea;
 class CMapUniverse
 {
 public:
diff --git a/Runtime/AutoMapper/CMapWorld.hpp b/Runtime/AutoMapper/CMapWorld.hpp
index 476d7ec07..4e7ec13fe 100644
--- a/Runtime/AutoMapper/CMapWorld.hpp
+++ b/Runtime/AutoMapper/CMapWorld.hpp
@@ -6,11 +6,11 @@
 #include "zeus/CColor.hpp"
 #include "zeus/CVector3f.hpp"
 #include "zeus/CTransform.hpp"
+#include "CMapArea.hpp"
 
 namespace urde
 {
 class IWorld;
-class CMapArea;
 class CMapWorldInfo;
 class CStateManager;
 class CMapWorld
diff --git a/Runtime/World/CScriptVisorFlare.cpp b/Runtime/World/CScriptVisorFlare.cpp
index f8dc30f4b..5477b9354 100644
--- a/Runtime/World/CScriptVisorFlare.cpp
+++ b/Runtime/World/CScriptVisorFlare.cpp
@@ -3,6 +3,7 @@
 #include "TCastTo.hpp"
 #include "CStateManager.hpp"
 #include "CPlayer.hpp"
+#include "Particle/CGenDescription.hpp"
 
 namespace urde
 {
diff --git a/hecl b/hecl
index 2bc1c3054..5d11c53fe 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 2bc1c30547e891355bc99d8809f356d93c3ff7f3
+Subproject commit 5d11c53fea3e554c8c93a8c055edcc22dedaa084