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

Merge pull request #365 from SirMangler/lambdaconstexpr 

[Windows] Remove constexpr from Lambda functions to fix compiler errors.
This commit is contained in:
Luke Street 2021-01-09 15:08:37 -05:00 committed by GitHub
parent 0cdacb1f37 0e093baf67
commit 37134cf8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ void CBouncyGrenade::Think(float dt, CStateManager& mgr) {
const zeus::CTransform& orientation = GetTransform().getRotation();
const zeus::CVector3f& translation = GetTranslation();
const zeus::CVector3f& scale = GetModelData()->GetScale();
auto UpdateElementGen = [ orientation, translation, scale, dt ](CElementGen & gen) constexpr {
auto UpdateElementGen = [ orientation, translation, scale, dt ](CElementGen & gen) {
gen.SetOrientation(orientation);
gen.SetGlobalTranslation(translation);
gen.SetGlobalScale(scale);

2
Runtime/World/CScriptMazeNode.cpp
View File

@ -371,7 +371,7 @@ void CMazeState::GenerateObstacles() {
Initialize();
}
auto GetRandom = [this](s32 offset) constexpr {
auto GetRandom = [this](s32 offset) {
s32 tmp = x0_rand.Next();
return tmp + ((tmp / 5) * -5) + offset;
};