AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-12 10:06:09 +00:00
Code Issues Projects Releases Wiki Activity

Runtime/World: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-11 01:50:10 -04:00
parent 22880abb7e
commit bb7e94f304
69 changed files with 583 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/World/CFishCloud.cpp
View File

@@ -46,11 +46,16 @@ CFishCloud::CFishCloud(TUniqueId uid, bool active, std::string_view name, const
, x16c_color(color)
, x170_weaponKillRadius(weaponKillRadius)
, x174_containmentRadius(containmentRadius)
, x234_deathSfx(deathSfx != 0xffffffff ? CSfxManager::TranslateSFXID(u16(deathSfx & 0xffff)) : u16(0xffff)) {
x250_28_killable = killable;
x250_29_repelFromThreats = repelFromThreats;
, x234_deathSfx(deathSfx != 0xffffffff ? CSfxManager::TranslateSFXID(u16(deathSfx & 0xffff)) : u16(0xffff))
, x250_24_randomMovement(false)
, x250_25_worldSpace(true) // The result of a close_enough paradox (weird inlined test?)
, x250_26_enableWeaponRepelDamping(false)
, x250_27_validModel(false)
, x250_28_killable(killable)
, x250_29_repelFromThreats(repelFromThreats)
, x250_30_enablePlayerRepelDamping(false)
, x250_31_updateWithoutPartitions(false) {
x108_modifierSources.reserve(10);
x250_25_worldSpace = true; // The result of a close_enough paradox (weird inlined test?)
if (aRes.GetId().IsValid()) {
x1b0_models.emplace_back(std::make_unique<CModelData>(aRes));
x1b0_models.emplace_back(std::make_unique<CModelData>(aRes));