AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #159 from lioncash/constexpr 

CJellyZap: Make kPlayerFilter constexpr
This commit is contained in:
Luke S 2020-02-24 21:35:54 -05:00 committed by GitHub
parent a194e71fac c3294977ff
commit 4ae3bca176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CJellyZap.cpp
View File

@ -6,7 +6,7 @@
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
namespace urde::MP1 { namespace urde::MP1 {
const CMaterialFilter CJellyZap::kPlayerFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Player}); constexpr CMaterialFilter kPlayerFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Player});
CJellyZap::CJellyZap(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CJellyZap::CJellyZap(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CDamageInfo& dInfo, bool b1, float f1, float f2, float f3, float f4, CModelData&& mData, const CDamageInfo& dInfo, bool b1, float f1, float f2, float f3, float f4,

1
Runtime/MP1/World/CJellyZap.hpp
View File

@ -4,7 +4,6 @@
namespace urde::MP1 { namespace urde::MP1 {
class CJellyZap : public CPatterned { class CJellyZap : public CPatterned {
static const CMaterialFilter kPlayerFilter;
u32 x568_ = 0; u32 x568_ = 0;
CDamageInfo x56c_attackDamage; CDamageInfo x56c_attackDamage;
float x588_attackRadius; float x588_attackRadius;