grenades fix, newmap spawn fix, removebans fix, findlist cmd, menumdl fix, spect hud, scoreboard server stats refresh limit

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1566 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-01-05 16:35:04 +00:00
parent 051db88f74
commit 33dc34d076
10 changed files with 78 additions and 34 deletions
+8 -9
View File
@@ -44,11 +44,7 @@ void selectweapon(weapon *w)
void selectweaponi(int w)
{
if(player1->state == CS_ALIVE)
{
if(w >= 0 && w < NUMGUNS) selectweapon(player1->weapons[w]);
}
else toggledeathcam();
if(player1->state == CS_ALIVE && w >= 0 && w < NUMGUNS) selectweapon(player1->weapons[w]);
}
void shiftweapon(int s)
@@ -62,7 +58,6 @@ void shiftweapon(int s)
selectweapon(player1->weapons[trygun]);
}
}
else toggledeathcam();
}
int currentprimary() { return player1->primweap->type; }
@@ -718,10 +713,14 @@ struct grenades : weapon
0);
playsound(S_GRENADEPULL);
}
else if(inhandnade && attackmillis>info.attackdelay && (!owner->attacking || !inhandnade->isalive(lastmillis)))
else if(inhandnade && attackmillis>info.attackdelay)
{
vec n(0,0,0);
thrownade(owner->o, n, inhandnade);
if(!owner->attacking) thrownade(); // throw
else if(!inhandnade->isalive(lastmillis)) // drop & have fun
{
vec n(0,0,0);
thrownade(owner->o, n, inhandnade);
}
}
return true;
}