Level 2 #12

Merged
oleg.petruny merged 14 commits from Level2 into master 2025-04-25 21:17:42 +00:00
14 changed files with 25 additions and 28 deletions
Showing only changes of commit 5ee0839ab1 - Show all commits

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -22,13 +22,13 @@
ALevelBase* ALevelBase::Get()
{
if(auto GM = AMainGameModeBase::Get())
return GM->leadLevel.Get();
return GM->leadLevel;
return nullptr;
}
void ALevelBase::BeginPlay()
{
AMainGameModeBase::leadLevel = TStrongObjectPtr<ALevelBase>{ this };
AMainGameModeBase::leadLevel = this;
ALevelScriptActor::BeginPlay();

View File

@ -19,7 +19,7 @@ TStrongObjectPtr<UWidgetsManager> AMainGameModeBase::widgetsManager = nullptr;
TStrongObjectPtr<UCutsceneManager> AMainGameModeBase::cutsceneManager = nullptr;
TStrongObjectPtr<UQuickTimeEventManager> AMainGameModeBase::quickTimeEventManager = nullptr;
TStrongObjectPtr<UDialogueManager> AMainGameModeBase::dialogueManager = nullptr;
TStrongObjectPtr<ALevelBase> AMainGameModeBase::leadLevel = nullptr;
ALevelBase* AMainGameModeBase::leadLevel = nullptr;
void AMainGameModeBase::StartPlay()
{
@ -38,11 +38,11 @@ void AMainGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason)
{
cutsceneManager->LockCallback(true);
cutsceneManager->Clear();
leadLevel.Reset();
widgetsManager.Reset();
cutsceneManager.Reset();
quickTimeEventManager.Reset();
dialogueManager.Reset();
leadLevel = nullptr;
Super::EndPlay(EndPlayReason);
}

View File

@ -44,7 +44,7 @@ public:
void SwitchCameraMode();
static TStrongObjectPtr<class ALevelBase> leadLevel;
static class ALevelBase* leadLevel;
FQuestsUpdateDelegate questsUpdateDelegate;