fix remaining issues for packaging

modi0012 · Jun 20, 2018 · aca1ff8 · aca1ff8
1 parent bf0c81a
commit aca1ff8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
@@ -171,19 +171,19 @@ void UAirBlueprintLib::LogMessage(const FString &prefix, const FString &suffix,
     switch (level) {
     case LogDebugLevel::Informational:
         color = FColor(147, 231, 237);
-        //UE_LOG(LogAirSim, Log, TEXT("%s%s"), *prefix, *suffix);
+        //UE_LOG(LogTemp, Log, TEXT("%s%s"), *prefix, *suffix);
         break;
     case LogDebugLevel::Success:
         color = FColor(156, 237, 147);
-        //UE_LOG(LogAirSim, Log, TEXT("%s%s"), *prefix, *suffix);
+        //UE_LOG(LogTemp, Log, TEXT("%s%s"), *prefix, *suffix);
         break;
     case LogDebugLevel::Failure:
         color = FColor(237, 147, 168);
         //UE_LOG(LogAirSim, Error, TEXT("%s%s"), *prefix, *suffix); 
         break;
     case LogDebugLevel::Unimportant:
         color = FColor(237, 228, 147);
-        //UE_LOG(LogAirSim, Verbose, TEXT("%s%s"), *prefix, *suffix); 
+        //UE_LOG(LogTemp, Verbose, TEXT("%s%s"), *prefix, *suffix); 
         break;
     default: color = FColor::Black; break;
     }

diff --git a/Unreal/Plugins/AirSim/Source/AirSim.cpp b/Unreal/Plugins/AirSim/Source/AirSim.cpp
@@ -3,8 +3,8 @@
 
 #include "AirSim.h"
 #include "Misc/Paths.h"
-
-DEFINE_LOG_CATEGORY(LogAirSim);
+#include "Modules/ModuleManager.h"
+#include "Modules/ModuleInterface.h"
 
 class FAirSim : public IModuleInterface
 {
@@ -17,7 +17,7 @@ IMPLEMENT_MODULE(FAirSim, AirSim)
 void FAirSim::StartupModule()
 {
     //plugin startup
-    UE_LOG(LogAirSim, Log, TEXT("StartupModule: AirSim plugin"));
+    UE_LOG(LogTemp, Log, TEXT("StartupModule: AirSim plugin"));
 }
 
 void FAirSim::ShutdownModule()

diff --git a/Unreal/Plugins/AirSim/Source/AirSim.h b/Unreal/Plugins/AirSim/Source/AirSim.h
@@ -5,6 +5,3 @@
 
 #include "CoreMinimal.h"
 
-DECLARE_STATS_GROUP(TEXT("AirSim"), STATGROUP_AirSim, STATCAT_Advanced);
-
-DECLARE_LOG_CATEGORY_EXTERN(LogAirSim, Log, All);
diff --git a/Unreal/Plugins/AirSim/Source/AirSimGameMode.cpp b/Unreal/Plugins/AirSim/Source/AirSimGameMode.cpp
@@ -1,5 +1,4 @@
 #include "AirSimGameMode.h"
-#include "AirSim.h"
 #include "Misc/FileHelper.h"
 #include "IImageWrapperModule.h"
 #include "SimHUD/SimHUD.h"
@@ -22,13 +21,13 @@ class AUnrealLog : public msr::airlib::Utils::Logger
         }
 
         if (level == msr::airlib::Utils::kLogLevelError) {
-            UE_LOG(LogAirSim, Error, TEXT("%s"), *FString(message.c_str()));
+            UE_LOG(LogTemp, Error, TEXT("%s"), *FString(message.c_str()));
         }
         else if (level == msr::airlib::Utils::kLogLevelWarn) {
-            UE_LOG(LogAirSim, Warning, TEXT("%s"), *FString(message.c_str()));
+            UE_LOG(LogTemp, Warning, TEXT("%s"), *FString(message.c_str()));
         }
         else {
-            UE_LOG(LogAirSim, Log, TEXT("%s"), *FString(message.c_str()));
+            UE_LOG(LogTemp, Log, TEXT("%s"), *FString(message.c_str()));
         }
 
 //#ifdef _MSC_VER
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,3 @@

		#include "CoreMinimal.h"

		DECLARE_STATS_GROUP(TEXT("AirSim"), STATGROUP_AirSim, STATCAT_Advanced);

		DECLARE_LOG_CATEGORY_EXTERN(LogAirSim, Log, All);