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

disabling the combat pistol for now

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5333 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-07-10 22:01:13 +00:00
parent 5d72830ec9
commit a8b039065a
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+3 -3
View File
@@ -170,8 +170,8 @@ void pickupeffects(int n, playerent *d)
switch(e.type)
{
case I_AKIMBO: w = d->weapons[GUN_AKIMBO]; break;
case I_CLIPS: if (d->gunselect == GUN_CPISTOL) w = d->weapons[GUN_CPISTOL]; else w = d->weapons[GUN_PISTOL]; break;
case I_AMMO: if (d->primary != GUN_CPISTOL) w = d->primweap; break;
case I_CLIPS: w = d->weapons[GUN_PISTOL]; break;
case I_AMMO: w = d->primweap; break;
case I_GRENADE: w = d->weapons[GUN_GRENADE]; break;
}
if(w) w->onammopicked();
@@ -318,7 +318,7 @@ bool selectnextprimary(int num)
{
switch(num)
{
case GUN_CPISTOL:
// case GUN_CPISTOL:
case GUN_RIFLE:
case GUN_SHOTGUN:
case GUN_SUBGUN: