client roles, akimbo pickup fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1020 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2007-05-28 20:30:22 +00:00
parent 5332f5f3fa
commit a7b35fe8a4
12 changed files with 149 additions and 116 deletions
@@ -117,7 +117,7 @@ void realpickup(int n, playerent *d)
            d->akimbomillis = lastmillis+30000;
 	        d->mag[GUN_PISTOL] = 16;
 	        equipitem(d, n, d->ammo[1], 9);
-	        if(d==player1) weaponswitch(GUN_PISTOL);
+            if(d==player1 && d->gunselect!=GUN_SNIPER) weaponswitch(GUN_PISTOL);
            break;
    }
 }