From 9cb9d4df1d9e9044e7c7547ec57213827f05389d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 11 May 2017 09:42:43 -1000 Subject: [PATCH] Windows build fixes --- Runtime/Weapon/CFlameThrower.cpp | 2 +- hecl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Weapon/CFlameThrower.cpp b/Runtime/Weapon/CFlameThrower.cpp index 8adb36854..310a400cc 100644 --- a/Runtime/Weapon/CFlameThrower.cpp +++ b/Runtime/Weapon/CFlameThrower.cpp @@ -14,7 +14,7 @@ CFlameThrower::CFlameThrower(const TToken& wDesc, const std: : CGameProjectile(false, wDesc, name, wType, xf, matType, dInfo, owner, aId, uid, kInvalidUniqueId, w1, false, zeus::CVector3f(1.f), {}, -1, false) , x2e8_(xf) -, x33c_flameDesc(g_SimplePool->GetObj({flameInfo.GetFlameFxId(), SBIG('PART')})) +, x33c_flameDesc(g_SimplePool->GetObj({FOURCC('PART'), flameInfo.GetFlameFxId()})) , x348_flameGen(new CElementGen(x33c_flameDesc, CElementGen::EModelOrientationType::Normal, CElementGen::EOptionalSystemFlags::One)) { diff --git a/hecl b/hecl index 3878eaa8d..87d40a39e 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 3878eaa8db88fe30520190fde23785f12b2fed14 +Subproject commit 87d40a39e5d6c94124097d8ea9960e8beffcc525