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.

Sign up for GitHub

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

Fix Issue #173 - Fix Bow Sustained Firing #174

Open
wants to merge 9 commits into
base: barony-next
Choose a base branch
from
Open

Fix Issue #173 - Fix Bow Sustained Firing #174

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c76e21e
Merge pull request #5 from TurningWheel/barony-next
Aug 13, 2017
bd92840
Merge remote-tracking branch 'main/barony-next' into barony-next
Aug 15, 2017
b0b0399
Merge pull request #6 from TurningWheel/barony-next
Aug 18, 2017
b1a307a
Merge pull request #7 from TurningWheel/barony-next
Aug 23, 2017
689a19f
Merge pull request #28 from TurningWheel/barony-next
Aug 27, 2017
ec562e8
- Removed redundant check to 'entity->defending'
Aug 27, 2017
437808f
* Changed assignment of 'throwGimpTimer' to be a whole number
Aug 27, 2017
3e4a6f3
+ Nullified 'bowDrawingSound' after firing to prevent undefined behavior
Aug 28, 2017
25853f1
* Fixed formatting (spaces -> tabs)
Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/acthudweapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,17 +463,18 @@ void actHudWeapon(Entity* my)
{
if ( stats[clientnum]->weapon->type == SLING || stats[clientnum]->weapon->type == SHORTBOW || stats[clientnum]->weapon->type == ARTIFACT_BOW )
{
if ( !stats[clientnum]->defending && !throwGimpTimer )
if ( throwGimpTimer == 0 )
{
// bows need to be drawn back
if (!bowDrawingSoundPlaying)
// Bows need to be drawn back
if ( !bowDrawingSoundPlaying )
{
if (bowFire)
if ( bowFire )
{
bowFire = false;
bowDrawingSound = nullptr;
players[clientnum]->entity->attack(0, 0, nullptr);
HUDWEAPON_MOVEX = 3;
throwGimpTimer = TICKS_PER_SECOND / 4;
throwGimpTimer = 12; // Was TICKS_PER_SECOND / 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason for this change? Having it defined as "a quarter of a second" seems better than having it defined as "12 ticks", which would change firing behaviour if the tick rate is changed.

}
else
{
Expand Down