Epsilon_02/project-restoration
1
0
Fork 0
mirror of https://github.com/leoetlino/project-restoration synced 2025-10-06 00:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

game: Fix GlobalContext pause flag definition

Browse Source
This commit is contained in:
Léo Lam
2020-05-09 23:42:46 +02:00
parent 25fb7b3e8e
commit fbd85ca960
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/common/flags.h
View File

@@ -12,6 +12,10 @@ namespace rst {
template <typename FlagType, typename = typename std::enable_if_t<std::is_enum_v<FlagType>, void>>
class Flags {
public:
constexpr auto& operator=(FlagType v) {
flags = std::underlying_type_t<FlagType>(v);
return *this;
}
constexpr void Set(FlagType v) { flags |= std::underlying_type_t<FlagType>(v); }
constexpr void Clear(FlagType v) { flags &= ~std::underlying_type_t<FlagType>(v); }

15
source/game/context.h
View File

@@ -22,11 +22,10 @@ namespace ui {
class PlayHud;
}
// based on a quick experiment - probably wrong
enum class UiMenuState : u16 {
Closed = 0,
Opening = 1,
Opened = 3,
enum class PauseFlag : u16 {
PauseCalc = 1 << 0,
PauseDraw = 1 << 1,
PauseAll = PauseCalc | PauseDraw,
};
// Keeps track of spawned actors.
@@ -148,7 +147,7 @@ static_assert(sizeof(HudState) == 0x280);
// Likely incomplete.
struct GlobalContext : State {
bool IsUiMenuActive() const { return ui_menu_state != game::UiMenuState::Closed; }
bool IsPaused() const { return pause_flags.IsOneSet(PauseFlag::PauseCalc, PauseFlag::PauseDraw); }
act::Actor* FindActorWithId(act::Id id, act::Type type) const;
template <typename T>
@@ -191,7 +190,7 @@ struct GlobalContext : State {
u8 gap_A7C[12];
u32 field_A88;
u8 gap_A8C[32];
UiMenuState ui_menu_state;
rst::Flags<PauseFlag> pause_flags;
u32 field_AB0;
u8 gap_AB4[76];
int field_B00;
@@ -349,7 +348,7 @@ struct GlobalContext : State {
u8 gap_F0F4[7996];
};
static_assert(rst::util::OffsetOf(&GlobalContext::main_camera) == 0x408);
static_assert(rst::util::OffsetOf(&GlobalContext::ui_menu_state) == 0xAAC);
static_assert(rst::util::OffsetOf(&GlobalContext::pause_flags) == 0xAAC);
static_assert(rst::util::OffsetOf(&GlobalContext::elegy_statues) == 0x2394);
static_assert(rst::util::OffsetOf(&GlobalContext::field_C000) == 0xc000);
static_assert(rst::util::OffsetOf(&GlobalContext::ocarina_state) == 0x8366);

2
source/game/ui.cpp
View File

@@ -45,7 +45,7 @@ bool OpenScreen(ScreenType screen) {
return false;
ui_ctx.new_screen = GetScreen(screen);
gctx->ui_menu_state = UiMenuState::Opening;
gctx->pause_flags = PauseFlag::PauseCalc;
gctx->enable_letterbox = false;
if (GetStaticContext().field_D38) {

2
source/rst/link.cpp
View File

@@ -261,7 +261,7 @@ void Calc() {
game::act::Player* player = gctx->GetPlayerActor();
if (!player)
return;
if (gctx->IsUiMenuActive())
if (gctx->IsPaused())
return;
if (player->controller_info.state) {