delay after grenade activation

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1982 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-05-15 20:19:39 +00:00
parent 50b58a5a27
commit 1c53fe91c2
1 changed files with 3 additions and 2 deletions
@@ -641,6 +641,7 @@ bool grenades::attack(vec &targ)
    vec &to = targ;

    bool waitdone = attackmillis>=gunwait;
+    if(waitdone) gunwait = reloading = 0;

    switch(state)
    {
@@ -669,8 +670,6 @@ bool grenades::attack(vec &targ)
            }
            break;
    }
-
-    if(waitdone) gunwait = reloading = 0;
    return true;
 }

@@ -701,8 +700,10 @@ void grenades::activatenade(const vec &to)
 {
    if(!mag) return;
    throwmillis = 0;
+
    inhandnade = new grenadeent(owner);
    bounceents.add(inhandnade);
+
    updatelastaction(owner);
    mag--;
    gunwait = info.attackdelay;