baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 11 Projects 1 Activity

Compare commits

base: baz:6a97c425d755bdf5c242c53193f4e648286f8894
Branches Tags
baz:main
..
compare: baz:d49010ff686a487c7f19f7727f621db96d6e9bb3
Branches Tags
baz:main

No commits in common. "6a97c425d755bdf5c242c53193f4e648286f8894" and "d49010ff686a487c7f19f7727f621db96d6e9bb3" have entirely different histories.
6a97c425d7 ... d49010ff68

4 changed files with 2 additions and 34 deletions
Show Stats Expand all files Collapse all files

6
Source/vampires/EnemyCharacter.cpp
View File

@ -189,10 +189,8 @@ void AEnemyCharacter::ResetHealth()
void AEnemyCharacter::DamagePlayer()
{
if (Player.Num() == 0) return;
for (int i = 0; i < Player.Num(); i++)
for (auto DamagedPlayer : Player)
{
UGameplayStatics::ApplyDamage(Player[i], Damage, GetController(), this, nullptr);
UGameplayStatics::ApplyDamage(DamagedPlayer, Damage, GetController(), this, nullptr);
}
}

13
Source/vampires/ObjectPoolManager.cpp
View File

@ -70,19 +70,6 @@ void AObjectPoolManager::ReturnObject(AActor* Object)
}
}
void AObjectPoolManager::ReturnAllObjects()
{
int ObjectPoolSize = ObjectPool.Num();
for (int i = 0; i < ObjectPoolSize; i++)
{
if (!ObjectPool[i]->IsHidden())
{
ReturnObject(ObjectPool[i]);
}
}
}
void AObjectPoolManager::SetObjectStatus(bool bEnabled, AActor* Object)
{
Object->SetActorHiddenInGame(!bEnabled);

2
Source/vampires/ObjectPoolManager.h
View File

@ -22,8 +22,6 @@ public:
void ReturnObject(AActor* Object);
void ReturnAllObjects();
protected:
// Called when the game starts or when spawned
virtual void BeginPlay() override;

15
Source/vampires/VampireGameMode.cpp
View File

@ -159,21 +159,6 @@ void AVampireGameMode::AddRandomEnemyTypeToPool()
void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)
{
GetWorldTimerManager().ClearTimer(SpawnEnemyTimerDelegate);
if (EnemyObjectPoolManager)
{
EnemyObjectPoolManager->ReturnAllObjects();
}
if (ProjectileObjectPoolManager)
{
ProjectileObjectPoolManager->ReturnAllObjects();
}
if (PickupObjectPoolManager)
{
PickupObjectPoolManager->ReturnAllObjects();
}
}
void AVampireGameMode::EndGame()