mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-25 22:18:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_{auto_caption, area_explain} OK

Browse Source
This commit is contained in:
robojumper
2025-04-20 14:36:31 +02:00
parent 2eead00a49
commit ca8d58a59c
6 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/d_lyt_auto_caption.cpp
+8 -1
View File
@@ -3,8 +3,11 @@
#include "common.h"
#include "d/d_tag_processor.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_control_game.h"
#include "d/lyt/d_textbox.h"
#include "d/lyt/meter/d_lyt_meter.h"
#include "s/s_State.hpp"
#include "toBeSorted/event_manager.h"
STATE_DEFINE(dLytAutoCaption_c, Invisible);
STATE_DEFINE(dLytAutoCaption_c, In);
@@ -171,6 +174,10 @@ bool dLytAutoCaption_c::setText(const wchar_t *text) {
}
bool dLytAutoCaption_c::checkSomethingMeter() {
// TODO - too many dependencies on dLytMeter
if (EventManager::isInEvent() || !dLytControlGame_c::getInstance()->isStateNormal() ||
dLytMeterContainer_c::getItemSelect0x75A2() || dLytMeterContainer_c::getMinusBtnFn800F7600() ||
dLytMeterContainer_c::getDowsingFn800FE4B0()) {
return true;
}
return false;
}
src/d/lyt/d_lyt_auto_explain.cpp
+9 -1
View File
@@ -3,8 +3,11 @@
#include "common.h"
#include "d/d_tag_processor.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_control_game.h"
#include "d/lyt/d_textbox.h"
#include "d/lyt/meter/d_lyt_meter.h"
#include "s/s_State.hpp"
#include "toBeSorted/event_manager.h"
STATE_DEFINE(dLytAutoExplain_c, Invisible);
STATE_DEFINE(dLytAutoExplain_c, In);
@@ -164,6 +167,11 @@ bool dLytAutoExplain_c::setText(const wchar_t *text) {
}
bool dLytAutoExplain_c::checkSomethingMeter() {
// TODO - too many dependencies on dLytMeter
if (EventManager::isInEvent() || !dLytControlGame_c::getInstance()->isStateNormal() ||
dLytMeterContainer_c::getItemSelect0x75A2() || dLytMeterContainer_c::getMinusBtnFn800F7600() ||
dLytMeterContainer_c::getDowsingFn800FE4B0()) {
return true;
}
return false;
}