From 4f3d086b9210618a8112ffed102198fe5576c4e8 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Mon, 22 Nov 2010 09:21:02 +0200 Subject: [PATCH] Fixed /pause making u return as a Team 0 Player --- src/game/server/player.cpp | 4 ++++ src/game/server/player.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index dbb34ee7f..0a2526650 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -274,6 +274,8 @@ void CPlayer::LoadCharacter() Character->m_LastWeapon = m_PauseInfo.m_LastWeapon; Character->m_HammerType = m_PauseInfo.m_HammerType; Character->m_Super = m_PauseInfo.m_Super; + CGameControllerDDRace* Controller = (CGameControllerDDRace*)GameServer()->m_pController; + Controller->m_Teams.m_Core.Team(GetCID(), m_PauseInfo.m_Team); m_PauseInfo.m_Respawn = false; m_InfoSaved = false; } @@ -302,6 +304,8 @@ void CPlayer::SaveCharacter() m_PauseInfo.m_LastWeapon = Character->m_LastWeapon; m_PauseInfo.m_HammerType = Character->m_HammerType; m_PauseInfo.m_Super = Character->m_Super; + CGameControllerDDRace* Controller = (CGameControllerDDRace*)GameServer()->m_pController; + m_PauseInfo.m_Team = Controller->m_Teams.m_Core.Team(GetCID()); m_PauseInfo.m_PauseTime = Server()->Tick(); //m_PauseInfo.m_RefreshTime = Character->m_RefreshTime; } diff --git a/src/game/server/player.h b/src/game/server/player.h index 90993c773..471d39821 100644 --- a/src/game/server/player.h +++ b/src/game/server/player.h @@ -58,6 +58,7 @@ public: int m_HammerType; bool m_Super; int m_PauseTime; + int m_Team; } m_PauseInfo; bool m_InfoSaved; void LoadCharacter();