primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Luke Street
2026-03-03 23:20:52 -07:00
parent 29b4b888ae
commit f683d2ef2c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/MetroidPrime/CStateManager.hpp
-1
View File
@@ -476,7 +476,6 @@ private:
bool RayCollideWorldInternal(const CVector3f& start, const CVector3f& end,
const CMaterialFilter& filter, const TEntityList& nearList,
const CActor* damagee) const;
void UpdateActorInSortedLists(CActor& actor);
void UpdateEscapeSequenceTimer(float dt);
void CreateStandardGameObjects();
rstl::pair< const SScriptObjectStream*, TEditorId > GetBuildForScript(TEditorId eid) const;