From ce678675f4160005fdd782be829ca12c057331ea Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 11 Feb 2008 14:26:58 +0000 Subject: [PATCH] immediate autoreload git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1640 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/weapon.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index cdbb5cf6..2d2bdf61 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -827,7 +827,13 @@ struct gun : weapon if(attackmillisattacking) { shots = 0; return false; } + if(!owner->attacking) + { + shots = 0; + checkautoreload(); + return false; + } + updatelastaction(owner); if(!mag) { @@ -871,10 +877,7 @@ struct gun : weapon int modelanim() { return modelattacking() ? ANIM_GUN_SHOOT|ANIM_LOOP : ANIM_GUN_IDLE; }; - void checkautoreload() - { - if(autoreload && owner==player1 && !mag) reload(); - } + void checkautoreload() { if(autoreload && owner==player1 && !mag) reload(); } }; struct shotgun : gun