Merge from dev [skip ci]

.github/README.md

@@ -22,7 +22,6 @@
 ### [>>Latest release<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
 ### [Write here](https://github.com/OGSR/OGSR-Engine/issues) to report bugs ###
 ### [Write here](https://github.com/OGSR/OGSR-Engine/discussions) your suggestions, questions and everything else ###
-#### For the engine to work with the worldwide version of SoC, use the ` -steam` launch parameter ####
 
 ### Compilation guide: ###
 * Latest version of Visual Studio 2017 or 2019 or 2022 required
@@ -56,7 +55,6 @@ And everyone else whose work has been used. If you are not mentioned, send a mes
 ### [>>Свежий релиз<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
 ### Баги можно присылать [сюда](https://github.com/OGSR/OGSR-Engine/issues) ###
 ### Предложения, вопросы и тп можно писать [сюда](https://github.com/OGSR/OGSR-Engine/discussions) ###
-#### Для того, чтобы движок работал с WW-версией SHOC - используйте специальный ключ запуска ` -steam` ####
 
 ### Инструкции по сборке: ###
 * Требуется актуальная версия Visual Studio 2017 или 2019 или 2022

Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_mm.xml

@@ -581,6 +581,9 @@
 	<string id="ui_mm_small_font">
 		<text>Small font (requires restart)</text>
 	</string>
+	<string id="ui_mm_crosshair_hard">
+		<text>Realistic crosshair</text>
+	</string>
 	<!-- Controls menu -->
 	<string id="ui_mm_controls">
 		<text>Controls</text>

Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml

@@ -581,6 +581,9 @@
 	<string id="ui_mm_small_font">
 		<text>Óìåíüøåííûé øðèôò (òðåáóåòñÿ ïåðåçàïóñê èãðû)</text>
 	</string>
+	<string id="ui_mm_crosshair_hard">
+		<text>Ðåàëèñòè÷íûé ïðèöåë</text>
+	</string>
 	<!-- Îêíî "Óïðàâëåíèå" -->
 	<string id="ui_mm_controls">
 		<text>Óïðàâëåíèå</text>

Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml

@@ -700,6 +700,11 @@
 			<text font="letterica16" r="215" g="195" b="170">ui_mm_small_font</text>
 		</check_small_font>
 
+		<check_crosshair_hard x="20" y="305" width="243" height="21">
+			<options_item entry="hud_crosshair_hard" group="mm_opt_gameplay"/>
+			<text font="letterica16" r="215" g="195" b="170">ui_mm_crosshair_hard</text>
+		</check_crosshair_hard>
+
 	</tab_gameplay>
 	<tab_controls>
 		<cap_mousesens x="20" y="25" width="150" height="21">

Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_gameplay.script

@@ -25,5 +25,6 @@ function opt_gameplay:InitControls(x, y, xml)
 	xml:InitCheck("tab_gameplay:check_ammunition_on_belt", self)
 	xml:InitCheck("tab_gameplay:check_build_crosshair", self)
 	xml:InitCheck("tab_gameplay:check_small_font", self)
+	xml:InitCheck("tab_gameplay:check_crosshair_hard", self)
 	xml:InitComboBox("tab_gameplay:list_difficulty", self)
 end

ogsr_engine/Engine_lib_properties.props

@@ -13,7 +13,7 @@
       <ObjectFileName>$(SolutionDir)\ogsr_engine\_TEMP\Engine\$(Configuration)\$(Platform)\$(ProjectName)\</ObjectFileName>
       <ProgramDataBaseFileName>$(SolutionDir)\ogsr_engine\_TEMP\Engine\$(Configuration)\$(Platform)\$(ProjectName)\</ProgramDataBaseFileName>
       <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/source-charset:utf-8 /we4566 /we4828 /we4715 /we4189 /we4595 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/source-charset:utf-8 /we4566 /we4828 /we4715 /we4189 /we4595 /we4834 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <ImportLibrary>$(SolutionDir)\ogsr_engine\_LIB\Engine\$(Configuration)\$(Platform)\$(TargetName).lib</ImportLibrary>

ogsr_engine/Engine_properties.props

@@ -13,7 +13,7 @@
       <ObjectFileName>$(SolutionDir)\ogsr_engine\_TEMP\Engine\$(Configuration)\$(Platform)\$(ProjectName)\</ObjectFileName>
       <ProgramDataBaseFileName>$(SolutionDir)\ogsr_engine\_TEMP\Engine\$(Configuration)\$(Platform)\$(ProjectName)\</ProgramDataBaseFileName>
       <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/source-charset:utf-8 /we4566 /we4828 /we4715 /we4189 /we4595 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/source-charset:utf-8 /we4566 /we4828 /we4715 /we4189 /we4595 /we4834 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <ImportLibrary>$(SolutionDir)\ogsr_engine\_LIB\Engine\$(Configuration)\$(Platform)\$(TargetName).lib</ImportLibrary>

ogsr_engine/Layers/xrRender/R_DStreams.cpp

@@ -9,7 +9,7 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-int		rsDVB_Size = 16384; // 8192; //4096; //512+1024;
+int rsDVB_Size = 4096; //Fixed: (bytes_need<=mSize) && vl_Count
 int		rsDIB_Size			= 512;
 
 void _VertexStream::Create	()

ogsr_engine/Layers/xrRender/ResourceManager_Resources.cpp

@@ -185,7 +185,7 @@ SVS*	CResourceManager::_CreateVS		(LPCSTR _name)
 		//Msg("compiling shader: [%s], c_target: [%s], c_entry: [%s]", name, c_target, c_entry);
 		HRESULT const _hr		= ::Render->shader_compile( name, (DWORD const*)data, size, c_entry, c_target, D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_vs);
 
-		CHECK_OR_EXIT			(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);
@@ -252,7 +252,7 @@ SPS*	CResourceManager::_CreatePS			(LPCSTR name)
 		//Msg("compiling shader: [%s], c_target: [%s], c_entry: [%s]", name, c_target, c_entry);
 		HRESULT const _hr		= ::Render->shader_compile( name, (DWORD const*)data, size, c_entry, c_target, D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_ps);
 
-		CHECK_OR_EXIT		(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);
@@ -744,7 +744,7 @@ SVS*	CResourceManager::_CreateVS		(LPCSTR _name)
 		_RELEASE	(pErrorBuf);
 		pConstants	= NULL;
 
-		CHECK_OR_EXIT		(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);
@@ -849,7 +849,7 @@ SPS*	CResourceManager::_CreatePS			(LPCSTR name)
 		_RELEASE		(pErrorBuf);
 		pConstants		= NULL;
 
-		CHECK_OR_EXIT		(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);

ogsr_engine/Layers/xrRender/ShaderResourceTraits.h

@@ -116,7 +116,7 @@
 
 			VERIFY(SUCCEEDED(_hr));
 
-			CHECK_OR_EXIT				(
+			R_ASSERT(
 				!FAILED(_hr),
 				make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 			);

ogsr_engine/Layers/xrRender/SkeletonAnimated.cpp

@@ -696,7 +696,7 @@ void CKinematicsAnimated::Load(const char* N, IReader *data, u32 dwFlags)
 	}
 
 	if ( omfs.size() ) {
-	  R_ASSERT( omfs.size() < MAX_ANIM_SLOT );
+	  //R_ASSERT( omfs.size() < MAX_ANIM_SLOT );
 	  m_Motions.reserve( omfs.size() );
 	  for ( const auto& s : omfs ) {
 	    auto nm = s.c_str();

ogsr_engine/Layers/xrRender/light.h

@@ -118,6 +118,7 @@ class	light		:	public IRender_Light, public ISpatial
 	virtual void	set_rotation			(const Fvector& D, const Fvector& R);
 	virtual void	set_cone				(float angle);
 	virtual void	set_range				(float R);
+	float		get_range() const override { return range; };
 	virtual void set_virtual_size(float S) {
 #if RENDER != R_R1
 		virtual_size = (S > MIN_VIRTUAL_SIZE) ? S : MIN_VIRTUAL_SIZE;

ogsr_engine/Layers/xrRender/r__screenshot.cpp

@@ -157,7 +157,7 @@ void CRender::ScreenshotImpl	(ScreenshotMode mode, LPCSTR name, CMemoryWriter* m
 			break;
 		case IRender_interface::SM_NORMAL:
 			{
-				static const bool UsePNG = !!strstr(Core.Params, "-ss_png"), UseTGA = !!strstr(Core.Params, "-ss_tga");
+				static const bool UseTGA = !!strstr(Core.Params, "-ss_tga"), UsePNG = !strstr(Core.Params, "-ss_jpg") && !UseTGA;
 				string64 t_stemp;
 				string_path buf;
 				sprintf_s(buf, sizeof(buf), "ss_%s_%s_(%s).%s", Core.UserName, timestamp(t_stemp), g_pGameLevel ? g_pGameLevel->name().c_str() : "mainmenu", UsePNG ? "png" : UseTGA ? "bmp" : "jpg");
@@ -363,7 +363,7 @@ void CRender::ScreenshotImpl	(ScreenshotMode mode, LPCSTR name, CMemoryWriter* m
 			}break;
 		case IRender_interface::SM_NORMAL:
 			{
-				static const bool UsePNG = !!strstr(Core.Params, "-ss_png"), UseTGA = !!strstr(Core.Params, "-ss_tga");
+				static const bool UseTGA = !!strstr(Core.Params, "-ss_tga"), UsePNG = !strstr(Core.Params, "-ss_jpg") && !UseTGA;
 				string64 t_stemp;
 				string_path buf;
 				sprintf_s(buf, sizeof(buf), "ss_%s_%s_(%s).%s", Core.UserName, timestamp(t_stemp), g_pGameLevel ? g_pGameLevel->name().c_str() : "mainmenu", UsePNG ? "png" : UseTGA ? "tga" : "jpg");

ogsr_engine/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp

@@ -189,7 +189,7 @@ SVS*	CResourceManager::_CreateVS		(LPCSTR _name)
 
 		VERIFY(SUCCEEDED(_hr));
 
-		CHECK_OR_EXIT			(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);
@@ -283,7 +283,7 @@ SPS*	CResourceManager::_CreatePS			(LPCSTR _name)
 
 		VERIFY(SUCCEEDED(_hr));
 
-		CHECK_OR_EXIT		(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 			);
@@ -339,7 +339,7 @@ SGS*	CResourceManager::_CreateGS			(LPCSTR name)
 
 		FS.r_close				( file );
 
-		CHECK_OR_EXIT			(
+		R_ASSERT(
 			!FAILED(_hr),
 			make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 		);

ogsr_engine/Layers/xrRenderPC_R4/CSCompiler.cpp

@@ -201,7 +201,7 @@ void CSCompiler::compile(const char* name)
 
 	VERIFY(SUCCEEDED(_hr));
 
-	CHECK_OR_EXIT				(
+	R_ASSERT(
 		!FAILED(_hr),
 		make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
 	);

ogsr_engine/build_config_defines.h

@@ -3,9 +3,6 @@
 // скопировать этот файл в нее и изменить, как требуется.
 
 //***********************************[Настройки отладочных режимов]***********************************
-// Включает кастомное окно с сообщением об ошибках, выключает стандартное "Прекращена работа программы..."
-#define USE_OWN_ERROR_MESSAGE_WINDOW
-
 // Включает создание минидампов при вылетах
 #define USE_OWN_MINI_DUMP