AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

51
Runtime/World/CScriptPlayerStateChange.cpp
View File

@@ -4,8 +4,7 @@
#include "Input/ControlMapper.hpp"
#include "TCastTo.hpp"
namespace urde
{
namespace urde {
CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, u32 itemType, u32 itemCount, u32 itemCapacity,
EControl control, EControlCommandOption controlCmdOpt)
@@ -14,37 +13,29 @@ CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, std::string_vi
, x38_itemCount(itemCount)
, x3c_itemCapacity(itemCapacity)
, x40_ctrl(control)
, x44_ctrlCmdOpt(controlCmdOpt)
{
}
, x44_ctrlCmdOpt(controlCmdOpt) {}
void CScriptPlayerStateChange::Accept(IVisitor& visitor)
{
visitor.Visit(this);
}
void CScriptPlayerStateChange::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptPlayerStateChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr)
{
if (GetActive() && msg == EScriptObjectMessage::SetToZero)
{
stateMgr.GetPlayerState()->InitializePowerUp(CPlayerState::EItemType(x34_itemType), x3c_itemCapacity);
stateMgr.GetPlayerState()->IncrPickup(CPlayerState::EItemType(x34_itemType), x38_itemCount);
void CScriptPlayerStateChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
if (GetActive() && msg == EScriptObjectMessage::SetToZero) {
stateMgr.GetPlayerState()->InitializePowerUp(CPlayerState::EItemType(x34_itemType), x3c_itemCapacity);
stateMgr.GetPlayerState()->IncrPickup(CPlayerState::EItemType(x34_itemType), x38_itemCount);
if (x44_ctrlCmdOpt == EControlCommandOption::Filtered && x40_ctrl == EControl::Filtered)
{
bool filtered = x44_ctrlCmdOpt != EControlCommandOption::Unfiltered;
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitClose, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitConfirm, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitDown, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitFar, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitLeft, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitObject, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitRight, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitSelect, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitUp, filtered);
}
if (x44_ctrlCmdOpt == EControlCommandOption::Filtered && x40_ctrl == EControl::Filtered) {
bool filtered = x44_ctrlCmdOpt != EControlCommandOption::Unfiltered;
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitClose, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitConfirm, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitDown, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitFar, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitLeft, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitObject, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitRight, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitSelect, filtered);
ControlMapper::SetCommandFiltered(ControlMapper::ECommands::OrbitUp, filtered);
}
}
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
}
}
} // namespace urde