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

Standardize include guards, clang-format headers

Browse Source 
Former-commit-id: 261ee48bba
This commit is contained in:
Luke Street
2022-10-09 01:13:17 -04:00
parent 68d30b954d
commit 7f83e1fa03
341 changed files with 1373 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/MetroidPrime/CStateManager.hpp
View File

@@ -1,5 +1,5 @@
#ifndef _CSTATEMANAGER_HPP
#define _CSTATEMANAGER_HPP
#ifndef _CSTATEMANAGER
#define _CSTATEMANAGER
#include "types.h"
@@ -173,9 +173,7 @@ public:
//
void QueueMessage(int frameCount, CAssetId msg, float f1);
int GetHUDMessageFrameCount() const {
return xf80_hudMessageFrameCount;
}
int GetHUDMessageFrameCount() const { return xf80_hudMessageFrameCount; }
// State transitions
void DeferStateTransition(EStateManagerTransition t);
@@ -193,11 +191,11 @@ public:
}
void SetEnergyBarActorInfo(TUniqueId bossId, float maxEnergy, u32 stringIdx);
void SetPendingOnScreenTex(CAssetId texId, const CVector2i& origin, const CVector2i& extent);/* {
xef4_pendingScreenTex.x0_id = texId;
xef4_pendingScreenTex.x4_origin = origin;
xef4_pendingScreenTex.xc_extent = extent;
}*/
void SetPendingOnScreenTex(CAssetId texId, const CVector2i& origin, const CVector2i& extent); /* {
xef4_pendingScreenTex.x0_id = texId;
xef4_pendingScreenTex.x4_origin = origin;
xef4_pendingScreenTex.xc_extent = extent;
}*/
const SOnScreenTex& GetPendingScreenTex() const { return xef4_pendingScreenTex; }
float IntegrateVisorFog(float f);
@@ -289,4 +287,4 @@ private:
};
CHECK_SIZEOF(CStateManager, 0xf98)
#endif
#endif // _CSTATEMANAGER