From affe694a7b6cbb39b5582bae8222f86e00b99706 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 11 Nov 2006 01:41:38 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@578 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/cube.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index eac5249d..5dda35a6 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -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); diff --git a/source/src/cube.h b/source/src/cube.h index 97939e58..117b2c42 100644 --- a/source/src/cube.h +++ b/source/src/cube.h @@ -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; }; };