[BUG_fix] : zoom didn't save at dynamic zoom scopes with disabled pip…

… mode
mortany · May 26, 2022 · 6796f24 · 6796f24
1 parent 9f084d7
commit 6796f24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
@@ -1601,19 +1601,10 @@ void CWeapon::HUD_VisualBulletUpdate(bool force, int force_idx)
 	if (!bHasBulletsToHide) 
 		return;
 
-	/*if (m_pInventory->ModifyFrame() <= m_BriefInfo_CalcFrame)
-	{
-		return;
-	}*/
-
 	if (!GetHUDmode())	return;
 
-	//return;
-
 	bool hide = true;
 
-	Msg("Print %d bullets", last_hide_bullet);
-
 	if (last_hide_bullet == bullet_cnt || force) hide = false;
 
 	for (u8 b = 0; b < bullet_cnt; b++)
@@ -1768,12 +1759,13 @@ void CWeapon::OnZoomIn()
 	m_zoom_params.m_bIsZoomModeNow = true;
 	psActorFlags.set(AF_ZOOM_NEW_FD, true);
 
-	if (m_fSecondRTZoomFactor == -1)
+	if (m_fSecondRTZoomFactor == -1 && bIsSecondVPZoomPresent())
 		ZoomDynamicMod(true, true);
 
 	if (!m_zoom_params.m_bUseDynamicZoom)
 		SetZoomFactor(CurrentZoomFactor());
-	else SetZoomFactor(psActorFlags.test(AF_3DSCOPE_ENABLE) ? m_zoom_params.m_f3dZoomFactor : m_fRTZoomFactor);
+	else 
+		SetZoomFactor(psActorFlags.test(AF_3DSCOPE_ENABLE) && bIsSecondVPZoomPresent() ? m_zoom_params.m_f3dZoomFactor : m_fRTZoomFactor);
 
 	// Отключаем инерцию (Заменено GetInertionFactor())
 	// EnableHudInertion(FALSE);
@@ -1811,7 +1803,7 @@ void CWeapon::OnZoomIn()
 
 void CWeapon::OnZoomOut()
 {
-	if (!bIsSecondVPZoomPresent() && !psActorFlags.test(AF_3DSCOPE_ENABLE))
+	if (!bIsSecondVPZoomPresent() && psActorFlags.test(AF_3DSCOPE_ENABLE))
 		m_fRTZoomFactor = GetZoomFactor(); // Сохраняем текущий динамический зум
 	m_zoom_params.m_bIsZoomModeNow = false;
 	SetZoomFactor(g_fov);

diff --git a/src/xrGame/Weapon.h b/src/xrGame/Weapon.h
@@ -56,7 +56,7 @@ class CWeapon : public CHudItemObject,
 	void			Load3DScopeParams(LPCSTR section);
 	void			LoadOriginalScopesParams(LPCSTR section);
 	void			LoadCurrentScopeParams(LPCSTR section);
-	void			GetZoomData(const float scope_factor, float& delta, float& min_zoom_factor);
+	virtual void	GetZoomData(const float scope_factor, float& delta, float& min_zoom_factor);
 	void			ZoomDynamicMod(bool bIncrement, bool bForceLimit);
 	void			UpdateAltScope();