Merge branch 'all-in-one-vs2022' into all-in-one-vs2022-wpo

README.md

@@ -184,6 +184,9 @@ How to compile exes:
 6. For successful compilation, **the latest build tools with MFC and ATL libraries is required**
 
 ## Changelog
+**2024.12.11**
+* Fix of "Fail to detach scope from some weapons" (https://github.com/themrdemonized/xray-monolith/issues/114)
+
 **2024.12.10**
 * momopate (https://github.com/themrdemonized/xray-monolith/pull/112):
   * Added console commands:

src/xrGame/Weapon.cpp

@@ -68,6 +68,11 @@ float CWeapon::SDS_Radius(bool alt) {
 		else
 		{
 			scope_tex_name = alt ? m_secondary_scope_tex_name : m_primary_scope_tex_name;
+
+			// demonized: ugly hack to fix stuck scope texture on old scopes system
+			if (!READ_IF_EXISTS(pSettings, r_string, cNameSect(), "scope_texture", NULL)) {
+				scope_tex_name = NULL;
+			}
 		}
 
 		if (scope_tex_name != 0) {
@@ -369,6 +374,11 @@ void CWeapon::UpdateUIScope()
 				m_primary_scope_tex_name = READ_IF_EXISTS(pSettings, r_string, cNameSect(), "scope_texture", NULL);
 			}
 			scope_tex_name = m_primary_scope_tex_name;
+
+			// demonized: ugly hack to fix stuck scope texture on old scopes system
+			if (!READ_IF_EXISTS(pSettings, r_string, cNameSect(), "scope_texture", NULL)) {
+				scope_tex_name = NULL;
+			}
 		}
 	}
 	else if (m_zoomtype == 1)