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

Minor CActorParameters cleanup, initial CFlameThrower

Browse Source
This commit is contained in:
Phillip Stephens
2017-05-10 03:03:29 -07:00
parent c70a0d81cb
commit 3c566c2d8c
5 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Runtime/World/CActorParameters.hpp
View File

@@ -16,28 +16,35 @@ class CActorParameters
std::pair<ResId, ResId> x44_xrayAssets = {};
std::pair<ResId, ResId> x4c_thermalAssets = {};
CVisorParameters x54_visorParms;
bool b1 : 1;
bool b2 : 1;
bool b3 : 1;
bool b4 : 1;
union
{
struct
{
bool x58_24_ : 1;
bool x58_25_thermalHeat : 1;
bool x58_26_ : 1;
bool x58_27_ : 1;
};
u32 _dummy = 0;
};
float x5c_ = 0.f;
float x60_ = 0.f;
float x64_ = 0.f;
public:
CActorParameters() : b1(true), b2(false), b3(false), b4(false) {}
CActorParameters() : x58_24_(true), x58_25_thermalHeat(false), x58_26_(false), x58_27_(false) {}
CActorParameters(const CLightParameters& lightParms, const CScannableParameters& scanParms,
const std::pair<ResId, ResId>& xrayAssets, const std::pair<ResId, ResId>& thermalAssets,
const CVisorParameters& visorParms, bool a, bool b, bool c, bool d)
const CVisorParameters& visorParms, bool b1, bool thermalHeat, bool c, bool d)
: x0_lightParms(lightParms)
, x40_scanParms(scanParms)
, x44_xrayAssets(xrayAssets)
, x4c_thermalAssets(thermalAssets)
, x54_visorParms(visorParms)
, b1(a)
, b2(b)
, b3(c)
, b4(d)
, x58_24_(b1)
, x58_25_thermalHeat(thermalHeat)
, x58_26_(c)
, x58_27_(d)
{
}
CActorParameters Scannable(const CScannableParameters& sParms) const