* FIX: фиксов

BearIvan · BearIvan · commit 008dc3641831 · 2024-05-18T20:02:54.000+07:00
diff --git a/Content/Base/Materials/Function/StalkerBump.uasset b/Content/Base/Materials/Function/StalkerBump.uasset
diff --git a/Source/Stalker/Kernel/RBMK/Engine/RBMKDevice.cpp b/Source/Stalker/Kernel/RBMK/Engine/RBMKDevice.cpp
@@ -41,11 +41,12 @@ FRBMKDevice::~FRBMKDevice()
 {
 
 }
-
+#if !(UE_BUILD_SHIPPING||UE_BUILD_TEST)
 bool FRBMKDevice::IsEditorMode()
 {
 	return GIsEditor;
 }
+#endif
 
 bool FRBMKDevice::Paused() const
 {
diff --git a/Source/Stalker/Kernel/RBMK/Engine/RBMKDevice.h b/Source/Stalker/Kernel/RBMK/Engine/RBMKDevice.h
@@ -5,7 +5,9 @@ class FRBMKDevice :public XrDeviceInterface
 public:
 						FRBMKDevice		();
 						~FRBMKDevice	() override;
+#if !(UE_BUILD_SHIPPING||UE_BUILD_TEST)
 	bool				IsEditorMode	() override;
+#endif
 	bool				Paused			() const override;
 	void				Reset			(bool precache = false) override;
 	void				Pause			(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason) override;
diff --git a/Source/Stalker/Kernel/RBMK/Render/Interface/WallMark/XRayWallMarkArray.cpp b/Source/Stalker/Kernel/RBMK/Render/Interface/WallMark/XRayWallMarkArray.cpp
@@ -1,6 +1,7 @@
 #include "XRayWallMarkArray.h"
-
+#if !(UE_BUILD_SHIPPING||UE_BUILD_TEST)
 FACTORY_PTR_INSTANCIATE(UIShader)
+#endif
 XRayWallMarkArray::XRayWallMarkArray()
 {
 }
diff --git a/Source/Stalker/Kernel/RBMK/Render/Interface/XRayRenderInterface.cpp b/Source/Stalker/Kernel/RBMK/Render/Interface/XRayRenderInterface.cpp
@@ -1,6 +1,8 @@
 #include "XRayRenderInterface.h"
 
+#if WITH_EDITOR
 #include "IDetailTreeNode.h"
+#endif
 #include "XRayRenderTarget.h"
 #include "../../../StalkerEngineManager.h"
 #include "Resources/StalkerResourcesManager.h"
@@ -183,7 +185,10 @@ void XRayRenderInterface::SpawnStaticDecal(const shared_str& InTextureName, cons
 		FQuat Rotation = FQuat(StalkerMath::RBMKNormalToUnreal(Normal).ToOrientationQuat())*FRotator(-90,0,0).Quaternion();
 		Rotation = Rotation*FRotator(0,FMath::FRandRange(0.f,360.f),0).Quaternion();
 		ADecalActor* DecalActor = GWorld->SpawnActor<ADecalActor>(FVector(StalkerMath::RBMKLocationToUnreal(Point)), Rotation.Rotator(),SpawnParameters);
+		
+#if WITH_EDITOR
 		DecalActor->SetFolderPath(TEXT("Decals"));
+#endif
 		DecalActor->GetDecal()->DecalSize = FVector(Size*12.5f,Size*75,Size*75);
 		{
 			UMaterialInstanceDynamic*Material = UKismetMaterialLibrary::CreateDynamicMaterialInstance(GWorld,GetDefault<UStalkerGameSettings>()->DefaultDecalMaterial.LoadSynchronous(),NAME_None,EMIDCreationFlags::Transient);
@@ -219,7 +224,10 @@ void XRayRenderInterface::SpawnSkeletalDecal(const IRenderVisual* InObject, cons
 				FQuat Rotation = FQuat(HitResult.Normal.ToOrientationQuat())*FRotator(-90,0,0).Quaternion();
 				Rotation = Rotation*FRotator(0,FMath::FRandRange(0.f,360.f),0).Quaternion();
 				ADecalActor* DecalActor = GWorld->SpawnActor<ADecalActor>(HitResult.Location, Rotation.Rotator(),SpawnParameters);
+				
+#if WITH_EDITOR
 				DecalActor->SetFolderPath(TEXT("Decals"));
+#endif
 				DecalActor->GetDecal()->DecalSize = FVector(Size*50.f,Size*50,Size*50);
 				{
 					UMaterialInstanceDynamic*Material = UKismetMaterialLibrary::CreateDynamicMaterialInstance(GWorld,GetDefault<UStalkerGameSettings>()->DefaultDecalMaterial.LoadSynchronous(),NAME_None,EMIDCreationFlags::Transient);
diff --git a/Source/Stalker/Kernel/StalkerEngineManager.cpp b/Source/Stalker/Kernel/StalkerEngineManager.cpp
@@ -32,6 +32,21 @@ static FRBMKMemory	GXRayMemory;
 static FRBMKLog	GXRayLog;
 static FRBMKDebug	GXRayDebug;
 
+#if UE_BUILD_SHIPPING||UE_BUILD_TEST
+void*xr_malloc	(size_t size)
+{
+	return FMemory::Malloc(size);
+}
+void	xr_mfree		(void*P)
+{
+	return FMemory::Free(P);
+}
+void*xr_realloc	(void* P, size_t size)
+{
+	return FMemory::Realloc(P,size);
+}
+#endif
+
 FStalkerEngineManager::FStalkerEngineManager()
 {
 
@@ -601,7 +616,7 @@ void FStalkerEngineManager::OnPostLoadMap(UWorld* World)
 	{
 		FSoftObjectPath CurrentPostLoadWorldPath = UWorld::RemovePIEPrefix(*World->GetPathName());
 		check(CurrentPostLoadWorldPath == CurrentWorldPath);
-#if !UE_BUILD_SHIPPING
+#if !(UE_BUILD_SHIPPING||UE_BUILD_TEST)
 		if (!CheckCurrentWorld())
 		{
 			CurrentWorldName.Empty();
diff --git a/Source/Stalker/Kernel/Unreal/HUD/StalkerHUD.cpp b/Source/Stalker/Kernel/Unreal/HUD/StalkerHUD.cpp
@@ -6,7 +6,7 @@ THIRD_PARTY_INCLUDES_START
 #include "XrEngine/CustomHUD.h"
 #include "XrEngine/IGame_Level.h"
 THIRD_PARTY_INCLUDES_END
-ENGINE_API BOOL g_bRendering;
+extern ENGINE_API  BOOL g_bRendering;
 
 AStalkerHUD::AStalkerHUD()
 {
diff --git a/Source/Stalker/Resources/AIMap/StalkerAIMap.cpp b/Source/Stalker/Resources/AIMap/StalkerAIMap.cpp
@@ -85,13 +85,15 @@ void UStalkerAIMap::Serialize(FArchive& Ar)
 void UStalkerAIMap::PostInitProperties()
 {
 	Super::PostInitProperties();
+#if WITH_EDITOR
 	NodesHash.SetNum(NodesHashSize+1);
 	NodesHashSelected.SetNum(NodesHashSize+1);
 	for(int32 i = 0;i<=NodesHashSize;i++)
 	{
 		NodesHash[i].SetNum(NodesHashSize+1);
 		NodesHashSelected[i].SetNum(NodesHashSize+1);
 	}
+#endif
 }
 
 
diff --git a/Source/StalkerLoading/Private/StalkerLoading.cpp b/Source/StalkerLoading/Private/StalkerLoading.cpp
@@ -7,7 +7,7 @@
 
 void FStalkerLoadingModule::StartupModule()
 {
-	if (!IsRunningDedicatedServer())
+	if (!IsRunningDedicatedServer()&&IsRunningGame())
 	{
 		FLoadingScreenAttributes LoadingScreen;
 		LoadingScreen.WidgetLoadingScreen = SNew(SStalkerStartupScreen);
diff --git a/Source/XRayEngine b/Source/XRayEngine
@@ -1 +1 @@
-Subproject commit c28b7ff9d01d7da6b28368eae636bec15196b10c
+Subproject commit 14e4b2b21040f06afbfa2037d49a7ea5593fac3c

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ FRBMKDevice::~FRBMKDevice()`
`41`	`41`	`{`
`42`	`42`
`43`	`43`	`}`
`44`		`-`
	`44`	`+#if !(UE_BUILD_SHIPPING\|\|UE_BUILD_TEST)`
`45`	`45`	`bool FRBMKDevice::IsEditorMode()`
`46`	`46`	`{`
`47`	`47`	`return GIsEditor;`
`48`	`48`	`}`
	`49`	`+#endif`
`49`	`50`
`50`	`51`	`bool FRBMKDevice::Paused() const`
`51`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "XRayWallMarkArray.h"`
`2`		`-`
	`2`	`+#if !(UE_BUILD_SHIPPING\|\|UE_BUILD_TEST)`
`3`	`3`	`FACTORY_PTR_INSTANCIATE(UIShader)`
	`4`	`+#endif`
`4`	`5`	`XRayWallMarkArray::XRayWallMarkArray()`
`5`	`6`	`{`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ THIRD_PARTY_INCLUDES_START`
`6`	`6`	`#include "XrEngine/CustomHUD.h"`
`7`	`7`	`#include "XrEngine/IGame_Level.h"`
`8`	`8`	`THIRD_PARTY_INCLUDES_END`
`9`		`-ENGINE_API BOOL g_bRendering;`
	`9`	`+extern ENGINE_API BOOL g_bRendering;`
`10`	`10`
`11`	`11`	`AStalkerHUD::AStalkerHUD()`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,15 @@ void UStalkerAIMap::Serialize(FArchive& Ar)`
`85`	`85`	`void UStalkerAIMap::PostInitProperties()`
`86`	`86`	`{`
`87`	`87`	`Super::PostInitProperties();`
	`88`	`+#if WITH_EDITOR`
`88`	`89`	`NodesHash.SetNum(NodesHashSize+1);`
`89`	`90`	`NodesHashSelected.SetNum(NodesHashSize+1);`
`90`	`91`	`for(int32 i = 0;i<=NodesHashSize;i++)`
`91`	`92`	`{`
`92`	`93`	`NodesHash[i].SetNum(NodesHashSize+1);`
`93`	`94`	`NodesHashSelected[i].SetNum(NodesHashSize+1);`
`94`	`95`	`}`
	`96`	`+#endif`
`95`	`97`	`}`
`96`	`98`
`97`	`99`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`void FStalkerLoadingModule::StartupModule()`
`9`	`9`	`{`
`10`		`- if (!IsRunningDedicatedServer())`
	`10`	`+ if (!IsRunningDedicatedServer()&&IsRunningGame())`
`11`	`11`	`{`
`12`	`12`	`FLoadingScreenAttributes LoadingScreen;`
`13`	`13`	`LoadingScreen.WidgetLoadingScreen = SNew(SStalkerStartupScreen);`