lucastucious/SkyPortal-plugin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some crash on figure loading

Browse source
This commit is contained in:
Lucas 2024-11-24 14:22:04 +01:00
parent 8521e33d05
commit 27095ae6c7
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/SkyPortal/Private/SkyPortalIO.cpp
View file

@ -206,7 +206,11 @@ uint8* USkyPortalIO::QueryBlock(uint8 FigureIndex, uint8 BlockIndex)
} }
} }
} while (write == false && (output[0] != 'Q' || (output[1] % 0x10 != FigureIndex && output[1] != 0x01) || output[2] != BlockIndex) && attempt < 10); } while (write == false && output && (output[0] != 'Q' || (output[1] % 0x10 != FigureIndex && output[1] != 0x01) || output[2] != BlockIndex) && attempt < 10);
if (output == nullptr) {
UE_LOG(LogSkyportalIO, Error, TEXT("Query failed after %d attempts"), attempt);
return 0; // Return early if the loop failed to get valid output
}
UE_LOG(LogSkyportalIO, Verbose, TEXT("Querying block %d - success"), BlockIndex); UE_LOG(LogSkyportalIO, Verbose, TEXT("Querying block %d - success"), BlockIndex);
UE_LOG(LogSkyportalIO, VeryVerbose, TEXT("Data block %d = \n %s"), BlockIndex,*OutputToString(output)); UE_LOG(LogSkyportalIO, VeryVerbose, TEXT("Data block %d = \n %s"), BlockIndex,*OutputToString(output));
return output; return output;

10
Source/SkyPortal/Private/SkyPortalRunner.cpp
View file

@ -71,6 +71,8 @@ void FPortalStatusChecker::CheckPortalStatus()
if ( if (
//!FalsePositive() //filter conflicting infos //!FalsePositive() //filter conflicting infos
true) { true) {
int32 figID = 0;
UFigureData* figData = NewObject<UFigureData>();
//FigureDataBlock FigureData; //FigureDataBlock FigureData;
switch (CurrentStatusData.StatusArray[i]) switch (CurrentStatusData.StatusArray[i])
{ {
@ -78,8 +80,12 @@ void FPortalStatusChecker::CheckPortalStatus()
case EFigureStatus::PRESENT: case EFigureStatus::PRESENT:
break; break;
case EFigureStatus::ADDED: case EFigureStatus::ADDED:
//figData = PortalHandleRef->ReadFigureBlocks(i); figData = PortalHandleRef->ReadFigureBlocks(i);
subref->OnSkylanderAdded.Broadcast(00, i); if (figData)
{
figID = figData->GetFigureID();
}
subref->OnSkylanderAdded.Broadcast(figID, i);
break; break;
case EFigureStatus::REMOVED: case EFigureStatus::REMOVED:
subref->OnSkylanderRemoved.Broadcast(00, i); subref->OnSkylanderRemoved.Broadcast(00, i);