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

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-09-02 11:40:22 -10:00
parent 0d08d4a40e cd3dfa113d
commit 6d3c4261f2
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/World/CScriptRandomRelay.cpp
View File

@ -34,10 +34,24 @@ void CScriptRandomRelay::SendLocalScriptMsgs(EScriptObjectState state, CStateMan
#if 0 #if 0
std::vector<std::pair<CEntity*, EScriptObjectMessage>> objs; std::vector<std::pair<CEntity*, EScriptObjectMessage>> objs;
objs.reserve(10); objs.reserve(10);
for (SConnection& conn : x20_conns) for (const SConnection& conn : x20_conns)
{ {
const std::unique_ptr<CObjectList>& objList = stateMgr.GetObjectList(); auto list = stateMgr.GetIdListForScript(conn.x8_objId);
auto it = list.first;
for (; it != list.second; ++it)
{
CEntity* ent = stateMgr.ObjectById(it->second);
if (ent && ent->GetActive())
objs.emplace_back(ent, conn.x4_msg);
} }
}
u32 r0 = x34_connectionCount;
if (x3c_clamp)
r0 = u32(0.5 + (float(x34_connectionCount) / 100.f));
float fVariance = float(x38_variance) * (2.f * stateMgr.GetActiveRandom()->Float());
#endif #endif
} }
} }

2
amuse

@ -1 +1 @@
Subproject commit 28cac7ff8373e0386d44492f27e717d6dee0e44a Subproject commit af68ee61e15567e74f057964fb2b852476c1e666