Последние доделки, перед первым релизом

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

@@ -26,6 +26,44 @@ function actor_binder:__init (obj) super(obj)
 	self.actor_detector = xr_detector.actor_detector()
 end
 ----------------------------------------------------------------------------------------------------------------------
+local function lc_question_add() --Ïåðåõîä "Ïðèïÿòü - ×ÀÝÑ" çàäà¸ò âîïðîñ î ñìåíå óðîâíÿ.
+	local sobj = alife():object("exit_to_stancia_01")
+	if sobj then
+		local lc = sobj:get_level_changer()
+		if lc.silent_mode ~= 0 then
+			lc.silent_mode = 0
+			log3( "~~[%s]: fixed ['exit_to_stancia_01']...", script_name() )
+		end
+	end
+end
+
+local function del_buggy_objects() --Óäàëåíèå èç èãðû ãëþ÷íûõ îáúåêòîâ
+	local names = {
+----Ðåñòðèêòîðû ïîñòîÿííûõ çâóêîâ ñòðåëüáû â Ïðèïÿòè----
+		"pri_ambient_battle_sound_zone_0000",
+		"pri_ambient_battle_sound_zone_0001",
+		"pri_ambient_battle_sound_zone_0002",
+		"pri_ambient_battle_sound_zone_0003",
+--------------------------------------------------------
+-----Ðåñòðèêòîðû ïîñòîÿííûõ çâóêîâ ñòðåëüáû íà ×ÀÝÑ-----
+		"aes_space_restrictor_sound_battle_0000",
+		"aes_space_restrictor_sound_battle_0001",
+--------------------------------------------------------
+		"sar_enter_zone", --Ðåñòðèêòîð, âîñïðîèçâîäÿùèé "çîâ Ìîíîëèòà" â Ñàðêîôàãå
+		"mil_physic_object_0127", --ãëþ÷íî çàñïàâíåííàÿ ìîäåëü àâòîìàòà íà ÀÑ
+--------------------------------------------------------
+		"rosros_cutscene", --Ðåñòðèêòîð, çàïóñêàþùèé îáëåò êàìåðû íà ÄÒ
+		"pri_zone_no_gravity", --Àíîìàëèÿ âûïîëíåíà î÷åíü êðèâî, èáî ìîæíî ïîäíÿòüñÿ è ïðîéòè ñâåðõó, òîëüêî ñ çàìåäëåíèåì, êàê ïî âîäå. Òàêîå îùóùåíèå, ÷òî ñòîèò ÷òî-òî íåâèäèìîå, è íà íåãî ìîæíî çàëåçòü è ïðîãóëÿòüñÿ. Ëó÷øå óáðàòü, âûãëÿäèò êàê áàã.
+	}
+	for _, n in ipairs( names ) do
+		local sobj = alife():object( n )
+		if sobj then
+			log3( "~~[%s]: found [%s], removing...", script_name(), sobj:name() )
+			alife():release(sobj, true)
+		end
+	end
+end
+
 function actor_binder:net_spawn(data)
 ------------KD: óñòàíîâêà íàñòðîåê ãðàôèêè------------
 	-- øìàïû
@@ -71,6 +109,9 @@ function actor_binder:net_spawn(data)
 	death_manager.init_drop_settings()
 
 	ogsr_memory_control.init()
+
+	lc_question_add()
+	del_buggy_objects()
 
 	return true
 end

Game/Resources_SoC_1.0006/start_x64.cmd

@@ -0,0 +1,2 @@
+cd .\bin_x64\
+start XR_3DA.exe -nointro -noprefetch -smap3072 -always_active

Game/Resources_SoC_1.0006/start_x86.cmd

@@ -0,0 +1,2 @@
+cd .\bin_x86\
+start XR_3DA.exe -nointro -noprefetch -smap3072 -always_active

appveyor.yml

@@ -1,10 +1,45 @@
 version: 1.0.{build}
+skip_tags: true
 image: Previous Visual Studio 2017
 configuration: Release
 platform:
 - x86
 - x64
+before_build:
+- cmd: >-
+    rem set OGSR_DEPLOY=true
+
+    copy /Y "ogsr_engine\build_config_defines.h" "ogsr_engine\hack.appveyor"
 build:
   project: Engine.sln
+  publish_wap: true
   parallel: true
   verbosity: minimal
+after_build:
+- cmd: >-
+    cd bin_%PLATFORM%
+
+    md ..\Game\Resources_SoC_1.0006\bin_%PLATFORM%
+
+    copy *.* ..\Game\Resources_SoC_1.0006\bin_%PLATFORM%
+
+
+    cd ..\Game\Resources_SoC_1.0006
+
+    7z a ..\..\OGSR_Engine_SHOC_EDITION_%PLATFORM%(%APPVEYOR_BUILD_VERSION%).7z .\
+
+
+    cd ..\..\
+
+    appveyor PushArtifact OGSR_Engine_SHOC_EDITION_%PLATFORM%(%APPVEYOR_BUILD_VERSION%).7z Release
+artifacts:
+- path: .\OGSR_Engine_SHOC_EDITION_$(platform)($(appveyor_build_version)).7z
+  name: Release
+deploy:
+- provider: GitHub
+  auth_token:
+    secure: eeav3SIAQE4q9s4J76hKDxnCZiZefvs2p3bZbYKHpIv5SKQqpUBKT0QkOGvd3FZ+
+  artifact: Release
+  force_update: true
+  on:
+    ogsr_deploy: true

ogsr_engine/build_config_defines.h

@@ -4,8 +4,13 @@
 
 //****************************************************************************************************
 // Сборка в режиме совместимости с вальнильным ТЧ. Выключает специфичные для ОГСЕ правки.
-// На будущее: можно определять этот дефайн через AppVeyor, когда надо.
 //#define SHOC_EDITION
+
+//Хак, чтобы AppVeyor собирал именно SHOC_EDITION
+#if __has_include("hack.appveyor")
+#	pragma message("[AppVeyor] Enabled SHOC_EDITION mode!")
+#	define SHOC_EDITION
+#endif
 //****************************************************************************************************
 
 // Если функция в precondition диалога не найдена, будем падать, вместо того,

ogsr_engine/xrGame/ui/UIWindow.cpp

@@ -468,25 +468,17 @@ bool CUIWindow::OnKeyboard(int dik, EUIMessages keyboard_action)
 
 bool CUIWindow::OnKeyboardHold(int dik)
 {
-	bool result;
+	if (m_pKeyboardCapturer)
+		if (m_pKeyboardCapturer->OnKeyboardHold(dik));
+			return true;
 
-	if(NULL!=m_pKeyboardCapturer)
+	for (auto it = m_ChildWndList.rbegin(); it != m_ChildWndList.rend(); ++it)
 	{
-		result = m_pKeyboardCapturer->OnKeyboardHold(dik);
-
-		if(result) return true;
-	}
-
-	WINDOW_LIST::reverse_iterator it = m_ChildWndList.rbegin();
-
-	for(; it!=m_ChildWndList.rend(); ++it)
-	{
-		if((*it)->IsEnabled())
-		{
-			result = (*it)->OnKeyboardHold(dik);
-
-			if(result)	return true;
-		}
+		auto wnd = (*it);
+		if (wnd)
+			if (wnd->IsEnabled())
+				if (wnd->OnKeyboardHold(dik))
+					return true;
 	}
 
 	return false;

ogsr_engine/xr_3da/ISpatial.cpp

@@ -311,11 +311,17 @@ void			ISpatial_DB::remove		(ISpatial* S)
 #ifdef DEBUG
 	stat_remove.Begin	();
 #endif
-	ISpatial_NODE* N	= S->spatial.node_ptr;
-	N->_remove			(S);
+	try {
+		ISpatial_NODE* N = S->spatial.node_ptr;
+		N->_remove(S);
 
-	// Recurse
-	if (N->_empty())					_remove(N->parent,N);
+		// Recurse
+		if (N->_empty())
+			_remove(N->parent, N);
+	}
+	catch (...) {
+		Log("!!Error in ISpatial_DB::remove");
+	}
 #ifdef DEBUG
 	stat_remove.End		();
 #endif

ogsr_engine/xr_3da/ISpatial_q_frustum.cpp

@@ -52,7 +52,7 @@ class	walker
 			}
 			catch (...) {
 				Msg("!![ISpatial_q_frustum.walk] error in children node ¹%u", octant);
-				N->children[octant] = nullptr; //Íå óâåðåí, ÷òî íàäî, ïîñìîòðèì.
+				//N->children[octant] = nullptr; //Íå óâåðåí, ÷òî íàäî, ïîñìîòðèì.
 				continue;
 			}
 		}