kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabling the combat pistol for now

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5333 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-07-10 22:01:13 +00:00
parent 5d72830ec9
commit a8b039065a
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/server.cpp
+2 -2
View File
@@ -2721,7 +2721,7 @@ void process(ENetPacket *packet, int sender, int chan)
case SV_WEAPCHANGE:
{
int gunselect = getint(p);
if(gunselect<0 && gunselect>=NUMGUNS) break;
if(gunselect<0 || gunselect>=NUMGUNS || gunselect == GUN_CPISTOL) break;
cl->state.gunselect = gunselect;
QUEUE_MSG;
break;
@@ -2796,7 +2796,7 @@ void process(ENetPacket *packet, int sender, int chan)
{
int ls = getint(p), gunselect = getint(p);
if((cl->state.state!=CS_ALIVE && cl->state.state!=CS_DEAD && cl->state.state!=CS_SPECTATE) ||
ls!=cl->state.lifesequence || cl->state.lastspawn<0 || gunselect<0 || gunselect>=NUMGUNS) break;
ls!=cl->state.lifesequence || cl->state.lastspawn<0 || gunselect<0 || gunselect>=NUMGUNS || gunselect == GUN_CPISTOL) break;
cl->state.lastspawn = -1;
cl->state.spawn = gamemillis;
cl->upspawnp = false;