p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated function calls

This commit is contained in:
nsubiron 2018-02-20 14:59:20 +01:00
parent cea574be49
commit b7f420efce
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/CityMapGenerator.cpp
View File

@ -291,7 +291,7 @@ void ACityMapGenerator::GenerateRoadMap()
#endif // WITH_EDITOR
if (bSaveRoadMapToDisk) {
RoadMap->SaveAsPNG(FPaths::GameSavedDir(), World->GetMapName());
RoadMap->SaveAsPNG(FPaths::ProjectSavedDir(), World->GetMapName());
}
#if WITH_EDITOR

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/DynamicWeather.cpp
View File

@ -21,7 +21,7 @@ static FString GetIniFileName(const FString &MapName = TEXT(""))
static bool GetWeatherIniFilePath(const FString &FileName, FString &FilePath)
{
FilePath = FPaths::Combine(FPaths::GameConfigDir(), FileName);
FilePath = FPaths::Combine(FPaths::ProjectConfigDir(), FileName);
const bool bFileExists = FPaths::FileExists(FilePath);
if (!bFileExists) {
UE_LOG(LogCarla, Warning, TEXT("\"%s\" not found"), *FilePath);

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/SceneCaptureToDiskCamera.cpp
View File

@ -12,7 +12,7 @@
ASceneCaptureToDiskCamera::ASceneCaptureToDiskCamera(const FObjectInitializer& ObjectInitializer) :
Super(ObjectInitializer),
SaveToFolder(FPaths::Combine(FPaths::GameSavedDir(), "SceneCaptures")),
SaveToFolder(FPaths::Combine(FPaths::ProjectSavedDir(), "SceneCaptures")),
FileName("capture_%05d.png") {}
void ASceneCaptureToDiskCamera::BeginPlay()

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/CarlaSettings.cpp
View File

@ -145,7 +145,7 @@ void UCarlaSettings::LoadSettings()
{
CurrentFileName = TEXT("");
// Load settings from project Config folder if present.
LoadSettingsFromFile(FPaths::Combine(FPaths::GameConfigDir(), TEXT("CarlaSettings.ini")), false);
LoadSettingsFromFile(FPaths::Combine(FPaths::ProjectConfigDir(), TEXT("CarlaSettings.ini")), false);
// Load settings given by command-line arg if provided.
{
FString FilePath;