Fix map wnd for CS

Author: St4lker0k765

gamedata/configs/ixray_settings/default_controls.ltx

@@ -154,4 +154,4 @@ bind_gamepad pda_tasks_filter_toggle cA
 bind_gamepad llookout cLB
 bind_gamepad rlookout cRB
 bind_gamepad wpn_zoom_inc cDPAD_UP
-bind_gamepad wpn_zoom_inc cDPAD_DOWN
+bind_gamepad wpn_zoom_dec cDPAD_DOWN

gamedata/configs/text/eng/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Spot filters</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Show main task</text>
+	</string>
 </string_table>

gamedata/configs/text/rus/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Ôèëüòð ìåòîê</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Ïîêàçàòü ãëàâíîå çàäàíèå</text>
+	</string>
 </string_table>

gamedata_cs/configs/ixray_settings/default_controls.ltx

@@ -154,4 +154,4 @@ bind_gamepad pda_tasks_filter_toggle cA
 bind_gamepad llookout cLB
 bind_gamepad rlookout cRB
 bind_gamepad wpn_zoom_inc cDPAD_UP
-bind_gamepad wpn_zoom_inc cDPAD_DOWN
+bind_gamepad wpn_zoom_dec cDPAD_DOWN

gamedata_cs/configs/text/eng/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Spot filters</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Show main task</text>
+	</string>
 </string_table>

gamedata_cs/configs/text/rus/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Ôèëüòð ìåòîê</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Ïîêàçàòü ãëàâíîå çàäàíèå</text>
+	</string>
 </string_table>

gamedata_cs/scripts/_g.script

@@ -946,38 +946,53 @@ end
 
 
 -------------------------------------------------------------------------------------------
+function get_object_community(obj)
+	if type(obj.id) == "function" then
+		return character_community(obj)
+	else
+		return alife_character_community(obj)
+	end
+end
+
+function character_community (obj)
+	if IsStalker(obj) then
+		return obj:character_community()
+	end
+	return "monster"
+end
+
+function alife_character_community (obj)
+	if IsStalker(obj, obj:clsid()) then
+		return obj:community()
+	end
+	return "monster"
+end
+
+-- получить геймобжект по стори_айди.
 function level_object_by_sid( sid )
 	local sim = alife()
-
 	if sim then
 		local se_obj = sim:story_object( sid )
 		if se_obj then
 			return level.object_by_id( se_obj.id )
 		end
 	end
-
 	return nil
 end
-
+-- Получить айдишник обьекта по стори айди.
 function id_by_sid( sid )
 	local sim = alife()
-
 	if sim then
 		local se_obj = sim:story_object( sid )
 		if se_obj then
 			return se_obj.id
 		end
 	end
-
 	return nil
 end
 
 -- Крешнуть игру (после вывода сообщения об ошибке в лог)
 function abort(fmt, ...)
-	local reason = string.format(fmt, ...)
-	assert("ERROR: " .. reason)
-	error_log("ERROR: " .. reason)
-	log(string.format("%s",nil))
 end
 
 function set_postprocess(name_ini_file)

gamedata_soc/configs/text/eng/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Spot filters</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Show main task</text>
+	</string>
 </string_table>

gamedata_soc/configs/text/rus/ui_st_ixray.xml

@@ -669,4 +669,7 @@
 	<string id="ui_tasks_filter_next">
 		<text>$$ACTION_pda_tasks_filter_prev$$/$$ACTION_pda_tasks_filter_next$$ Ôèëüòð ìåòîê</text>
 	</string>
+	<string id="ui_tasks_show_on_map_main">
+		<text>$$ACTION_pda_tasks_filter_toggle$$ Ïîêàçàòü ãëàâíîå çàäàíèå</text>
+	</string>
 </string_table>

src/xrGame/ui/UIMapWnd.cpp

@@ -856,8 +856,9 @@ void CUIMapWnd::UpdateControllerCursor()
 		{
 			levelFrameParent = m_UIMainFrame;
 		}
-		cursorPos.add(levelFrameParent->GetWndPos());
-		cursorPos.add(m_UILevelFrame->GetWndPos());
+		Fvector2 absolutePos;
+		m_UILevelFrame->GetAbsolutePos(absolutePos);
+		cursorPos.add(absolutePos);
 		cursorPos.add(Fvector2().set(m_controller_cursor->GetWidth() / 2, m_controller_cursor->GetHeight() / 2));
 		GetUICursor().SetUICursorPosition(cursorPos);
 	}