edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the sv_team 1 message.. lol it never told u too join a team :D

Browse source
This commit is contained in:
DemonulPierdut/-/Julian /[Assange/] 2011-01-24 22:36:05 +11:00
parent 8ff2b1a95f
commit 2f45abdc40
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/server/entities/character.cpp
View file

@ -99,7 +99,10 @@ bool CCharacter::Spawn(CPlayer *pPlayer, vec2 Pos)
{ {
Controller->m_Teams.SendTeamsState(GetPlayer()->GetCID()); Controller->m_Teams.SendTeamsState(GetPlayer()->GetCID());
} }
if(g_Config.m_SvTeam == 1)
{
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"Please join a team before you start");
}
m_DefEmote = EMOTE_NORMAL; m_DefEmote = EMOTE_NORMAL;
m_DefEmoteReset = -1; m_DefEmoteReset = -1;
return true; return true;
@ -1045,8 +1048,8 @@ void CCharacter::HandleTiles(int Index)
if(((m_TileIndex == TILE_BEGIN) || (m_TileFIndex == TILE_BEGIN) || FTile1 == TILE_BEGIN || FTile2 == TILE_BEGIN || FTile3 == TILE_BEGIN || FTile4 == TILE_BEGIN || Tile1 == TILE_BEGIN || Tile2 == TILE_BEGIN || Tile3 == TILE_BEGIN || Tile4 == TILE_BEGIN) && (m_DDRaceState == DDRACE_NONE || m_DDRaceState == DDRACE_FINISHED || (m_DDRaceState == DDRACE_STARTED && !Team()))) if(((m_TileIndex == TILE_BEGIN) || (m_TileFIndex == TILE_BEGIN) || FTile1 == TILE_BEGIN || FTile2 == TILE_BEGIN || FTile3 == TILE_BEGIN || FTile4 == TILE_BEGIN || Tile1 == TILE_BEGIN || Tile2 == TILE_BEGIN || Tile3 == TILE_BEGIN || Tile4 == TILE_BEGIN) && (m_DDRaceState == DDRACE_NONE || m_DDRaceState == DDRACE_FINISHED || (m_DDRaceState == DDRACE_STARTED && !Team())))
{ {
bool CanBegin = true; bool CanBegin = true;
if(g_Config.m_SvTeam == 1 && (Team() == TEAM_FLOCK || Teams()->Count(Team()) <= 1) ) { if(g_Config.m_SvTeam == 1 && (Team() == TEAM_FLOCK || Teams()->Count(Team()) <= 1)) {
GameServer()->SendChat(-1, GetPlayer()->GetCID(),"I already told you that you must find a friend");//need to make this better GameServer()->SendChatTarget(GetPlayer()->GetCID(),"I already told you too join a team");
CanBegin = false; CanBegin = false;
} }
if(CanBegin) { if(CanBegin) {