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

Fix translation error in CScriptGenerator

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-24 09:47:11 -08:00
parent 696f7a9772
commit f57b44a786
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/World/CScriptGenerator.cpp
View File

@@ -6,13 +6,13 @@
namespace urde
{
CScriptGenerator::CScriptGenerator(TUniqueId uid, const std::string& name, const CEntityInfo& info, u32 w1, bool b1,
const zeus::CVector3f& vec1, bool follow, bool active, float minScale,
float maxScale)
CScriptGenerator::CScriptGenerator(TUniqueId uid, const std::string& name, const CEntityInfo& info, u32 spawnCount,
bool reuseFollowers, const zeus::CVector3f& vec1, bool inheritXf, bool active,
float minScale, float maxScale)
: CEntity(uid, info, active, name)
, x34_spawnCount(w1)
, x38_24_reuseFollowers(b1)
, x38_25_inheritTransform(follow)
, x34_spawnCount(spawnCount)
, x38_24_reuseFollowers(reuseFollowers)
, x38_25_inheritTransform(inheritXf)
, x3c_offset(vec1)
, x48_minScale(minScale)
, x4c_maxScale(maxScale)
@@ -99,7 +99,7 @@ void CScriptGenerator::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId
{
if (x38_25_inheritTransform)
activateActor->SetTransform(followActor->GetTransform());
activateActor->SetTranslation(activateActor->GetTranslation() + x3c_offset);
activateActor->SetTranslation(followActor->GetTranslation() + x3c_offset);
}
else if (follow != nullptr)
{
@@ -115,7 +115,7 @@ void CScriptGenerator::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId
{
if (x38_25_inheritTransform)
activateActor->SetTransform(followActor->GetTransform());
activateActor->SetTranslation(activateActor->GetTranslation() + x3c_offset);
activateActor->SetTranslation(followActor->GetTranslation() + x3c_offset);
}
float rnd = stateMgr.GetActiveRandom()->Range(x48_minScale, x4c_maxScale);