2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:47:42 +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,29 +3,25 @@
#include "CEntity.hpp"
#include "Input/ControlMapper.hpp"
namespace urde
{
namespace urde {
class CScriptControllerAction : public CEntity
{
ControlMapper::ECommands x34_command;
u32 x38_mapScreenSubaction;
union
{
struct
{
bool x3c_24_mapScreenResponse : 1;
bool x3c_25_deactivateOnClose : 1;
bool x3c_26_pressed : 1;
};
u8 _dummy = 0;
class CScriptControllerAction : public CEntity {
ControlMapper::ECommands x34_command;
u32 x38_mapScreenSubaction;
union {
struct {
bool x3c_24_mapScreenResponse : 1;
bool x3c_25_deactivateOnClose : 1;
bool x3c_26_pressed : 1;
};
u8 _dummy = 0;
};
public:
CScriptControllerAction(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, ControlMapper::ECommands command, bool b1, u32 w1, bool b2);
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
CScriptControllerAction(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active,
ControlMapper::ECommands command, bool b1, u32 w1, bool b2);
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
};
}
} // namespace urde