Make airsim api work with new referee blueprint

Author: SijmenHuizenga

UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.cpp

@@ -40,6 +40,9 @@ ASimModeBase::ASimModeBase()
 
     static ConstructorHelpers::FClassFinder<AActor> sky_sphere_class(TEXT("Blueprint'/Engine/EngineSky/BP_Sky_Sphere'"));
     sky_sphere_class_ = sky_sphere_class.Succeeded() ? sky_sphere_class.Class : nullptr;
+
+    static ConstructorHelpers::FClassFinder<AReferee> refereeBP_class(TEXT("Blueprint'/Game/FormulaStudentAssets/RefereeBP'"));
+    refereeBP_class_ = refereeBP_class.Succeeded() ? refereeBP_class.Class : nullptr;
 }
 
 void ASimModeBase::BeginPlay()

UE4Project/Plugins/AirSim/Source/SimMode/SimModeBase.h

@@ -13,6 +13,7 @@
 #include "api/ApiServerBase.hpp"
 #include "api/ApiProvider.hpp"
 #include "Vehicles/Car/CarPawnSimApi.h"
+#include "Referee.h"
 
 #include "SimModeBase.generated.h"
 
@@ -70,6 +71,8 @@ class AIRSIM_API ASimModeBase : public AActor
         return static_cast<CarPawnSimApi*>(api_provider_->getVehicleSimApi(vehicle_name));
     }
 
+    UPROPERTY() UClass* refereeBP_class_;
+
 protected: //must overrides
     typedef msr::airlib::AirSimSettings AirSimSettings;
 

UE4Project/Plugins/AirSim/Source/WorldSimApi.cpp

@@ -88,7 +88,7 @@ msr::airlib::CarApiBase::RefereeState WorldSimApi::getRefereeState() const
 {
     msr::airlib::CarApiBase::RefereeState result;
     UAirBlueprintLib::RunCommandOnGameThread([this, &result]() {
-        AReferee* referee = UAirBlueprintLib::FindActor<AReferee>(simmode_, FString("referee"));
+        AReferee* referee = (AReferee*) UGameplayStatics::GetActorOfClass(simmode_, simmode_->refereeBP_class_);
         result = referee ? referee->getState() : msr::airlib::CarApiBase::RefereeState();
     }, true);
     return result;

UE4Project/Plugins/AirSim/Source/WorldSimApi.h

@@ -52,4 +52,5 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase {
 
 private:
     ASimModeBase* simmode_;
+    UClass* refereeBPClass_;
 };