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

Make spectators see the same thing as the player they spectate

Browse source
This commit is contained in:
Ravomavain 2011-12-31 13:54:29 +01:00 committed by GreYFoX
parent 02372ac0b0
commit ebf64758b1
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -890,15 +890,14 @@ void CCharacter::Snap(int SnappingClient)
return; return;
CCharacter* SnapChar = GameServer()->GetPlayerChar(SnappingClient); CCharacter* SnapChar = GameServer()->GetPlayerChar(SnappingClient);
if(SnapChar && !SnapChar->m_Super && !SnapChar->IsPaused() && CPlayer* SnapPlayer = GameServer()->m_apPlayers[SnappingClient];
GameServer()->m_apPlayers[SnappingClient]->GetTeam() != -1 &&
!CanCollide(SnappingClient) && if((SnapPlayer->GetTeam() == TEAM_SPECTATORS || SnapPlayer->m_Paused) && SnapPlayer->m_SpectatorID != -1
(!GameServer()->m_apPlayers[SnappingClient]->m_IsUsingDDRaceClient || && !CanCollide(SnapPlayer->m_SpectatorID) && !SnapPlayer->m_ShowOthers)
(GameServer()->m_apPlayers[SnappingClient]->m_IsUsingDDRaceClient && return;
!GameServer()->m_apPlayers[SnappingClient]->m_ShowOthers
) if( SnapPlayer->GetTeam() != TEAM_SPECTATORS && !SnapPlayer->m_Paused && SnapChar && !SnapChar->m_Super
) && !CanCollide(SnappingClient) && !SnapPlayer->m_ShowOthers)
)
return; return;
if (m_Paused) if (m_Paused)

16
src/game/server/entities/plasma.cpp
View file

@ -87,6 +87,7 @@ void CPlasma::Snap(int SnappingClient)
if (NetworkClipped(SnappingClient)) if (NetworkClipped(SnappingClient))
return; return;
CCharacter* SnapChar = GameServer()->GetPlayerChar(SnappingClient); CCharacter* SnapChar = GameServer()->GetPlayerChar(SnappingClient);
CPlayer* SnapPlayer = GameServer()->m_apPlayers[SnappingClient];
int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11; int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
if (SnapChar && SnapChar->IsAlive() if (SnapChar && SnapChar->IsAlive()
@ -94,11 +95,18 @@ void CPlasma::Snap(int SnappingClient)
&& !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[SnapChar->Team()]) && !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[SnapChar->Team()])
&& (!Tick)) && (!Tick))
return; return;
if (SnapChar && (SnapChar->Team() != m_ResponsibleTeam)
&& (!SnapChar->GetPlayer()->m_IsUsingDDRaceClient if((SnapPlayer->GetTeam() == TEAM_SPECTATORS || SnapPlayer->m_Paused) && SnapPlayer->m_SpectatorID != -1
|| (GameServer()->m_apPlayers[SnappingClient]->m_IsUsingDDRaceClient && GameServer()->GetPlayerChar(SnapPlayer->m_SpectatorID)
&& !GameServer()->m_apPlayers[SnappingClient]->m_ShowOthers))) && GameServer()->GetPlayerChar(SnapPlayer->m_SpectatorID)->Team() != m_ResponsibleTeam
&& !SnapPlayer->m_ShowOthers)
return; return;
if( SnapPlayer->GetTeam() != TEAM_SPECTATORS && !SnapPlayer->m_Paused && SnapChar
&& SnapChar && SnapChar->Team() != m_ResponsibleTeam
&& !SnapPlayer->m_ShowOthers)
return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem( CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser)));
pObj->m_X = (int) m_Pos.x; pObj->m_X = (int) m_Pos.x;