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

Revert test changes

This commit is contained in:
Phillip Stephens 2021-05-16 12:23:13 -07:00
parent 167b671596
commit d44a997a3a
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CActorLights.cpp
View File

@ -289,12 +289,12 @@ bool CActorLights::BuildAreaLightList(const CStateManager& mgr, const CGameArea&
} }
/* Ambient color for overflow area lights */ /* Ambient color for overflow area lights */
zeus::CColor overflowAmbColor = zeus::skBlack; zeus::CColor overflowAmbColor = zeus::skClear;
/* Averaged light for overflow area lights */ /* Averaged light for overflow area lights */
CLight overflowLight = CLight::BuildCustom(zeus::skZero3f, zeus::skZero3f, zeus::skBlack, CLight overflowLight = CLight::BuildCustom(zeus::skZero3f, zeus::skZero3f, zeus::skBlack,
0.f, 0.f, 0.f, 0.f, 0.f, 0.f); 0.f, 0.f, 0.f, 0.f, 0.f, 0.f);
zeus::CColor overflowLightColor = zeus::skBlack; zeus::CColor overflowLightColor = zeus::skClear;
float overflowMag = 0.f; float overflowMag = 0.f;
/* Max significant lights */ /* Max significant lights */

3
Runtime/World/CScriptTrigger.cpp
View File

@ -133,9 +133,6 @@ void CScriptTrigger::UpdateInhabitants(float dt, CStateManager& mgr) {
} }
const zeus::CVector3f force = forceMult * x11c_forceField; const zeus::CVector3f force = forceMult * x11c_forceField;
if (TCastToPtr<CPlayer>(pact)) {
fmt::print(FMT_STRING("FORCE {}\n"), force);
}
if (True(x12c_flags & ETriggerFlags::UseCollisionImpulses)) { if (True(x12c_flags & ETriggerFlags::UseCollisionImpulses)) {
pact->ApplyImpulseWR(force, zeus::CAxisAngle()); pact->ApplyImpulseWR(force, zeus::CAxisAngle());
pact->UseCollisionImpulses(); pact->UseCollisionImpulses();