no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@323 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2006-08-12 19:32:36 +00:00
parent 6453b9a6e3
commit 7353cd8189
11 changed files with 206 additions and 75 deletions
@@ -114,6 +114,7 @@ dynent *newdynent()                 // create a new blank player or monster
    d->bIsBot = false;
 	d->pBot = NULL;
    d->weaponchanging = false;
+	d->lastanimswitchtime = -1;
    spawnstate(d);
    return d;
 };
@@ -216,8 +217,9 @@ void checkakimbo()
 	{
 		player1->akimbo = false;
 		player1->akimbomillis = 0;
-		playsoundc(S_PUPOUT);
+		player1->mag[GUN_PISTOL] = min(magsize(GUN_PISTOL), player1->mag[GUN_PISTOL]);
 		if(player1->gunselect==GUN_PISTOL) weaponswitch(GUN_PISTOL);
+		playsoundc(S_PUPOUT);
 	}
 };