From aca4ab50ade6482b834633ab7c8819f6a3d04813 Mon Sep 17 00:00:00 2001
From: Rafael Barreto <baarreth@hotmail.com>
Date: Thu, 20 May 2010 21:42:25 +0000
Subject: [PATCH] bug fix: fully substituting the pistol for the akimbo (when
 it is true)

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

diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index b22a4b27..74fa3541 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -44,8 +44,9 @@ void selectweapon(weapon *w)
 
 void requestweapon(int w)
 {
-    if(keypressed && player1->state == CS_ALIVE && w >= 0 && w < NUMGUNS)
+    if(keypressed && player1->state == CS_ALIVE && w >= 0 && w < NUMGUNS )
     {
+        if (player1->akimbo && w==GUN_PISTOL) w = GUN_AKIMBO;
         selectweapon(player1->weapons[w]);
     }
 }
@@ -1145,7 +1146,7 @@ bool akimbo::attack(vec &targ)
 {
     if(gun::attack(targ))
     {
-		akimbolastaction[akimboside] = lastmillis;
+        akimbolastaction[akimboside] = lastmillis;
         akimboside = (akimboside+1)%2;
         return true;
     }