Skip to content

Commit 3b4225f

Browse files
Fix flamethrower compilation -> "Add all new game object classes from fork"
1 parent 8e7a015 commit 3b4225f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/xrGame/Flamethrower.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,27 +1606,27 @@ bool CFlamethrower::install_upgrade_impl(LPCSTR section, bool test)
16061606
LPCSTR str;
16071607

16081608
// sounds (name of the sound, volume (0.0 - 1.0), delay (sec))
1609-
bool result2 = process_if_exists_set(section, "snd_draw", &CInifile::r_string, str, test);
1609+
bool result2 = process_if_exists_set(section, "snd_draw", str, test);
16101610
if (result2 && !test) { m_sounds.LoadSound(section, "snd_draw", "sndShow", false, m_eSoundShow); }
16111611
result |= result2;
16121612

1613-
result2 = process_if_exists_set(section, "snd_holster", &CInifile::r_string, str, test);
1613+
result2 = process_if_exists_set(section, "snd_holster", str, test);
16141614
if (result2 && !test) { m_sounds.LoadSound(section, "snd_holster", "sndHide", false, m_eSoundHide); }
16151615
result |= result2;
16161616

1617-
result2 = process_if_exists_set(section, "snd_shoot", &CInifile::r_string, str, test);
1617+
result2 = process_if_exists_set(section, "snd_shoot", str, test);
16181618
if (result2 && !test) { m_sounds.LoadSound(section, "snd_shoot", "sndShot", false, m_eSoundShot); }
16191619
result |= result2;
16201620

1621-
result2 = process_if_exists_set(section, "snd_empty", &CInifile::r_string, str, test);
1621+
result2 = process_if_exists_set(section, "snd_empty", str, test);
16221622
if (result2 && !test) { m_sounds.LoadSound(section, "snd_empty", "sndEmptyClick", false, m_eSoundEmptyClick); }
16231623
result |= result2;
16241624

1625-
result2 = process_if_exists_set(section, "snd_reload", &CInifile::r_string, str, test);
1625+
result2 = process_if_exists_set(section, "snd_reload", str, test);
16261626
if (result2 && !test) { m_sounds.LoadSound(section, "snd_reload", "sndReload", true, m_eSoundReload); }
16271627
result |= result2;
16281628

1629-
result2 = process_if_exists_set(section, "snd_reflect", &CInifile::r_string, str, test);
1629+
result2 = process_if_exists_set(section, "snd_reflect", str, test);
16301630
if (result2 && !test) { m_sounds.LoadSound(section, "snd_reflect", "sndReflect", false, m_eSoundReflect); }
16311631
result |= result2;
16321632

@@ -1635,20 +1635,20 @@ bool CFlamethrower::install_upgrade_impl(LPCSTR section, bool test)
16351635
//snd_shoot3 = weapons\ak74u_shot_3 ??
16361636

16371637
// fov for zoom mode
1638-
result |= process_if_exists(section, "ironsight_zoom_factor", &CInifile::r_float, m_zoom_params.m_fIronSightZoomFactor, test);
1638+
result |= process_if_exists(section, "ironsight_zoom_factor", m_zoom_params.m_fIronSightZoomFactor, test);
16391639

16401640
if (IsScopeAttached())
16411641
{
16421642
//if ( m_eScopeStatus == ALife::eAddonAttachable )
16431643
{
1644-
result |= process_if_exists(section, "scope_zoom_factor", &CInifile::r_float, m_zoom_params.m_fScopeZoomFactor, test);
1644+
result |= process_if_exists(section, "scope_zoom_factor", m_zoom_params.m_fScopeZoomFactor, test);
16451645
}
16461646
}
16471647
else
16481648
{
16491649
if (IsZoomEnabled())
16501650
{
1651-
result |= process_if_exists(section, "scope_zoom_factor", &CInifile::r_float, m_zoom_params.m_fIronSightZoomFactor, test);
1651+
result |= process_if_exists(section, "scope_zoom_factor", m_zoom_params.m_fIronSightZoomFactor, test);
16521652
}
16531653
}
16541654

@@ -1670,7 +1670,7 @@ void CFlamethrower::FireBullet(const Fvector& pos,
16701670
bool CFlamethrower::WeaponSoundExist(LPCSTR section, LPCSTR sound_name, bool log) const
16711671
{
16721672
pcstr str;
1673-
bool sec_exist = process_if_exists_set(section, sound_name, &CInifile::r_string, str, true);
1673+
bool sec_exist = process_if_exists_set(section, sound_name, str, true);
16741674
if (sec_exist)
16751675
return true;
16761676
#ifdef DEBUG

0 commit comments

Comments
 (0)