*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@632 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-12 23:43:10 +00:00
parent ab21d4463d
commit f0561ed7f7
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -208,7 +208,7 @@ enum { MCMD_KICK = 0, MCMD_BAN, MCMD_REMBANS };
#define m_noitemsnade (gamemode==9)
#define m_nopistol (gamemode==10 || gamemode==11)
#define m_noprimary (m_pistol)
#define m_noguns (m_nopistol && m_noprimary)
#define m_noguns (m_lss)
#define m_arena (gamemode==3 || gamemode==4 || gamemode==9 || gamemode==10 || gamemode==11)
#define m_tarena (gamemode==4 || gamemode==11)
#define m_teammode (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11)
+2 -2
View File
@@ -613,7 +613,7 @@ void shoot(playerent *d, vec &targ)
d->lastaction = lastmillis;
d->lastattackgun = d->gunselect;
if(!hasammo(d)) { d->shots = 0; return; };
if(d->gunselect!=GUN_KNIFE && !hasammo(d)) { d->shots = 0; return; };
if(guns[d->gunselect].isauto) d->shots++;
else d->attacking = false;
@@ -625,7 +625,7 @@ void shoot(playerent *d, vec &targ)
akimboside = !akimboside;
}
if(d->gunselect) d->mag[d->gunselect]--;
if(d->gunselect!=GUN_KNIFE) d->mag[d->gunselect]--;
from.z -= 0.2f; // below eye
};