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

de-sex assaultcube (plus minor conoutf chg)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6070 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
RandumKiwi
2011-02-06 05:59:46 +00:00
parent ad42ebba1a
commit bd84c4f8ed
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+3 -3
View File
@@ -187,8 +187,8 @@ void newteam(char *name)
int nt = teamatoi(name);
if(nt == player1->team) return; // same team
if(!team_isvalid(nt)) { conoutf(_("%c3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)"), CC, name); return; }
if(team_isspect(nt) && player1->state != CS_DEAD) { conoutf(_("you need to be dead to become spectator")); return; }
if(player1->state == CS_EDITING) conoutf(_("you can't change team while editing"));
if(team_isspect(nt) && player1->state != CS_DEAD) { conoutf(_("you\'ll need to be in a \"dead\" state to become a spectator")); return; }
if(player1->state == CS_EDITING) conoutf(_("you can\'t change team while editing"));
else addmsg(SV_SWITCHTEAM, "ri", nt);
}
else conoutf(_("your team is: %s"), team_string(player1->team));
@@ -603,7 +603,7 @@ inline const char * spawn_message()
{
// Don't use "/n" within these messages. If you do, the words won't align to the middle of the screen.
if (securemapcheck(getclientmap()))
return "3Server will NOT allow spawning or getmap!"; // Also see client.cpp which has a conoutf message
return "3The server will NOT allow spawning or getmap!"; // Also see client.cpp which has a conoutf message
else return "3You must be on the correct map to spawn. Type /getmap to download it.";
}
else if (m_coop) return "3Type /getmap or send a map and vote for it to start co-op edit.";