PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-18 19:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match CGunMotion::Draw/GetFreeLookSetId

Browse Source 
Former-commit-id: 77ad228fdb
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-07 02:28:42 +03:00
parent 02fc116666
commit f4b3f5b872
5 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/MetroidPrime/Weapons/GunController/CGunController.hpp
View File

@@ -3,6 +3,8 @@
#include "types.h"
#include "MetroidPrime/Weapons/GunController/CGSFreeLook.hpp"
class CModelData;
enum EGunState {
@@ -20,10 +22,10 @@ class CStateManager;
class CGunController {
CModelData& x0_modelData;
// CGSFreeLook x4_freeLook;
CGSFreeLook x4_freeLook;
// CGSComboFire x1c_comboFire;
// CGSFidget x30_fidget;
u8 x4_pad[0x4C];
u8 x1c_pad[0x34];
EGunState x50_gunState;
int x54_curAnimId;
bool x58_24_animDone : 1;
@@ -43,6 +45,9 @@ public:
void ReturnToDefault(CStateManager&, float);
void Reset();
void ReturnToBasePosition(CStateManager&);
int GetFreeLookSetId() const { return x4_freeLook.GetSetId(); }
};
CHECK_SIZEOF(CGunController, 0x5C)