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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Collision/CCollisionResponseData.hpp
View File

@@ -112,9 +112,9 @@ enum class EWeaponCollisionResponseTypes {
class CCollisionResponseData {
static const EWeaponCollisionResponseTypes skWorldMaterialTable[32];
static const s32 kInvalidSFX;
std::vector<rstl::optional<TLockedToken<CGenDescription>>> x0_generators;
std::vector<std::optional<TLockedToken<CGenDescription>>> x0_generators;
std::vector<s32> x10_sfx;
std::vector<rstl::optional<TLockedToken<CDecalDescription>>> x20_decals;
std::vector<std::optional<TLockedToken<CDecalDescription>>> x20_decals;
float x30_RNGE;
float x34_FOFF;
@@ -126,9 +126,9 @@ class CCollisionResponseData {
public:
CCollisionResponseData(CInputStream& in, CSimplePool* resPool);
const rstl::optional<TLockedToken<CGenDescription>>&
const std::optional<TLockedToken<CGenDescription>>&
GetParticleDescription(EWeaponCollisionResponseTypes) const;
const rstl::optional<TLockedToken<CDecalDescription>>&
const std::optional<TLockedToken<CDecalDescription>>&
GetDecalDescription(EWeaponCollisionResponseTypes type) const;
s32 GetSoundEffectId(EWeaponCollisionResponseTypes) const;
static EWeaponCollisionResponseTypes GetWorldCollisionResponseType(s32);