PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 09:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add almost matched CScriptControllerAction

Browse Source 
Former-commit-id: 5ba677a41b
This commit is contained in:
Henrique Gemignani Passos Lima
2022-11-03 13:35:43 +02:00
parent 2dc0b02295
commit a0f60b1db3
7 changed files with 101 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/MetroidPrime/CStateManager.hpp
View File

@@ -9,6 +9,7 @@
#include "Kyoto/Math/CVector2i.hpp"
#include "Kyoto/TOneStatic.hpp"
#include "Kyoto/TToken.hpp"
#include "Kyoto/Input/CFinalInput.hpp"
#include "MetroidPrime/CEntityInfo.hpp"
#include "MetroidPrime/CObjectList.hpp"
@@ -161,6 +162,8 @@ public:
CObjectList& GetObjectListById(EGameObjectList id) { return *x808_objectLists[id]; }
const CFinalInput& GetFinalInput() const { return xb54_finalInput; }
CCameraFilterPass& CameraFilterPass(ECameraFilterStage stage) {
return xb84_camFilterPasses[size_t(stage)];
}
@@ -230,6 +233,8 @@ public:
void SetCinematicSkipObject(TUniqueId id) { xf38_skipCineSpecialFunc = id; }
void SetInSaveUI(bool b) { xf94_28_inSaveUI = b; }
bool GetInSaveUI() const { return xf94_28_inSaveUI; }
void SetInMapScreen(bool b) { xf94_27_inMapScreen = b; }
bool GetInMapScreen() const { return xf94_27_inMapScreen; }
void SetIsFullThreat(bool v) { xf94_30_fullThreat = v; }
uint GetInputFrameIdx() const { return x8d4_inputFrameIdx; }
@@ -271,8 +276,9 @@ private:
CRandom16 x8fc_random;
CRandom16* x900_random;
uchar x904_pad[0x280];
uchar x904_pad[0x250];
CFinalInput xb54_finalInput;
rstl::reserved_vector< CCameraFilterPass, kCFS_Max > xb84_camFilterPasses;
rstl::reserved_vector< CCameraBlurPass, kCFS_Max > xd14_camBlurPasses;
int xeec_hintIdx;

24
include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp Normal file
View File

@@ -0,0 +1,24 @@
#ifndef _CSCRIPTCONTROLLERACTION
#define _CSCRIPTCONTROLLERACTION
#include "MetroidPrime/CEntity.hpp"
#include "MetroidPrime/CControlMapper.hpp"
class CScriptControllerAction : public CEntity {
ControlMapper::ECommands x34_command;
uint x38_mapScreenSubaction;
bool x3c_24_mapScreenResponse : 1;
bool x3c_25_deactivateOnClose : 1;
bool x3c_26_pressed : 1;
public:
CScriptControllerAction(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
bool active, ControlMapper::ECommands command, bool b1, uint w1, bool b2);
~CScriptControllerAction();
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
};
#endif // _CSCRIPTCONTROLLERACTION