AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07: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

6
Runtime/Particle/CDecalManager.hpp
View File

@@ -2,7 +2,7 @@
#include "RetroTypes.hpp"
#include "rstl.hpp"
#include "optional.hpp"
#include <optional>
#include "CToken.hpp"
#include "CDecal.hpp"
#include "zeus/CFrustum.hpp"
@@ -12,11 +12,11 @@ class CStateManager;
class CDecalManager {
struct SDecal {
rstl::optional<CDecal> x0_decal;
std::optional<CDecal> x0_decal;
TAreaId x70_areaId;
s8 x74_index;
bool x75_24_notIce : 1;
SDecal(const rstl::optional<CDecal>& decal, TAreaId aid, s8 idx, bool notIce)
SDecal(const std::optional<CDecal>& decal, TAreaId aid, s8 idx, bool notIce)
: x0_decal(decal), x70_areaId(aid), x74_index(idx) {
x75_24_notIce = notIce;
}