AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-06-01 20:06:25 -10:00
parent 56a5cfd115
commit 357a7efa9a
16 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/CScriptActor.cpp
View File

@@ -7,6 +7,7 @@
#include "CScriptColorModulate.hpp"
#include "Character/IAnimReader.hpp"
#include "TCastTo.hpp"
#include "CActorParameters.hpp"
namespace urde
{
@@ -20,6 +21,8 @@ CScriptActor::CScriptActor(TUniqueId uid, std::string_view name, const CEntityIn
, x258_initialHealth(hInfo)
, x260_currentHealth(hInfo)
, x268_damageVulnerability(dVuln)
, x2d0_fadeInTime(actParms.x5c_fadeInTime)
, x2d4_fadeOutTime(actParms.x60_fadeOutTime)
, x2d8_shaderIdx(shaderIdx)
, x2dc_xrayAlpha(xrayAlpha)
{
@@ -76,11 +79,11 @@ void CScriptActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
if (!GetActive())
{
mgr.SendScriptMsg(this, x8_uid, EScriptObjectMessage::Activate);
CScriptColorModulate::FadeInHelper(mgr, x8_uid, x2d0_alphaMax);
CScriptColorModulate::FadeInHelper(mgr, x8_uid, x2d0_fadeInTime);
}
break;
case EScriptObjectMessage::Decrement:
CScriptColorModulate::FadeOutHelper(mgr, x8_uid, x2d4_alphaMin);
CScriptColorModulate::FadeOutHelper(mgr, x8_uid, x2d4_fadeOutTime);
break;
default:
break;