From fff7b90c851e173591d29ef945efe5352355ca62 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Oct 2019 19:43:21 -0400 Subject: [PATCH] CCollisionResponseData: In-class initialize primitives Avoids needing to give them their own entry within the constructor initializer list. --- Runtime/Collision/CCollisionResponseData.cpp | 2 +- Runtime/Collision/CCollisionResponseData.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/Collision/CCollisionResponseData.cpp b/Runtime/Collision/CCollisionResponseData.cpp index d09b79150..20b25204b 100644 --- a/Runtime/Collision/CCollisionResponseData.cpp +++ b/Runtime/Collision/CCollisionResponseData.cpp @@ -155,7 +155,7 @@ bool CCollisionResponseData::CheckAndAddResourceToResponse(FourCC clsId, CInputS } CCollisionResponseData::CCollisionResponseData(CInputStream& in, CSimplePool* resPool) -: x0_generators(94), x10_sfx(94, kInvalidSFX), x20_decals(94), x30_RNGE(50.f), x34_FOFF(0.2f) { +: x0_generators(94), x10_sfx(94, kInvalidSFX), x20_decals(94) { FourCC clsId = CPF::GetClassID(in); if (clsId == UncookedResType()) { CRandom16 rand; diff --git a/Runtime/Collision/CCollisionResponseData.hpp b/Runtime/Collision/CCollisionResponseData.hpp index 92fcd7eb1..36ce52ddc 100644 --- a/Runtime/Collision/CCollisionResponseData.hpp +++ b/Runtime/Collision/CCollisionResponseData.hpp @@ -116,8 +116,8 @@ class CCollisionResponseData { std::vector>> x0_generators; std::vector x10_sfx; std::vector>> x20_decals; - float x30_RNGE; - float x34_FOFF; + float x30_RNGE = 50.0f; + float x34_FOFF = 0.2f; void AddParticleSystemToResponse(EWeaponCollisionResponseTypes type, CInputStream& in, CSimplePool* resPool); bool CheckAndAddDecalToResponse(FourCC clsId, CInputStream& in, CSimplePool* resPool);