mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-09 12:05:52 -04:00
fix some tracker locations not getting updated fast enough
This commit is contained in:
@@ -499,7 +499,16 @@ int daObjLife_c::initActionOrderGetDemo() {
|
||||
int daObjLife_c::actionOrderGetDemo() {
|
||||
if (eventInfo.checkCommandItem()) {
|
||||
setStatus(STATUS_GET_DEMO_e);
|
||||
|
||||
|
||||
#if TARGET_PC
|
||||
// Set the tracker flag for rando now. The flag doesn't normally
|
||||
// get set until after execItemGive runs
|
||||
if (randomizer_IsActive()) {
|
||||
g_randomizerState.mTrackerTempItemFlag.flag = getSaveBitNo();
|
||||
g_randomizerState.mTrackerTempItemFlag.stage = getStageSaveId(getStageID());
|
||||
}
|
||||
#endif
|
||||
|
||||
if (mItemId != fpcM_ERROR_PROCESS_ID_e) {
|
||||
dComIfGp_event_setItemPartnerId(mItemId);
|
||||
}
|
||||
|
||||
@@ -191,6 +191,10 @@ public:
|
||||
int stage{-1};
|
||||
int flag{-1};
|
||||
} mTrackerTempSwitchFlag;
|
||||
struct {
|
||||
int stage{-1};
|
||||
int flag{-1};
|
||||
} mTrackerTempItemFlag;
|
||||
};
|
||||
|
||||
extern RandomizerState g_randomizerState;
|
||||
|
||||
@@ -724,6 +724,11 @@ bool tracker_isStageSwitch(int stage, int flag) {
|
||||
}
|
||||
|
||||
bool tracker_isStageItem(int stage, int flag) {
|
||||
if (g_randomizerState.mTrackerTempItemFlag.flag == flag &&
|
||||
g_randomizerState.mTrackerTempItemFlag.stage == stage) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (dComIfGp_getStageStagInfo() && stage == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
|
||||
return dComIfGs_isItem(flag, -1);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user