diff options
| author | Elijah Thomas <elijahthomas774@gmail.com> | 2023-08-10 11:02:06 -0400 |
|---|---|---|
| committer | Elijah Thomas <elijahthomas774@gmail.com> | 2023-08-10 11:02:06 -0400 |
| commit | f7b8f8a792933c9c1e81392c90d7d7cae0ac6daf (patch) | |
| tree | 5cff66a34d487106c30649f1afa1d0e4c1c1151d /src/d/d_base.cpp | |
| parent | 3ff830a2ca34c388bb6a61c6602d25ff406bfa40 (diff) | |
fix mHelpAllocator_c symbols and add sbss vars to dBase_c
Diffstat (limited to 'src/d/d_base.cpp')
| -rw-r--r-- | src/d/d_base.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/d/d_base.cpp b/src/d/d_base.cpp index 5a7abc2b..d34b42e9 100644 --- a/src/d/d_base.cpp +++ b/src/d/d_base.cpp @@ -1,9 +1,11 @@ #include <d/d_base.h> extern "C" fProfile::fBaseProfile_c** DAT_ACTOR_ALLOCATION_FUNCTIONS; -extern "C" /* 805750c0 */ u32 ACTOR_SHOULD_UPDATE_FLAGS; -extern "C" /* 805750c4 */ u32 ACTOR_SHOULD_DRAW_FLAGS; -extern "C" /* 805750c0 */ u32 ACTOR_SHOULD_UNK_FLAGS; + +// .sbss +/* 805750c0 */ u32 dBase_c::s_ExecuteControlFlags; +/* 805750c0 */ u32 dBase_c::s_DrawControlFlags; +/* 805750c0 */ u32 dBase_c::s_NextExecuteControlFlags; dBase_c::dBase_c() : fBase_c() { baseProperties = DAT_ACTOR_ALLOCATION_FUNCTIONS[mProfName]->mBaseProperties; @@ -22,7 +24,7 @@ int dBase_c::preExecute() { if (fBase_c::preExecute() == 0) { return NOT_READY; } - if (ACTOR_SHOULD_UPDATE_FLAGS && !isProcControlFlag(ACTOR_SHOULD_UPDATE_FLAGS)) { + if (s_ExecuteControlFlags && !isProcControlFlag(s_ExecuteControlFlags)) { return NOT_READY; } return SUCCEEDED; @@ -41,16 +43,16 @@ int dBase_c::preDraw() { if (fBase_c::preDraw() == NOT_READY) { return NOT_READY; } - if (ACTOR_SHOULD_DRAW_FLAGS && !isProcControlFlag(ACTOR_SHOULD_DRAW_FLAGS)) { + if (s_DrawControlFlags && !isProcControlFlag(s_DrawControlFlags)) { return NOT_READY; } return SUCCEEDED; } void dBase_c::resetFlags() { - ACTOR_SHOULD_UPDATE_FLAGS = 0; - ACTOR_SHOULD_DRAW_FLAGS = 0; - ACTOR_SHOULD_UNK_FLAGS = 0; + s_ExecuteControlFlags = 0; + s_DrawControlFlags = 0; + s_NextExecuteControlFlags = 0; } bool dBase_c::isActorPlayer(dBase_c& base) { |