From b8da8f17d4394fe4e69131d966808a7029474184 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sat, 26 Oct 2024 08:06:46 -0400 Subject: [PATCH] fix --- configure.py | 2 +- src/REL/d/a/d_a_bombf.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.py b/configure.py index eb6b5dde..4343b306 100644 --- a/configure.py +++ b/configure.py @@ -465,7 +465,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]): Object(NonMatching, "d/col/bg/d_bg_w_kcol.cpp"), Object(Matching, "d/col/bg/d_bg_w_sv.cpp"), Object(NonMatching, "d/col/bg/d_bg_w_time.cpp"), - Object(NonMatching, "d/col/cc/d_cc_d.cpp"), + Object(Matching, "d/col/cc/d_cc_d.cpp"), ], }, { diff --git a/src/REL/d/a/d_a_bombf.cpp b/src/REL/d/a/d_a_bombf.cpp index 0714e4a5..609c3eef 100644 --- a/src/REL/d/a/d_a_bombf.cpp +++ b/src/REL/d/a/d_a_bombf.cpp @@ -4,9 +4,9 @@ #include "d/a/d_a_player.h" #include "d/col/bg/d_bg_s.h" #include "d/col/bg/d_bg_s_lin_chk.h" +#include "d/flag/sceneflag_manager.h" #include "m/m_mtx.h" #include "m/m_vec.h" -#include "toBeSorted/sceneflag_manager.h" #include "toBeSorted/time_area_mgr.h" SPECIAL_ACTOR_PROFILE(BOMBF, dAcBombf_c, fProfile::BOMBF, 0x129, 0, 4099); @@ -80,8 +80,7 @@ int dAcBombf_c::actorPostCreate() { if ((b && field_0x3D2 == 2) || (!b && field_0x3D2 == 0)) { mModel.setScale(0.0001f, 0.0001f, 0.0001f); if (mBombRef.get() != nullptr) { - // TODO wrong field - mBombRef.get()->mScale.x = 0.0001f; + mBombRef.get()->mField_0xA50 = 0.0001f; } } }