FIx more conflicts

teemods · Feb 4, 2024 · b865c04 · b865c04
1 parent 6adcad1
commit b865c04
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/src/game/server/entities/aura.cpp b/src/game/server/entities/aura.cpp
@@ -137,7 +137,8 @@ void CAura::Snap(int SnappingClient)
 	if(pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(pOwnerChar->Team(), -1, m_Owner);
 
-	if(!CmaskIsSet(TeamMask, SnappingClient))
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+	if(!TeamMask.test(pSnapPlayer->GetTeam()))
 		return;
 
 	// Check if char is moving

diff --git a/src/game/server/entities/loot.cpp b/src/game/server/entities/loot.cpp
@@ -211,7 +211,8 @@ void CLoot::Snap(int SnappingClient)
 	if(pOwnerChar && pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(m_ResponsibleTeam);
 
-	if(!CmaskIsSet(TeamMask, SnappingClient))
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+	if(!TeamMask.test(pSnapPlayer->GetTeam()))
 		return;
 
 	if(m_DotsEffect)

diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
@@ -88,7 +88,7 @@ void CProjectile::TeleportOwnerToProjectile()
 		pOwnerChar->m_TeleGunTeleport = true;
 		pOwnerChar->m_IsBlueTeleGunTeleport = false;
 
-		pOwnerChar->Core()->SetHookedPlayer(-1);
+		pOwnerChar->ResetHook();
 	}
 }
 // Finish - OpenGores

diff --git a/src/game/server/entities/soundtrack.cpp b/src/game/server/entities/soundtrack.cpp
@@ -65,7 +65,8 @@ void CSoundtrack::Snap(int SnappingClient)
 	if(pOwnerChar && pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(pOwnerChar->Team(), -1, m_Owner);
 
-	if(!CmaskIsSet(TeamMask, SnappingClient))
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+	if(!TeamMask.test(pSnapPlayer->GetTeam()))
 		return;
 
 	float AngleStart = (2.0f * pi * Server()->Tick() / static_cast<float>(Server()->TickSpeed())) / 10.0f;

diff --git a/src/game/server/entities/star.cpp b/src/game/server/entities/star.cpp
@@ -78,7 +78,8 @@ void CStar::Snap(int SnappingClient)
 	if(pOwnerChar && pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(pOwnerChar->Team(), -1, m_Owner);
 
-	if(!CmaskIsSet(TeamMask, SnappingClient))
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+	if(!TeamMask.test(pSnapPlayer->GetTeam()))
 		return;
 
 	CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));

diff --git a/src/game/server/entities/trail.cpp b/src/game/server/entities/trail.cpp
@@ -83,7 +83,8 @@ void CTrail::Snap(int SnappingClient)
 	if(pOwnerChar && pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(pOwnerChar->Team(), -1, m_Owner);
 
-	if(!CmaskIsSet(TeamMask, SnappingClient))
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+	if(!TeamMask.test(pSnapPlayer->GetTeam()))
 		return;
 
 	CNetObj_Projectile *pObj = static_cast<CNetObj_Projectile *>(Server()->SnapNewItem(NETOBJTYPE_PROJECTILE, m_IDs[0], sizeof(CNetObj_Projectile)));

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
@@ -870,7 +870,7 @@ int IGameController::SnapRecordFlag(int SnappingClient)
 	if(SnappingClient != SERVER_DEMO_CLIENT)
 	{
 		CClientMask TeamMask = m_pRecordFlagChar->Teams()->TeamMask(m_pRecordFlagChar->Team(), -1, pFlagOwner->GetCID());
-		if(!CmaskIsSet(TeamMask, SnappingClient))
+		if(!TeamMask.test(pSnapPlayer->GetTeam()))
 			return pFlagOwner->GetCID();
 	}
 

diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
@@ -1226,7 +1226,7 @@ bool CPlayer::CarrySomeone()
 		if(Player->GetPlayer()->GetCID() != GetCID() && distance(Player->m_Pos, GetCharacter()->m_Pos) < 60)
 		{
 			CClientMask TeamMask = GetCharacter()->Teams()->TeamMask(GetCharacter()->Team(), -1, GetCID());
-			if(!CmaskIsSet(TeamMask, Player->GetPlayer()->GetCID()))
+			if(!TeamMask.test(Player->GetPlayer()->GetTeam()))
 			{
 				continue;
 			}
@@ -1389,7 +1389,7 @@ bool CPlayer::TickCarrying()
 
 		// Check if the carried player is in a different team mask
 		CClientMask TeamMask = GetCharacter()->Teams()->TeamMask(GetCharacter()->Team());
-		if(!CmaskIsSet(TeamMask, m_PowersData.m_CarryCharacter->GetPlayer()->GetCID()))
+		if(!TeamMask.test(m_PowersData.m_CarryCharacter->GetPlayer()->GetTeam()))
 		{
 			return CancelCarrying();
 		}
@@ -1405,8 +1405,8 @@ bool CPlayer::TickCarrying()
 		//     }
 		// }
 
-		m_PowersData.m_CarryCharacter->Core()->m_Pos = m_PowersData.m_CarryCharacter->m_Pos = FinalPos; // teeware code
-		m_PowersData.m_CarryCharacter->Core()->m_Vel = vec2(0, 0); // no speed
+		m_PowersData.m_CarryCharacter->SetPosition(FinalPos);
+		m_PowersData.m_CarryCharacter->ResetVelocity(); // no speed
 	}
 
 	m_PowersData.m_CarryTimeRemaining--;