From 6674b536141c78fff2116e30a8f74793787a0c19 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Thu, 31 Mar 2011 20:01:23 +0000
Subject: [PATCH] attackmillis fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6179 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/weapon.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index e44ff8b9..056a5276 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -1113,8 +1113,8 @@ gun::gun(playerent *owner, int type) : weapon(owner, type) {}
 
 bool gun::attack(vec &targ)
 {
-    int attackmillis = lastmillis-owner->lastaction;
-    if(attackmillis<gunwait) return false;
+    int attackmillis = lastmillis-owner->lastaction - gunwait;
+    if(attackmillis<0) return false;
     gunwait = reloading = 0;
 
     if(!owner->attacking)
@@ -1129,7 +1129,7 @@ bool gun::attack(vec &targ)
         return false;
     }
 
-    attackmillis = lastmillis - min(attackmillis - gunwait, curtime);
+    attackmillis = lastmillis - min(attackmillis, curtime);
     updatelastaction(owner, attackmillis);
     if(!mag)
     {
@@ -1308,8 +1308,8 @@ int burstshots = 0;
 
 bool cpistol::attack(vec &targ) // modded from gun::attack // FIXME
 {
-    int attackmillis = lastmillis-owner->lastaction;
-    if(attackmillis<gunwait) return false;
+    int attackmillis = lastmillis-owner->lastaction - gunwait;
+    if(attackmillis<0) return false;
     gunwait = reloading = 0;
 
     if (bursting) burst = true;
@@ -1321,7 +1321,7 @@ bool cpistol::attack(vec &targ) // modded from gun::attack // FIXME
         return false;
     }
 
-    attackmillis = lastmillis - min(attackmillis - gunwait, curtime);
+    attackmillis = lastmillis - min(attackmillis, curtime);
     updatelastaction(owner, attackmillis);
     if(!mag)
     {
@@ -1456,13 +1456,13 @@ int knife::flashtime() const { return 0; }
 
 bool knife::attack(vec &targ)
 {
-    int attackmillis = lastmillis-owner->lastaction;
-    if(attackmillis<gunwait) return false;
+    int attackmillis = lastmillis-owner->lastaction - gunwait;
+    if(attackmillis<0) return false;
     gunwait = reloading = 0;
 
     if(!owner->attacking) return false;
 
-    attackmillis = lastmillis - min(attackmillis - gunwait, curtime);
+    attackmillis = lastmillis - min(attackmillis, curtime);
     updatelastaction(owner, attackmillis);
 
     owner->lastattackweapon = this;