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

fixed warnings

Browse source
This commit is contained in:
GreYFoXGTi 2011-01-06 14:13:49 +02:00
parent af160c8401
commit 21994e017f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/gamecontroller.cpp
View file

@ -265,7 +265,7 @@ bool IGameController::OnEntity(int Index, vec2 Pos, int Layer, int Flags, int Nu
sides2[6]=GameServer()->Collision()->Entity(x-2,y, Layer); sides2[6]=GameServer()->Collision()->Entity(x-2,y, Layer);
sides2[7]=GameServer()->Collision()->Entity(x-2,y+2, Layer); sides2[7]=GameServer()->Collision()->Entity(x-2,y+2, Layer);
float AngularSpeed; float AngularSpeed = 0.0;
int Ind=Index-ENTITY_LASER_STOP; int Ind=Index-ENTITY_LASER_STOP;
int M; int M;
if (Ind<0) if (Ind<0)

2
src/game/server/teams.cpp
View file

@ -130,11 +130,13 @@ bool CGameTeams::SetCharacterTeam(int id, int Team)
if(Team == TEAM_SUPER && !Character(id)->m_Super) return false; if(Team == TEAM_SUPER && !Character(id)->m_Super) return false;
//if you begin race //if you begin race
if(Character(id)->m_DDRaceState != DDRACE_NONE) if(Character(id)->m_DDRaceState != DDRACE_NONE)
{
//you will be killed if you try to join FLOCK //you will be killed if you try to join FLOCK
if(Team == TEAM_FLOCK && m_Core.Team(id) != TEAM_FLOCK) if(Team == TEAM_FLOCK && m_Core.Team(id) != TEAM_FLOCK)
Character(id)->GetPlayer()->KillCharacter(WEAPON_GAME); Character(id)->GetPlayer()->KillCharacter(WEAPON_GAME);
else if(Team != TEAM_SUPER) else if(Team != TEAM_SUPER)
return false; return false;
}
SetForceCharacterTeam(id, Team); SetForceCharacterTeam(id, Team);