Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed CFFCrosshairOptions::UpdateSliders assert and did some cleanup #89

Merged
merged 2 commits into from Dec 15, 2014

Conversation

Projects
None yet
2 participants
@squeek502
Copy link
Member

commented Dec 9, 2014

No description provided.

@@ -520,7 +523,7 @@ void CFFCrosshairOptions::UpdateCrosshairs()
void CFFCrosshairOptions::UpdateSliders()
{
int iCurrentWeapon = m_pWeapon->GetActiveItem();
Assert(iCurrentWeapon >= 0 && iCurrentWeapon <= FF_WEAPON_TOMMYGUN);
Assert(iCurrentWeapon >= 0 && iCurrentWeapon <= FF_HIT_CROSSHAIR);

This comment has been minimized.

Copy link
@AfterShockFF

AfterShockFF Dec 10, 2014

Member

this iCurrentWeapon is a bit confusing now - is this actually currentCrosshair ?

This comment has been minimized.

Copy link
@squeek502

squeek502 Dec 10, 2014

Author Member

That m_pWeapon and iCurrentWeapon has always been incorrectly named, as 0 is actually the Global crosshair. I'll do another pass to clean it up some more.

@AfterShockFF

This comment has been minimized.

Copy link
Member

commented Dec 10, 2014

Minor suggestion otherwise all good 👍

squeek502 added a commit that referenced this pull request Dec 15, 2014

Merge pull request #89 from fortressforever/fixes/xhair-option-assert
Fixed CFFCrosshairOptions::UpdateSliders assert and did some cleanup

@squeek502 squeek502 merged commit 800274d into beta Dec 15, 2014

@squeek502 squeek502 removed the needs review label Dec 15, 2014

@squeek502 squeek502 deleted the fixes/xhair-option-assert branch Dec 15, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.