Fixed CFFCrosshairOptions::UpdateSliders assert and did some cleanup #89
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -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); | |||
There was a problem hiding this comment.
this iCurrentWeapon is a bit confusing now - is this actually currentCrosshair ?
There was a problem hiding this comment.
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.
|
Minor suggestion otherwise all good 👍 |
squeek502
added a commit
that referenced
this pull request
Dec 15, 2014
Fixed CFFCrosshairOptions::UpdateSliders assert and did some cleanup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.