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

renamned m_pCarryingCCharacter correctly

Browse source
This commit is contained in:
Magnus Auvinen 2010-05-29 11:26:17 +00:00
parent f41fa4baba
commit 4c0886f087
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/game/server/gamemodes/ctf.cpp
View file

@ -42,13 +42,13 @@ int CGameControllerCTF::OnCharacterDeath(class CCharacter *pVictim, class CPlaye
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
CFlag *F = m_apFlags[i]; CFlag *F = m_apFlags[i];
if(F && pKiller && pKiller->GetCharacter() && F->m_pCarryingCCharacter == pKiller->GetCharacter()) if(F && pKiller && pKiller->GetCharacter() && F->m_pCarryingCharacter == pKiller->GetCharacter())
HadFlag |= 2; HadFlag |= 2;
if(F && F->m_pCarryingCCharacter == pVictim) if(F && F->m_pCarryingCharacter == pVictim)
{ {
GameServer()->CreateSoundGlobal(SOUND_CTF_DROP); GameServer()->CreateSoundGlobal(SOUND_CTF_DROP);
F->m_DropTick = Server()->Tick(); F->m_DropTick = Server()->Tick();
F->m_pCarryingCCharacter = 0; F->m_pCarryingCharacter = 0;
F->m_Vel = vec2(0,0); F->m_Vel = vec2(0,0);
if(pKiller && pKiller->GetTeam() != pVictim->GetPlayer()->GetTeam()) if(pKiller && pKiller->GetTeam() != pVictim->GetPlayer()->GetTeam())
@ -69,7 +69,7 @@ bool CGameControllerCTF::CanBeMovedOnBalance(int Cid)
for(int fi = 0; fi < 2; fi++) for(int fi = 0; fi < 2; fi++)
{ {
CFlag *F = m_apFlags[fi]; CFlag *F = m_apFlags[fi];
if(F->m_pCarryingCCharacter == Character) if(F->m_pCarryingCharacter == Character)
return false; return false;
} }
} }
@ -98,10 +98,10 @@ void CGameControllerCTF::Tick()
} }
// //
if(F->m_pCarryingCCharacter) if(F->m_pCarryingCharacter)
{ {
// update flag position // update flag position
F->m_Pos = F->m_pCarryingCCharacter->m_Pos; F->m_Pos = F->m_pCarryingCharacter->m_Pos;
if(m_apFlags[fi^1] && m_apFlags[fi^1]->m_AtStand) if(m_apFlags[fi^1] && m_apFlags[fi^1]->m_AtStand)
{ {
@ -109,21 +109,21 @@ void CGameControllerCTF::Tick()
{ {
// CAPTURE! \o/ // CAPTURE! \o/
m_aTeamscore[fi^1] += 100; m_aTeamscore[fi^1] += 100;
F->m_pCarryingCCharacter->GetPlayer()->m_Score += 5; F->m_pCarryingCharacter->GetPlayer()->m_Score += 5;
dbg_msg("game", "flag_capture player='%d:%s'", dbg_msg("game", "flag_capture player='%d:%s'",
F->m_pCarryingCCharacter->GetPlayer()->GetCID(), F->m_pCarryingCharacter->GetPlayer()->GetCID(),
Server()->ClientName(F->m_pCarryingCCharacter->GetPlayer()->GetCID())); Server()->ClientName(F->m_pCarryingCharacter->GetPlayer()->GetCID()));
char Buf[512]; char Buf[512];
float CaptureTime = (Server()->Tick() - F->m_GrabTick)/(float)Server()->TickSpeed(); float CaptureTime = (Server()->Tick() - F->m_GrabTick)/(float)Server()->TickSpeed();
if(CaptureTime <= 60) if(CaptureTime <= 60)
{ {
str_format(Buf, sizeof(Buf), "The %s flag was captured by %s (%d.%s%d seconds)", fi ? "blue" : "red", Server()->ClientName(F->m_pCarryingCCharacter->GetPlayer()->GetCID()), (int)CaptureTime%60, ((int)(CaptureTime*100)%100)<10?"0":"", (int)(CaptureTime*100)%100); str_format(Buf, sizeof(Buf), "The %s flag was captured by %s (%d.%s%d seconds)", fi ? "blue" : "red", Server()->ClientName(F->m_pCarryingCharacter->GetPlayer()->GetCID()), (int)CaptureTime%60, ((int)(CaptureTime*100)%100)<10?"0":"", (int)(CaptureTime*100)%100);
} }
else else
{ {
str_format(Buf, sizeof(Buf), "The %s flag was captured by %s", fi ? "blue" : "red", Server()->ClientName(F->m_pCarryingCCharacter->GetPlayer()->GetCID())); str_format(Buf, sizeof(Buf), "The %s flag was captured by %s", fi ? "blue" : "red", Server()->ClientName(F->m_pCarryingCharacter->GetPlayer()->GetCID()));
} }
GameServer()->SendChat(-1, -2, Buf); GameServer()->SendChat(-1, -2, Buf);
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
@ -168,12 +168,12 @@ void CGameControllerCTF::Tick()
} }
F->m_AtStand = 0; F->m_AtStand = 0;
F->m_pCarryingCCharacter = apCloseCCharacters[i]; F->m_pCarryingCharacter = apCloseCCharacters[i];
F->m_pCarryingCCharacter->GetPlayer()->m_Score += 1; F->m_pCarryingCharacter->GetPlayer()->m_Score += 1;
dbg_msg("game", "flag_grab player='%d:%s'", dbg_msg("game", "flag_grab player='%d:%s'",
F->m_pCarryingCCharacter->GetPlayer()->GetCID(), F->m_pCarryingCharacter->GetPlayer()->GetCID(),
Server()->ClientName(F->m_pCarryingCCharacter->GetPlayer()->GetCID())); Server()->ClientName(F->m_pCarryingCharacter->GetPlayer()->GetCID()));
for(int c = 0; c < MAX_CLIENTS; c++) for(int c = 0; c < MAX_CLIENTS; c++)
{ {
@ -189,7 +189,7 @@ void CGameControllerCTF::Tick()
} }
} }
if(!F->m_pCarryingCCharacter && !F->m_AtStand) if(!F->m_pCarryingCharacter && !F->m_AtStand)
{ {
if(Server()->Tick() > F->m_DropTick + Server()->TickSpeed()*30) if(Server()->Tick() > F->m_DropTick + Server()->TickSpeed()*30)
{ {
@ -212,7 +212,7 @@ CFlag::CFlag(CGameWorld *pGameWorld, int Team)
{ {
m_Team = Team; m_Team = Team;
m_ProximityRadius = m_PhysSize; m_ProximityRadius = m_PhysSize;
m_pCarryingCCharacter = 0x0; m_pCarryingCharacter = 0x0;
m_GrabTick = 0; m_GrabTick = 0;
Reset(); Reset();
@ -220,7 +220,7 @@ CFlag::CFlag(CGameWorld *pGameWorld, int Team)
void CFlag::Reset() void CFlag::Reset()
{ {
m_pCarryingCCharacter = 0x0; m_pCarryingCharacter = 0x0;
m_AtStand = 1; m_AtStand = 1;
m_Pos = m_StandPos; m_Pos = m_StandPos;
m_Vel = vec2(0,0); m_Vel = vec2(0,0);
@ -237,6 +237,6 @@ void CFlag::Snap(int SnappingClient)
if(m_AtStand) if(m_AtStand)
pFlag->m_CarriedBy = -2; pFlag->m_CarriedBy = -2;
else if(m_pCarryingCCharacter && m_pCarryingCCharacter->GetPlayer()) else if(m_pCarryingCharacter && m_pCarryingCharacter->GetPlayer())
pFlag->m_CarriedBy = m_pCarryingCCharacter->GetPlayer()->GetCID(); pFlag->m_CarriedBy = m_pCarryingCharacter->GetPlayer()->GetCID();
} }

2
src/game/server/gamemodes/ctf.h
View file

@ -21,7 +21,7 @@ class CFlag : public CEntity
{ {
public: public:
static const int m_PhysSize = 14; static const int m_PhysSize = 14;
CCharacter *m_pCarryingCCharacter; CCharacter *m_pCarryingCharacter;
vec2 m_Vel; vec2 m_Vel;
vec2 m_StandPos; vec2 m_StandPos;