[ioquake3] 03/12: Fix -1 (unlimited) ammo decreasing ammo time remaining

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag debian/1.36+u20171122_dfsg-1
in repository ioquake3.

commit 4af2c91fbfd0b9032b89aca17a3553216256dfe1
Author: Zack Middleton <zack at cloemail.com>
Date:   Fri Nov 10 20:28:50 2017 -0600

    Fix -1 (unlimited) ammo decreasing ammo time remaining
    
    Gauntlet and Grappling Hook use -1 ammo. Gauntlet is excluded from
    the check ammo loop but Grappling Hook causes ammo time remaining
    to decrease 200 milliseconds.
    
    The out of ammo check tests time remaining is equal to zero. This
    means carrying Grappling Hook and out of ammo will have negative
    time remaining which results in the low ammo message being displayed
    instead of out of ammo.
---
 code/cgame/cg_playerstate.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/cgame/cg_playerstate.c b/code/cgame/cg_playerstate.c
index c696a91..fa79bcb 100644
--- a/code/cgame/cg_playerstate.c
+++ b/code/cgame/cg_playerstate.c
@@ -47,6 +47,9 @@ void CG_CheckAmmo( void ) {
 		if ( ! ( weapons & ( 1 << i ) ) ) {
 			continue;
 		}
+		if ( cg.cur_ps->ammo[i] < 0 ) {
+			continue;
+		}
 		switch ( i ) {
 		case WP_ROCKET_LAUNCHER:
 		case WP_GRENADE_LAUNCHER:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git