*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@632 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2006-11-12 23:43:10 +00:00
parent ab21d4463d
commit f0561ed7f7
2 changed files with 3 additions and 3 deletions
@@ -613,7 +613,7 @@ void shoot(playerent *d, vec &targ)
 		d->lastaction = lastmillis;
 		d->lastattackgun = d->gunselect;

-		if(!hasammo(d)) { d->shots = 0; return; };
+		if(d->gunselect!=GUN_KNIFE && !hasammo(d)) { d->shots = 0; return; };
 			
 		if(guns[d->gunselect].isauto) d->shots++;
 		else d->attacking = false;
@@ -625,7 +625,7 @@ void shoot(playerent *d, vec &targ)
 			akimboside = !akimboside;
 		}
 	    
-		if(d->gunselect) d->mag[d->gunselect]--;
+		if(d->gunselect!=GUN_KNIFE) d->mag[d->gunselect]--;
 		from.z -= 0.2f;    // below eye
 	};