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
2017-11-23 22:23:28 -10:00
parent 41edf5a226
commit 6854cb9df7
36 changed files with 843 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Runtime/World/CScriptWaypoint.cpp
View File

@@ -1,18 +1,20 @@
#include "CScriptWaypoint.hpp"
#include "Character/CModelData.hpp"
#include "Collision/CMaterialList.hpp"
#include "CActorParameters.hpp"
#include "TCastTo.hpp"
#include "CStateManager.hpp"
namespace urde
{
CScriptWaypoint::CScriptWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, float, float,
u32, u32, u32, u32, u32, u32, u32)
const zeus::CTransform& xf, bool active, float f1, float f2,
u32 w1, u32 w2, u32 w3, u32 w4, u32 w5, u32 w6, u32 w7)
: CActor(uid, active, name, info, xf, CModelData(), CMaterialList(),
CActorParameters::None(), kInvalidUniqueId)
CActorParameters::None(), kInvalidUniqueId),
xe8_(f1), xec_(w7), xf0_(f2), xf4_(w1), xf5_(w2), xf6_(w3), xf7_(w4), xf8_(w5), xfa_jumpFlags(w6)
{
SetUseInSortedLists(false);
SetCallTouch(false);
}
void CScriptWaypoint::Accept(IVisitor& visitor)
@@ -20,4 +22,46 @@ void CScriptWaypoint::Accept(IVisitor& visitor)
visitor.Visit(this);
}
void CScriptWaypoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr)
{
CActor::AcceptScriptMsg(msg, sender, mgr);
if (GetActive())
if (msg == EScriptObjectMessage::Arrived)
SendScriptMsgs(EScriptObjectState::Arrived, mgr, EScriptObjectMessage::None);
}
void CScriptWaypoint::AddToRenderer(const zeus::CFrustum&, const CStateManager&) const
{
// Empty
}
TUniqueId CScriptWaypoint::FollowWaypoint(CStateManager& mgr) const
{
for (const SConnection& conn : x20_conns)
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Follow)
return mgr.GetIdForScript(conn.x8_objId);
return kInvalidUniqueId;
}
TUniqueId CScriptWaypoint::NextWaypoint(CStateManager& mgr) const
{
rstl::reserved_vector<TUniqueId, 10> ids;
for (const SConnection& conn : x20_conns)
{
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Next)
{
TUniqueId id = mgr.GetIdForScript(conn.x8_objId);
if (id != kInvalidUniqueId)
if (TCastToConstPtr<CScriptWaypoint> wp = mgr.GetObjectById(id))
if (wp->GetActive())
ids.push_back(wp->GetUniqueId());
}
}
if (ids.size() == 0)
return kInvalidUniqueId;
return ids[int(mgr.GetActiveRandom()->Float() * ids.size() * 0.99f)];
}
}