*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@578 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-11 01:41:38 +00:00
parent c80e69d566
commit affe694a7b
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -169,7 +169,7 @@ void checkakimbo()
{
if(player1->akimbo && player1->akimbomillis && player1->akimbomillis<=lastmillis)
{
player1->akimbo = false;
player1->akimbo = 0;
player1->akimbomillis = 0;
player1->mag[GUN_PISTOL] = min(magsize(GUN_PISTOL), player1->mag[GUN_PISTOL]);
if(player1->gunselect==GUN_PISTOL) weaponswitch(GUN_PISTOL);
+2 -1
View File
@@ -363,12 +363,13 @@ struct playerent : dynent
armour = 0;
hasarmour = false;
//armourtype = A_BLUE;
lastaction = akimbolastaction[0] = akimbolastaction[1] = 0;
akimbomillis = 0;
gunselect = GUN_PISTOL;
gunwait = 0;
attacking = false;
weaponchanging = false;
akimbo = false;
akimbo = 1;
loopi(NUMGUNS) ammo[i] = mag[i] = 0;
};
};