is_16_9_mode --> is_widescreen [skip ci]

Author: xrSimpodin

ogsr_engine/xrGame/UICustomItem.cpp

@@ -117,8 +117,8 @@ void CUICustomItem::Render(const Fvector2& pos_ns, u32 color, float angle)
 	LTt.set								(iOriginalRect.x1/ts.x+hp.x, iOriginalRect.y1/ts.y+hp.y);
 	RBt.set								(iOriginalRect.x2/ts.x+hp.x, iOriginalRect.y2/ts.y+hp.y);
 
-//	float kx = (UI()->is_16_9_mode())?0.8333f: 1.0f;
-	float kx = UI()->is_16_9_mode() ? UI()->get_current_kx() : 1.0f;
+//	float kx = (UI()->is_widescreen())?0.8333f: 1.0f;
+	float kx = UI()->is_widescreen() ? UI()->get_current_kx() : 1.0f;
 	// clip poly
 	sPoly2D			S; S.resize(4);
 	// LT

ogsr_engine/xrGame/ui/UIGameTutorialVideoItem.cpp

@@ -71,7 +71,7 @@ void CUISequenceVideoItem::Load(CUIXml* xml, int idx)
 		m_wnd->SetAlignment								(waCenter);
 		Frect texture_coords							= m_wnd->GetUIStaticItem().GetOriginalRect();
 
-		bool is_16_9									= UI()->is_16_9_mode();
+		bool is_16_9									= UI()->is_widescreen();
 		float kw_image									= UI_BASE_WIDTH / texture_coords.width();
 
 		Fvector2										wnd_size;

ogsr_engine/xrGame/ui/UIMMShniaga.cpp

@@ -107,7 +107,7 @@ void CUIMMShniaga::Init(CUIXml& xml_doc, LPCSTR path)
 
 void CUIMMShniaga::OnDeviceReset()
 {
-	if(UI()->is_16_9_mode())
+	if(UI()->is_widescreen())
 	{
 		m_anims[0]->SetWndSize(m_wheel_size[1]);
 		m_anims[1]->SetWndSize(m_wheel_size[1]);

ogsr_engine/xrGame/ui_base.cpp

@@ -264,15 +264,10 @@ void ui_core::RenderFont()
 	Font()->Render();
 }
 
-bool ui_core::is_16_9_mode()
-{
-	return float(Device.dwWidth) / float(Device.dwHeight) > (UI_BASE_WIDTH / UI_BASE_HEIGHT + 0.01f);
-}
-
 shared_str	ui_core::get_xml_name(LPCSTR fn)
 {
 	string_path				str;
-	if(!is_16_9_mode()){
+	if(!is_widescreen()){
 		sprintf_s(str, "%s", fn);
 		if ( NULL==strext(fn) ) strcat_s(str, ".xml");
 	}else{
@@ -300,5 +295,5 @@ shared_str	ui_core::get_xml_name(LPCSTR fn)
 
 bool ui_core::is_widescreen()
 {
-	return (Device.dwWidth) / float(Device.dwHeight) > (UI_BASE_WIDTH / UI_BASE_HEIGHT + 0.01f);
+	return float(Device.dwWidth) / float(Device.dwHeight) > (UI_BASE_WIDTH / UI_BASE_HEIGHT + 0.01f);
 }

ogsr_engine/xrGame/ui_base.h

@@ -82,7 +82,6 @@ class ui_core: public CDeviceResetNotifier
 	void			RenderFont						();
 
 	virtual void	OnDeviceReset					();
-	static	bool	is_16_9_mode					();
 	shared_str		get_xml_name					(LPCSTR fn);
 	float			get_current_kx					();