2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -3,52 +3,38 @@
#include "CStateManager.hpp"
#include "Input/ControlMapper.hpp"
namespace urde
{
namespace urde {
CScriptControllerAction::CScriptControllerAction(TUniqueId uid, std::string_view name,
const CEntityInfo& info, bool active,
ControlMapper::ECommands command, bool mapScreenResponse, u32 w1, bool deactivateOnClose)
: CEntity(uid, info, active, name), x34_command(command), x38_mapScreenSubaction(w1)
{
x3c_24_mapScreenResponse = mapScreenResponse;
x3c_25_deactivateOnClose = deactivateOnClose;
CScriptControllerAction::CScriptControllerAction(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, ControlMapper::ECommands command, bool mapScreenResponse,
u32 w1, bool deactivateOnClose)
: CEntity(uid, info, active, name), x34_command(command), x38_mapScreenSubaction(w1) {
x3c_24_mapScreenResponse = mapScreenResponse;
x3c_25_deactivateOnClose = deactivateOnClose;
}
void CScriptControllerAction::Accept(IVisitor& visitor)
{
visitor.Visit(this);
}
void CScriptControllerAction::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptControllerAction::Think(float, CStateManager& stateMgr)
{
bool oldPressed = x3c_26_pressed;
if (x3c_24_mapScreenResponse)
{
if (x38_mapScreenSubaction == 0)
x3c_26_pressed = stateMgr.GetInMapScreen();
}
else
{
x3c_26_pressed = ControlMapper::GetDigitalInput(x34_command, stateMgr.GetFinalInput());
}
if (GetActive() && x3c_26_pressed != oldPressed)
{
if (x3c_26_pressed)
{
SendScriptMsgs(EScriptObjectState::Open, stateMgr, EScriptObjectMessage::None);
}
else
{
SendScriptMsgs(EScriptObjectState::Closed, stateMgr, EScriptObjectMessage::None);
if (x3c_25_deactivateOnClose)
{
SetActive(false);
SendScriptMsgs(EScriptObjectState::Inactive, stateMgr, EScriptObjectMessage::None);
}
}
void CScriptControllerAction::Think(float, CStateManager& stateMgr) {
bool oldPressed = x3c_26_pressed;
if (x3c_24_mapScreenResponse) {
if (x38_mapScreenSubaction == 0)
x3c_26_pressed = stateMgr.GetInMapScreen();
} else {
x3c_26_pressed = ControlMapper::GetDigitalInput(x34_command, stateMgr.GetFinalInput());
}
if (GetActive() && x3c_26_pressed != oldPressed) {
if (x3c_26_pressed) {
SendScriptMsgs(EScriptObjectState::Open, stateMgr, EScriptObjectMessage::None);
} else {
SendScriptMsgs(EScriptObjectState::Closed, stateMgr, EScriptObjectMessage::None);
if (x3c_25_deactivateOnClose) {
SetActive(false);
SendScriptMsgs(EScriptObjectState::Inactive, stateMgr, EScriptObjectMessage::None);
}
}
}
}
}
} // namespace urde