PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 18:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add CTargetableProjectile

Browse Source 
Former-commit-id: 816dde4f03
This commit is contained in:
Henrique Gemignani Passos Lima
2022-11-11 04:25:54 +02:00
parent fd4981295e
commit 3b656e2454
10 changed files with 132 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Collision/CMaterialList.hpp
View File

@@ -72,7 +72,7 @@ static EMaterialTypes SolidMaterial = kMT_Solid;
class CMaterialList {
public:
CMaterialList() : value(0) {}
CMaterialList(const EMaterialTypes& m1) : value(0) { Add(m1); }
explicit CMaterialList(const EMaterialTypes& m1) : value(0) { Add(m1); }
CMaterialList(const EMaterialTypes& m1, const EMaterialTypes& m2) : value(0) {
Add(m1);
Add(m2);
@@ -100,7 +100,7 @@ public:
Add(m4);
Add(m5);
}
CMaterialList(u64 value) : value(value) {}
explicit CMaterialList(u64 value) : value(value) {}
void Add(EMaterialTypes material) { value |= u64(1) << material; }
void Add(const CMaterialList& material) { value |= material.value; }