Added the barebones pre-battle menu

11 months ago · 84643b06f7
parent 09746d1a25
commit 84643b06f7
9 changed files with 18 additions and 15 deletions
--- a/Content/Blueprints/BP_GameState.uasset
+++ b/Content/Blueprints/BP_GameState.uasset
--- a/Content/Blueprints/BP_PlayerController.uasset
+++ b/Content/Blueprints/BP_PlayerController.uasset
--- a/Content/Blueprints/BP_PlayerPawn.uasset
+++ b/Content/Blueprints/BP_PlayerPawn.uasset
--- a/Content/Blueprints/UI/Components/WBP_Window.uasset
+++ b/Content/Blueprints/UI/Components/WBP_Window.uasset
--- a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset
+++ b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset
--- a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset
+++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset
--- a/Source/SpaceBattler/Private/PartySubsystem.cpp
+++ b/Source/SpaceBattler/Private/PartySubsystem.cpp
@ -7,7 +7,7 @@ void UPartySubsystem::AddToParty(UUnitInfo* UnitInfo)
 {
 	for (FPartyMember &Unit : Members)
 	{
-		if(GetMemberUnitInfo(Unit)->GetClass() == UnitInfo->GetClass())
+		if(Unit.UnitInfo == UnitInfo)
 		{
 			const bool UpdateAllocated = GetMemberAvailable(Unit) == GetMemberAllocated(Unit);
 			
--- a/Source/SpaceBattler/Private/StateMachineSubsystem.cpp
+++ b/Source/SpaceBattler/Private/StateMachineSubsystem.cpp
@ -29,6 +29,9 @@ bool UStateMachineSubsystem::ChangeState(const EGameState NewState)
 	case EGameState::Battle:
 		switch(NewState)
 		{
+		case EGameState::Battle:
+			UE_LOG(LogTemp, Warning, TEXT("Entering BATTLE state from BATTLE.  Should only be possible when debugging"))
+			break;
 		case EGameState::BattleMenu:
 			UE_LOG(LogTemp, Display, TEXT("Entering BATTLEMENU state from BATTLE"))
 			break;