Fix compilation of all files

Former-commit-id: a34a639326
This commit is contained in:
Henrique Gemignani Passos Lima 2022-11-25 23:02:17 +02:00
parent b70ed602b4
commit 234482d8de
9 changed files with 16 additions and 8 deletions

View File

@ -40,7 +40,7 @@ public:
return true;
}
if (HasLock() && CToken::IsLoaded()) {
x8_item = GetT();
x8_item = TToken::GetT();
return true;
} else {
return false;

View File

@ -4,6 +4,8 @@
#include "types.h"
#include "rstl/pair.hpp"
#include "Kyoto/TToken.hpp"
class CTransform4f;
class CParticleGen;
class IObjectStore;
@ -13,6 +15,9 @@ class CResFactory;
class CAABox;
class CVector2f;
class CVector3f;
class CModel;
class CSkinnedModel;
class CColor;
class IRenderer {
public:

View File

@ -15,6 +15,8 @@ class CRandom16;
class CBodyController {
public:
CBodyController();
CActor& GetOwner() const { return x0_actor; }
CBodyStateCmdMgr& CommandMgr() { return x4_cmdMgr; }
const CBodyStateCmdMgr& GetCommandMgr() const { return x4_cmdMgr; }

View File

@ -3,9 +3,10 @@
#include "rstl/vector.hpp"
#include "Kyoto/TToken.hpp"
class CAnimData;
class CStateManager;
class CToken;
class CGSFidget {
public:

View File

@ -40,7 +40,7 @@ public:
bool bigStrike);
void Update(float, CStateManager&);
void Draw(const CStateManager&, const CTransform4f&) const;
void ReturnToDefault(CStateManager& mgr);
void ReturnToDefault(CStateManager& mgr, bool);
int GetFreeLookSetId() const;
void BasePosition(bool bigStrikeReset);
void EnterFidget(CStateManager&, SamusGun::EFidgetType, int);

View File

@ -27,7 +27,7 @@ CInputStream::CInputStream(const void* ptr, int len, bool owned)
CInputStream::~CInputStream() {
if (x14_owned) {
delete x10_ptr;
delete[] x10_ptr;
}
}

View File

@ -35,7 +35,7 @@ CIOWin::EMessageReturn CErrorOutputWindow::OnMessage(const CArchitectureMessage&
case kAM_FrameEnd:
{
int result = x14_state ^ 1;
result = (result >> 1) - (result & x14_state) >> 0x1f;
result = (result >> 1) - ((result & x14_state) >> 0x1f);
return CIOWin::EMessageReturn(result);
}
break;

View File

@ -843,7 +843,7 @@ void CPlayerGun::UpdateGunIdle(bool inStrikeCooldown, float camBobT, float dt, C
} else {
if (x833_31_inFreeLook) {
if ((x2f8_stateFlags & 0x10) != 0x10) {
x73c_gunMotion->ReturnToDefault(mgr);
x73c_gunMotion->ReturnToDefault(mgr, x834_30_inBigStrike);
x740_grappleArm->ReturnToDefault(mgr, 0.f, false);
}
x833_31_inFreeLook = false;

View File

@ -76,8 +76,8 @@ void CGunMotion::Draw(const CStateManager& mgr, const CTransform4f& xf) const {
x0_modelData.Render(mgr, xf, nullptr, CModelFlags::Normal());
}
void CGunMotion::ReturnToDefault(CStateManager& mgr) {
x4c_gunController.ReturnToDefault(mgr, 0.f);
void CGunMotion::ReturnToDefault(CStateManager& mgr, bool b) {
x4c_gunController.ReturnToDefault(mgr, 0.f, b);
}
int CGunMotion::GetFreeLookSetId() const { return x4c_gunController.GetFreeLookSetId(); }