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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@786 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-07 14:09:35 +00:00
parent 3ff761ab27
commit 131ef8fe54
11 changed files with 193 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clients2c.cpp
+35 -6
View File
@@ -146,8 +146,10 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
changemapserv(text, getint(p));
if(joining && m_arena)
{
player1->state = CS_DEAD;
showscores(true);
/* TESTME
player1->state = CS_DEAD;
showscores(true);*/
playerdeath(player1);
};
mapchanged = true;
break;
@@ -261,6 +263,11 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
{
frags = -1;
conoutf("you fragged a teammate (%s)", d->name);
if(m_ctf)
{
flaginfo &flag = flaginfos[team_opposite(team_int(d->team))];
if(flag.state == CTFF_STOLEN && flag.actor == d) playerdeath(player1); // punish for ctf TK
};
}
else
{
@@ -459,9 +466,9 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
case SV_MASTERINFO:
{
loopv(players) { players[i]->ismaster = false; }
int m = getint(p);
if(m == -1) loopv(players) { players[i]->ismaster = false; }
else
if(m != -1)
{
playerent *pl = (m == getclientnum() ? player1 : getclient(m));
if(pl)
@@ -473,6 +480,29 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
break;
};
case SV_MASTERCMD:
{
int cmd = getint(p), arg = getint(p);
switch(cmd)
{
case MCMD_KICK:
case MCMD_BAN:
{
playerent *pl = (arg == getclientnum() ? NULL : getclient(arg));
if(pl) conoutf("%s has been %s", pl->name, cmd == MCMD_KICK ? "kicked" : "banned");
break;
}
case MCMD_REMBANS:
conoutf("bans removed");
break;
case MCMD_MASTERMODE:
conoutf("mastermode set to %i", arg);
break;
};
break;
};
case SV_FORCETEAM:
{
changeteam(getint(p));
@@ -481,8 +511,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
case SV_AUTOTEAM:
{
autoteambalance = getint(p) == 1;
conoutf("autoteam is %s", autoteambalance ? "enabled" : "disabled");
conoutf("autoteam is %s", (autoteambalance = getint(p) == 1) ? "enabled" : "disabled");
break;
};