Reapply "Launchers: Cartridge Ammo + Trajectory and Reload Options" #326
Merged
themrdemonized merged 2 commits intothemrdemonized:landerfrom Aug 11, 2025
Merged
Conversation
ProfLander
force-pushed
the
shotgun-launchers
branch
3 times, most recently
from
dcf6dbb to
1973ca5
Compare
This reverts commit c172117. 2197a168bbd700f64df0fbcb5f0139a289a39102 Replace `smart_cast` with fast_dynamic_cast library
ProfLander
force-pushed
the
shotgun-launchers
branch
from
1973ca5 to
79f0911
Compare
Contributor
Author
|
Removed some CMake leftovers from the commit log; should be good now. |
themrdemonized
added a commit
that referenced
this pull request
Jan 24, 2026
Reapply "Launchers: Cartridge Ammo + Trajectory and Reload Options"
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes the M79 / RG6 bugs introduced in the original PR.
Summary of bug
CWeaponMagazinedWGrenade's ammo decrement intoCWeaponGrenadeLauncher, causing it to apply toCWeaponRG6, which already defers toCWeaponShotgunfor that functionality