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

testme : /lockteams, /forceteam [cn] [team], "matchteamsize" removed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6696 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lucas GAUTHERON
2011-11-12 13:22:59 +00:00
parent 22458303f7
commit 70d8421100
9 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+7 -2
View File
@@ -1334,7 +1334,7 @@ COMMAND(dropflag, ARG_NONE);
char *votestring(int type, const char *arg1, const char *arg2)
{
const char *msgs[] = { "kick player %s, reason: %s", "ban player %s, reason: %s", "remove all bans", "set mastermode to %s", "%s autoteam", "force player %s to the enemy team", "give admin to player %s", "load map %s in mode %s%s", "%s demo recording for the next match", "stop demo recording", "clear all demos", "set server description to '%s'", "shuffle teams"};
const char *msgs[] = { "kick player %s, reason: %s", "ban player %s, reason: %s", "remove all bans", "set mastermode to %s", "%s autoteam", "force player %s to %s", "give admin to player %s", "load map %s in mode %s%s", "%s demo recording for the next match", "stop demo recording", "clear all demos", "set server description to '%s'", "shuffle teams", "%s teams" };
const char *msg = msgs[type];
char *out = newstring(MAXSTRLEN);
out[MAXSTRLEN] = '\0';
@@ -1342,8 +1342,8 @@ char *votestring(int type, const char *arg1, const char *arg2)
{
case SA_KICK:
case SA_BAN:
case SA_FORCETEAM:
case SA_GIVEADMIN:
case SA_FORCETEAM:
{
int cn = atoi(arg1);
playerent *p = (cn == getclientnum() ? player1 : getclient(cn));
@@ -1355,6 +1355,7 @@ char *votestring(int type, const char *arg1, const char *arg2)
else formatstring(reason)("%s (ping %d)", arg2, p->ping);
formatstring(out)(msg, colorname(p), reason);
}
else if(type == SA_FORCETEAM) formatstring(out)(msg, colorname(p), arg2 && *arg2 ? arg2 : team_string(team_opposite(p->team)));
else formatstring(out)(msg, colorname(p));
break;
}
@@ -1365,6 +1366,9 @@ char *votestring(int type, const char *arg1, const char *arg2)
case SA_RECORDDEMO:
formatstring(out)(msg, atoi(arg1) == 0 ? "disable" : "enable");
break;
case SA_LOCKTEAMS:
formatstring(out)(msg, atoi(arg1) == 0 ? "unlock" : "lock");
break;
case SA_MAP:
{
int n = atoi(arg2);
@@ -1417,6 +1421,7 @@ void callvote(int type, const char *arg1, const char *arg2)
{
case SA_KICK:
case SA_BAN:
case SA_FORCETEAM:
putint(p, atoi(arg1));
sendstring(arg2, p);
break;