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

quicknade... detecting which button produced the attack...

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5608 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-08-12 05:15:26 +00:00
parent d67040e3cb
commit bec5dd2099
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+6 -6
View File
@@ -97,23 +97,23 @@ void shiftweapon(int s)
else if(player1->isspectating()) updatefollowplayer(s);
}
bool quicknade = false;
bool quicknade = false, nadeattack = false;
VARP(quicknade_hold, 0, 0, 1);
void quicknadethrow(bool on)
{
if(player1->state != CS_ALIVE || ( player1->attacking && player1->weaponsel->type != GUN_GRENADE )) return;
if(player1->state != CS_ALIVE) return;
if(on)
{
if(player1->weapons[GUN_GRENADE]->mag > 0)
if(player1->weapons[GUN_GRENADE]->mag > 0 && !player1->attacking)
{
if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold) attack(true);
if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold) { player1->attacking = true; nadeattack = true; }
}
}
else
else if (nadeattack)
{
attack(false);
nadeattack = player1->attacking = false;
if(player1->weaponsel->type == GUN_GRENADE) quicknade = true;
}
}