mirror of
https://github.com/zeldaret/ss
synced 2026-08-03 08:43:32 -04:00
Implement the last function
This commit is contained in:
+18
-15
@@ -16,6 +16,7 @@
|
||||
#include "s/s_StateInterfaces.hpp"
|
||||
#include "toBeSorted/arc_managers/layout_arc_manager.h"
|
||||
#include "toBeSorted/d_emitter.h"
|
||||
#include "toBeSorted/event_manager_util.h"
|
||||
|
||||
SPECIAL_BASE_PROFILE(C_GAME, dCsGame_c, fProfile::C_GAME, 0x2BF, 0x06F9);
|
||||
|
||||
@@ -254,8 +255,10 @@ bool dCsGame_c::shouldDraw() const {
|
||||
}
|
||||
|
||||
bool dCsGame_c::isForcedHidden() const {
|
||||
// TODO - lots of EventManager inlines
|
||||
return false;
|
||||
return (
|
||||
EventManagerNotDrawControl0x80() && EventManagerNotSkyKeepPuzzle() && EventManagerNotInShop() &&
|
||||
EventManagerNotInDeposit() && !EventManagerIsMapOpenAndMessage() && !EventManagerIsMapOpenAnd0x9008Eq10()
|
||||
);
|
||||
}
|
||||
|
||||
void dCsGame_c::setNextCursorType(CursorType_e cs) {
|
||||
@@ -501,6 +504,18 @@ void dCsGame_c::lytItemCursor_c::changeState(const sFStateID_c<lytItemCursor_c>
|
||||
mStateMgr.changeState(newState);
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowStartDrawOrCharge(f32 f1, f32 f2) {
|
||||
mBow.startDrawOrCharge(f1, f2);
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowAimStart() {
|
||||
mBow.aimStart();
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowReady() {
|
||||
mBow.ready();
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::pachinkoSetCharging(bool charging, f32 progress) {
|
||||
mPachinko.setCharging(charging, progress);
|
||||
}
|
||||
@@ -525,18 +540,6 @@ void dCsGame_c::lytItemCursor_c::clawshotsSetLocked(bool locked) {
|
||||
mCrawShot.setLocked(locked);
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowStartDrawOrCharge(f32 f1, f32 f2) {
|
||||
mBow.startDrawOrCharge(f1, f2);
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowAimStart() {
|
||||
mBow.aimStart();
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::bowReady() {
|
||||
mBow.ready();
|
||||
}
|
||||
|
||||
void dCsGame_c::lytItemCursor_c::loadResAcc() {
|
||||
mLyt.setResAcc(mpResAcc);
|
||||
}
|
||||
@@ -646,7 +649,7 @@ void dCsGame_c::lytItemCursor_c::lytDowsingCsr_c::executeState_NotFind() {
|
||||
if (field_0xC0 < 0.9999f) {
|
||||
mAnm[MAIN_ANIM_DOWSE_IN_OUT].setAnimEnable(true);
|
||||
mAnm[MAIN_ANIM_DOWSE_IN_OUT].setForward();
|
||||
mStateMgr.changeState(StateID_Find);
|
||||
mStateMgr.changeState(StateID_ToFind);
|
||||
}
|
||||
}
|
||||
void dCsGame_c::lytItemCursor_c::lytDowsingCsr_c::finalizeState_NotFind() {}
|
||||
|
||||
@@ -996,7 +996,7 @@ bool dLytMeterMain_c::remove() {
|
||||
void dLytMeterMain_c::fn_800D5290() {
|
||||
dLytMeter_c *meter = dLytMeter_c::GetInstance();
|
||||
|
||||
if (dLytMap_c::GetInstance() != nullptr && !dLytMap_c::GetInstance()->unkMeterCheck()) {
|
||||
if (dLytMap_c::GetInstance() != nullptr && !dLytMap_c::GetInstance()->isSomeMapFieldEq2Or4Or5Or6()) {
|
||||
meter->setFlags(METER_BTN_PLUS);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user