AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Refactor ResId into CAssetId

Browse Source
This commit is contained in:
Phillip Stephens
2017-08-12 22:26:14 -07:00
parent e0efcc0e5c
commit 870e8c80ee
176 changed files with 800 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CScriptSpecialFunction.hpp
View File

@@ -88,9 +88,9 @@ private:
u32 x1a8_ = 2;
zeus::CVector3f x1ac_ = zeus::CVector3f::skZero;
bool x1b8_ = true;
ResId x1bc_;
ResId x1c0_;
ResId x1c4_;
CAssetId x1bc_;
CAssetId x1c0_;
CAssetId x1c4_;
rstl::optional_object<zeus::CAABox> x1c8_;
union
{
@@ -111,7 +111,7 @@ private:
public:
CScriptSpecialFunction(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, ESpecialFunction,
const std::string&, float, float, float, float, const zeus::CVector3f&, const zeus::CColor&,
bool, const CDamageInfo&, ResId, ResId, ResId, s16, s16, s16);
bool, const CDamageInfo&, CAssetId, CAssetId, CAssetId, s16, s16, s16);
void Accept(IVisitor& visitor);
void Think(float, CStateManager &);