Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have level scripts prefer their local datanodes

This commit is contained in:
MysterD 2022-04-16 22:06:38 -07:00
parent a5da5dcb6d
commit 1576d92734
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
data/dynos_bin_lvl.cpp
View File

@ -1367,8 +1367,23 @@ s64 DynOS_Lvl_ParseLevelScriptConstants(const String& _Arg, bool* found) {
return 0; return 0;
} }
template <typename T>
DataNode<T>* FindDataNode(DataNodes<T>& aDataNodes, String& aName, u32 aModelIdentifier) {
DataNode<T>* best = NULL;
for (auto& node : aDataNodes) {
if (aName == node->mName) {
if (aModelIdentifier == node->mModelIdentifier) {
return node;
}
best = node;
}
}
return best;
}
static LevelScript ParseLevelScriptSymbolArgInternal(GfxData* aGfxData, DataNode<LevelScript>* aNode, u64& aTokenIndex, bool* found) { static LevelScript ParseLevelScriptSymbolArgInternal(GfxData* aGfxData, DataNode<LevelScript>* aNode, u64& aTokenIndex, bool* found) {
String _Arg = aNode->mTokens[aTokenIndex++]; String _Arg = aNode->mTokens[aTokenIndex++];
u64 _ModelIdentifier = aNode->mModelIdentifier;
*found = true; *found = true;
// Integers // Integers
@ -1399,8 +1414,9 @@ static LevelScript ParseLevelScriptSymbolArgInternal(GfxData* aGfxData, DataNode
} }
// Level Scripts // Level Scripts
for (auto& _Node : aGfxData->mLevelScripts) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<LevelScript>(aGfxData->mLevelScripts, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
auto base = DynOS_Lvl_Parse(aGfxData, _Node, false)->mData; auto base = DynOS_Lvl_Parse(aGfxData, _Node, false)->mData;
auto data = (u8*)base + _Offset; auto data = (u8*)base + _Offset;
if (_Offset != 0) { if (_Offset != 0) {
@ -1411,50 +1427,57 @@ static LevelScript ParseLevelScriptSymbolArgInternal(GfxData* aGfxData, DataNode
} }
// Geo layouts // Geo layouts
for (auto& _Node : aGfxData->mGeoLayouts) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<GeoLayout>(aGfxData->mGeoLayouts, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_Geo_Parse(aGfxData, _Node, false)->mData; return (LevelScript) DynOS_Geo_Parse(aGfxData, _Node, false)->mData;
} }
} }
// Collisions // Collisions
for (auto& _Node : aGfxData->mCollisions) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<Collision>(aGfxData->mCollisions, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_Col_Parse(aGfxData, _Node, false)->mData; return (LevelScript) DynOS_Col_Parse(aGfxData, _Node, false)->mData;
} }
} }
// MacroObjects // MacroObjects
for (auto& _Node : aGfxData->mMacroObjects) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<MacroObject>(aGfxData->mMacroObjects, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_MacroObject_Parse(aGfxData, _Node, false)->mData; return (LevelScript) DynOS_MacroObject_Parse(aGfxData, _Node, false)->mData;
} }
} }
// Trajectories // Trajectories
for (auto& _Node : aGfxData->mTrajectories) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<Trajectory>(aGfxData->mTrajectories, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_Trajectory_Parse(aGfxData, _Node, false)->mData; return (LevelScript) DynOS_Trajectory_Parse(aGfxData, _Node, false)->mData;
} }
} }
// Movtexs // Movtexs
for (auto& _Node : aGfxData->mMovtexs) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<Movtex>(aGfxData->mMovtexs, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_Movtex_Parse(aGfxData, _Node, false)->mData; return (LevelScript) DynOS_Movtex_Parse(aGfxData, _Node, false)->mData;
} }
} }
// MovtexQCs // MovtexQCs
for (auto& _Node : aGfxData->mMovtexQCs) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<MovtexQC>(aGfxData->mMovtexQCs, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_MovtexQC_Parse(aGfxData, _Node)->mData; return (LevelScript) DynOS_MovtexQC_Parse(aGfxData, _Node)->mData;
} }
} }
// Rooms // Rooms
for (auto& _Node : aGfxData->mRooms) { {
if (_Arg == _Node->mName) { auto _Node = FindDataNode<u8>(aGfxData->mRooms, _Arg, aGfxData->mModelIdentifier);
if (_Node != NULL) {
return (LevelScript) DynOS_Rooms_Parse(aGfxData, _Node)->mData; return (LevelScript) DynOS_Rooms_Parse(aGfxData, _Node)->mData;
} }
} }