From 8bf3e0a2653b25ce0b361b12538d54aac45962a0 Mon Sep 17 00:00:00 2001 From: aelio_ru Date: Fri, 24 Aug 2012 22:29:27 +0400 Subject: [PATCH 1/2] Fixes inactive dragger after map change or server start. --- src/game/server/entities/character.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 7665cf939..b5a2b1b9b 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -790,7 +790,8 @@ void CCharacter::Die(int Killer, int Weapon) GameServer()->m_World.RemoveEntity(this); GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0; GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID())); - Teams()->SetForceCharacterTeam(m_pPlayer->GetCID(), 0); + // moved to DDRaceInit + // Teams()->SetForceCharacterTeam(m_pPlayer->GetCID(), 0); } bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) @@ -1626,4 +1627,5 @@ void CCharacter::DDRaceInit() m_EndlessHook = g_Config.m_SvEndlessDrag; m_Hit = g_Config.m_SvHit ? HIT_ALL : DISABLE_HIT_GRENADE|DISABLE_HIT_HAMMER|DISABLE_HIT_RIFLE|DISABLE_HIT_SHOTGUN; Teams()->m_Core.SetSolo(m_pPlayer->GetCID(), false); + Teams()->SetForceCharacterTeam(m_pPlayer->GetCID(), 0); } From 143f3eb6450872b886eaee16d955d871fd24bfa3 Mon Sep 17 00:00:00 2001 From: ",,,=^o_._o^=,,," Date: Mon, 5 Nov 2012 23:59:40 +0400 Subject: [PATCH 2/2] Fix for teams --- src/game/server/entities/character.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index b5a2b1b9b..7c2d6fcec 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -790,8 +790,7 @@ void CCharacter::Die(int Killer, int Weapon) GameServer()->m_World.RemoveEntity(this); GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0; GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID())); - // moved to DDRaceInit - // Teams()->SetForceCharacterTeam(m_pPlayer->GetCID(), 0); + Teams()->SetForceCharacterTeam(m_pPlayer->GetCID(), 0); } bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)