kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix: fully substituting the pistol for the akimbo (when it is true)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4959 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-20 21:42:25 +00:00
parent 234f873ffa
commit aca4ab50ad
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+3 -2
View File
@@ -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;
}