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

simplified quicknadethrow to not need quicknaderelease

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4746 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2009-12-23 19:06:29 +00:00
parent 5928b365b7
commit aaeca4ef32
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+10 -15
View File
@@ -95,25 +95,21 @@ void shiftweapon(int s)
else if(player1->isspectating()) updatefollowplayer(s);
}
void quicknaderelease()
void quicknadethrow(bool on)
{
if(player1->state == CS_ALIVE)
{
attack(false);
if(player1->weaponsel->type == GUN_GRENADE) selectweapon(player1->prevweaponsel);
}
}
void quicknadethrow()
{
if(keypressed && player1->state == CS_ALIVE)
if(player1->state != CS_ALIVE) return;
if(on)
{
if(player1->weapons[GUN_GRENADE]->mag > 0)
{
if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
attack(true);
attack(true);
}
addreleaseaction("quicknaderelease");
}
else
{
attack(false);
if(player1->weaponsel->type == GUN_GRENADE) selectweapon(player1->prevweaponsel);
}
}
@@ -126,8 +122,7 @@ int magreserve(int w) { if(w >= 0 && w < NUMGUNS) return player1->weapons[w]->am
COMMANDN(weapon, requestweapon, ARG_1INT);
COMMAND(shiftweapon, ARG_1INT);
COMMAND(quicknadethrow, ARG_NONE);
COMMAND(quicknaderelease, ARG_NONE);
COMMAND(quicknadethrow, ARG_DOWN);
COMMAND(currentprimary, ARG_IVAL);
COMMAND(prevweapon, ARG_IVAL);
COMMAND(curweapon, ARG_IVAL);