Merge branch 'Tryibion-fix-run-cooked-game'

This commit is contained in:
Wojtek Figat
2025-01-12 22:01:34 +01:00

View File

@@ -671,11 +671,14 @@ bool GameCookerImpl::Build()
MCore::Thread::Attach(); MCore::Thread::Attach();
// Build Started // Build Started
CallEvent(GameCooker::EventType::BuildStarted); if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
data.Tools->OnBuildStarted(data); {
for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++) CallEvent(GameCooker::EventType::BuildStarted);
Steps[stepIndex]->OnBuildStarted(data); data.Tools->OnBuildStarted(data);
data.InitProgress(Steps.Count()); for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++)
Steps[stepIndex]->OnBuildStarted(data);
data.InitProgress(Steps.Count());
}
// Execute all steps in a sequence // Execute all steps in a sequence
bool failed = false; bool failed = false;
@@ -741,10 +744,13 @@ bool GameCookerImpl::Build()
} }
IsRunning = false; IsRunning = false;
CancelFlag = 0; CancelFlag = 0;
for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++) if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
Steps[stepIndex]->OnBuildEnded(data, failed); {
data.Tools->OnBuildEnded(data, failed); for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++)
CallEvent(failed ? GameCooker::EventType::BuildFailed : GameCooker::EventType::BuildDone); Steps[stepIndex]->OnBuildEnded(data, failed);
data.Tools->OnBuildEnded(data, failed);
CallEvent(failed ? GameCooker::EventType::BuildFailed : GameCooker::EventType::BuildDone);
}
Delete(Data); Delete(Data);
Data = nullptr; Data = nullptr;