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

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-23 22:23:28 -10:00
parent 41edf5a226
commit 6854cb9df7
36 changed files with 843 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/CActorParameters.hpp
View File

@@ -11,6 +11,7 @@ namespace urde
class CActorParameters
{
friend class ScriptLoader;
friend class CActor;
CLightParameters x0_lightParms;
CScannableParameters x40_scanParms;
std::pair<CAssetId, CAssetId> x44_xrayAssets = {};
@@ -23,7 +24,7 @@ class CActorParameters
bool x58_24_ : 1;
bool x58_25_thermalHeat : 1;
bool x58_26_ : 1;
bool x58_27_ : 1;
bool x58_27_noSortThermal : 1;
};
u32 _dummy = 0;
};
@@ -32,7 +33,7 @@ class CActorParameters
float x64_ = 0.f;
public:
CActorParameters() : x58_24_(true), x58_25_thermalHeat(false), x58_26_(false), x58_27_(false) {}
CActorParameters() : x58_24_(true), x58_25_thermalHeat(false), x58_26_(false), x58_27_noSortThermal(false) {}
CActorParameters(const CLightParameters& lightParms, const CScannableParameters& scanParms,
const std::pair<CAssetId, CAssetId>& xrayAssets, const std::pair<CAssetId, CAssetId>& thermalAssets,
const CVisorParameters& visorParms, bool b1, bool thermalHeat, bool c, bool d)
@@ -44,7 +45,7 @@ public:
, x58_24_(b1)
, x58_25_thermalHeat(thermalHeat)
, x58_26_(c)
, x58_27_(d)
, x58_27_noSortThermal(d)
{
}
CActorParameters Scannable(const CScannableParameters& sParms) const