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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@580 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-11 02:30:59 +00:00
parent 38a805fbfc
commit d644d11969
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+3 -3
View File
@@ -49,7 +49,7 @@ void weaponswitch(int gun)
void weapon(int gun)
{
if(m_nogun && gun!=G_MELEE && gun!=G_GRENADE) return;
if(player1->weaponchanging) return;
if(player1->state!=CS_ALIVE || player1->weaponchanging) return;
setscope(false);
if(NADE_IN_HAND || player1->reloading) return;
@@ -68,7 +68,7 @@ void weapon(int gun)
void shiftweapon(int i)
{
if(player1->weaponchanging) return;
if(player1->state!=CS_ALIVE || player1->weaponchanging) return;
int gun;
switch(player1->gunselect)
{
@@ -114,7 +114,7 @@ COMMAND(altaction, ARG_1INT);
void reload(playerent *d)
{
if(!d || d->reloading || d->weaponchanging) return;
if(!d || d->state!=CS_ALIVE || d->reloading || d->weaponchanging) return;
if(d == player1) setscope(false);
bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0;