yindo/Project-Reboot-3.0
1
0
Fork 0
mirror of https://github.com/Milxnor/Project-Reboot-3.0.git synced 2026-01-13 10:52:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "alright im not so happy"

Browse Source 
This reverts commit bd87832147.
This commit is contained in:
Milxnor
2023-05-12 17:51:29 -04:00
parent bd87832147
commit 9be64d79ca
21 changed files with 38 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Project Reboot 3.0/FortGameModeAthena.cpp
View File

@@ -31,7 +31,6 @@
#include "calendar.h"
#include "gui.h"
#include <random>
#include "die.h"
static UFortPlaylist* GetPlaylistToUse()
{
@@ -166,8 +165,8 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
if (currentBasePlaylist)
{
// GameMode->SetCurrentPlaylistName(currentBasePlaylist);
// GameState->SetPlaylistId(currentBasePlaylist);
GameMode->SetCurrentPlaylistName(currentBasePlaylist);
GameState->SetPlaylistId(currentBasePlaylist);
}
}
else
@@ -180,8 +179,8 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
if (GameState->Get(CurrentPlaylistDataOffset))
{
// GameMode->SetCurrentPlaylistName(GameState->Get<UFortPlaylist*>(CurrentPlaylistDataOffset));
// GameState->SetPlaylistId(GameState->Get<UFortPlaylist*>(CurrentPlaylistDataOffset));
GameMode->SetCurrentPlaylistName(GameState->Get<UFortPlaylist*>(CurrentPlaylistDataOffset));
GameState->SetPlaylistId(GameState->Get<UFortPlaylist*>(CurrentPlaylistDataOffset));
}
}
}
@@ -417,8 +416,7 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
}
static auto bWorldIsReadyOffset = GameMode->GetOffset("bWorldIsReady");
static auto bWorldIsReadyFieldMask = GetFieldMask(GameMode->GetProperty("bWorldIsReady"));
GameMode->SetBitfieldValue(bWorldIsReadyOffset, bWorldIsReadyFieldMask, true); // idk when we actually set this
SetBitfield(GameMode->GetPtr<PlaceholderBitfield>(bWorldIsReadyOffset), 1, true); // idk when we actually set this
// Calendar::SetSnow(1000);
@@ -555,15 +553,10 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
GetWorld()->Listen();
FixBuildingContainers();
LOG_INFO(LogDev, "WorldLevel: {}", GameState->GetWorldLevel());
if (false)
{
SetupAIDirector();
SetupServerBotManager();
}
SetupAIDirector();
SetupServerBotManager();
bool bPrintCommonObjectPaths = true;
@@ -642,7 +635,7 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
{
if (CurrentObject->GetFullName().contains(WorldNamesToStreamAllFoundationsIn.at(z)))
{
// I think we only have to set bServerStreamedInLevel but whatever.
// I think we only have to set bServerStreamedInLevel.
ShowFoundation((AActor*)CurrentObject);
continue;
}
@@ -651,7 +644,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
}
Globals::bStartedListening = true;
// LOG_INFO(LogDev, "Finished listening!");
}
bool Ret = false;