Merge branch 'Enemy-AI' into dev

# Conflicts:
#	EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp
This commit is contained in:
Philip W 2023-10-02 19:38:33 +01:00
commit 826243de51

View File

@ -10,7 +10,7 @@ void AVisionLink::BeginPlay()
CooldownLength = CooldownTime; CooldownLength = CooldownTime;
InUseDuration = GadgetMaxUptime; InUseDuration = GadgetMaxUptime;
if (NumberOfPingPulses <= 0 ) NumberOfPingPulses = 1; if (NumberOfPingPulses <= 0) NumberOfPingPulses = 1;
TimeInbetweenPingPulses = GadgetMaxUptime / (float)NumberOfPingPulses; TimeInbetweenPingPulses = GadgetMaxUptime / (float)NumberOfPingPulses;
} }
@ -28,7 +28,7 @@ void AVisionLink::Activate()
void AVisionLink::FinishedUsing() void AVisionLink::FinishedUsing()
{ {
VisionLinkRecharging(); VisionLinkRecharging();
Super::FinishedUsing(); Super::FinishedUsing();
} }
@ -50,6 +50,3 @@ void AVisionLink::SendOutPingPulse()
GetWorld()->GetTimerManager().SetTimer(PulseHandle, this, &AVisionLink::SendOutPingPulse, TimeInbetweenPingPulses, false); GetWorld()->GetTimerManager().SetTimer(PulseHandle, this, &AVisionLink::SendOutPingPulse, TimeInbetweenPingPulses, false);
PlayPingPulseAnim(TimeInbetweenPingPulses); PlayPingPulseAnim(TimeInbetweenPingPulses);
} }