thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-31 12:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle light pointers lazily

Browse source 
fixes:
data/dynos_bin_pointer.cpp:16:13: runtime error: member access within null pointer of type 'struct Lights1'
This commit is contained in:
Isaac0-dev 2025-11-27 21:26:15 +10:00
parent cd480e4df9
commit 0fef647fe1
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
data/dynos_bin_pointer.cpp
View file

@ -13,44 +13,52 @@ typedef Pair<String, u32> PointerData;
static PointerData GetDataFromPointer(const void* aPtr, GfxData* aGfxData) {
// Lights
for (auto& _Node : aGfxData->mLights) {
if (&_Node->mData->l[0] == aPtr) { // Light *, not Lights1 *
return { _Node->mName, 1 };
auto node = DynOS_Lights_Parse(aGfxData, _Node);
if (!node->mData) { continue; }
if (&node->mData->l[0] == aPtr) { // Light *, not Lights1 *
return { node->mName, 1 };
}
if (&_Node->mData->a == aPtr) { // Ambient *, not Lights1 *
return { _Node->mName, 2 };
if (&node->mData->a == aPtr) { // Ambient *, not Lights1 *
return { node->mName, 2 };
}
}
// Light0s
for (auto& _Node : aGfxData->mLight0s) {
if (&_Node->mData->l[0] == aPtr) { // Light *, not Lights1 *
return { _Node->mName, 1 };
auto node = DynOS_Light0_Parse(aGfxData, _Node);
if (!node->mData) { continue; }
if (&node->mData->l[0] == aPtr) { // Light *, not Lights1 *
return { node->mName, 1 };
}
if (&_Node->mData->a == aPtr) { // Ambient *, not Lights1 *
return { _Node->mName, 2 };
if (&node->mData->a == aPtr) { // Ambient *, not Lights1 *
return { node->mName, 2 };
}
}
// Light_ts
for (auto& _Node : aGfxData->mLightTs) {
if (&_Node->mData->col[0] == aPtr) {
return { _Node->mName, 1 };
auto node = DynOS_LightT_Parse(aGfxData, _Node);
if (!node->mData) { continue; }
if (&node->mData->col[0] == aPtr) {
return { node->mName, 1 };
}
if (&_Node->mData->colc[0] == aPtr) {
return { _Node->mName, 2 };
if (&node->mData->colc[0] == aPtr) {
return { node->mName, 2 };
}
if (&_Node->mData->dir[0] == aPtr) {
return { _Node->mName, 3 };
if (&node->mData->dir[0] == aPtr) {
return { node->mName, 3 };
}
}
// Ambient_ts
for (auto& _Node : aGfxData->mAmbientTs) {
if (&_Node->mData->col[0] == aPtr) {
return { _Node->mName, 1 };
auto node = DynOS_AmbientT_Parse(aGfxData, _Node);
if (!node->mData) { continue; }
if (&node->mData->col[0] == aPtr) {
return { node->mName, 1 };
}
if (&_Node->mData->colc[0] == aPtr) {
return { _Node->mName, 2 };
if (&node->mData->colc[0] == aPtr) {
return { node->mName, 2 };
}
}