multiple fixes

Author: miguilimzero

src/engine/server/databases/sqlite.cpp

@@ -403,11 +403,8 @@ bool CSqliteConnection::AddSeasonPoints(const char *pPlayer, int Points, char *p
 	BindInt(2, Points);
 	BindInt(3, Points);
 	bool End;
-	if(Step(&End, pError, ErrorSize))
-	{
-		return true;
-	}
-	return false;
+
+	return Step(&End, pError, ErrorSize);
 }
 
 bool CSqliteConnection::ChangePowerStatus(const char *pPlayer, const char *PowerName, int Status, char *pError, int ErrorSize)
@@ -423,11 +420,8 @@ bool CSqliteConnection::ChangePowerStatus(const char *pPlayer, const char *Power
 	BindInt(1, Status);
 	BindString(2, pPlayer);
 	bool End;
-	if(Step(&End, pError, ErrorSize))
-	{
-		return true;
-	}
-	return false;
+
+	return Step(&End, pError, ErrorSize);
 }
 
 std::unique_ptr<IDbConnection> CreateSqliteConnection(const char *pFilename, bool Setup)

src/game/server/entities/aura.cpp

@@ -131,8 +131,10 @@ void CAura::Snap(int SnappingClient)
 
 	if(m_Owner >= 0)
 		pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	if(!pOwnerChar)
+		return;
 
-	if(pOwnerChar && pOwnerChar->IsAlive())
+	if(pOwnerChar->IsAlive())
 		TeamMask = pOwnerChar->Teams()->TeamMask(pOwnerChar->Team(), -1, m_Owner);
 
 	if(!CmaskIsSet(TeamMask, SnappingClient))

src/game/server/entities/character.cpp

@@ -2358,11 +2358,12 @@ vec2 CCharacter::GetLastSightInput()
 
 void CCharacter::SetCollideOthers(bool on)
 {
-	if(m_Core.m_CollisionDisabled == on)
+	bool disable = !on;
+	if(m_Core.m_CollisionDisabled == disable)
 		return;
 
-	m_Core.m_CollisionDisabled = on;
-	if(on)
+	m_Core.m_CollisionDisabled = disable;
+	if(disable)
 		m_NeededFaketuning &= ~FAKETUNE_NOCOLL;
 	else
 		m_NeededFaketuning |= FAKETUNE_NOCOLL;

src/game/server/entities/loot.cpp

@@ -23,18 +23,15 @@ CLoot::CLoot(CGameWorld *pGameWorld, int Owner, const char *OwnerName, int Respo
 	m_Pos = Pos;
 
 	GameWorld()->InsertEntity(this);
-	for(int i = 0; i < NUM_IDS; i++)
-	{
+
+	for(int i : m_IDs)
 		m_IDs[i] = Server()->SnapNewID();
-	}
 }
 
 CLoot::~CLoot()
 {
-	for(int i = 0; i < NUM_IDS; i++)
-	{
+	for(int i : m_IDs)
 		Server()->SnapFreeID(m_IDs[i]);
-	}
 }
 
 void CLoot::Reset()

src/game/server/entities/soundtrack.cpp

@@ -25,18 +25,14 @@ CSoundtrack::CSoundtrack(CGameWorld *pGameWorld, int Owner) :
 	int64_t TeamMask = pOwner->GetCharacter()->Teams()->TeamMask(pOwner->GetCharacter()->Team(), -1, Owner);
 	GameServer()->CreateSound(m_Pos, SOUND_MENU, TeamMask);
 
-	for(int i = 0; i < NUM_IDS; i++)
-	{
+	for(int i : m_IDs)
 		m_IDs[i] = Server()->SnapNewID();
-	}
 }
 
 CSoundtrack::~CSoundtrack()
 {
-	for(int i = 0; i < NUM_IDS; i++)
-	{
+	for(int i : m_IDs)
 		Server()->SnapFreeID(m_IDs[i]);
-	}
 }
 
 void CSoundtrack::Reset()

src/game/server/gamecontroller.cpp

@@ -823,11 +823,14 @@ int IGameController::SnapRecordFlag(int SnappingClient)
 		pFlagOwner->GetCharacter()->m_Pos == pFlagOwner->GetCharacter()->m_PrevPos)
 		return pFlagOwner->GetCID();
 
-	// Verify flag owner team mask
-	int64_t TeamMask = -1LL;
-	TeamMask = m_pRecordFlagChar->Teams()->TeamMask(m_pRecordFlagChar->Team(), -1, pFlagOwner->GetCID());
-	if(!CmaskIsSet(TeamMask, SnappingClient))
-		return pFlagOwner->GetCID();
+	// Verify flag owner team mask (cannot check that when demo client)
+	if(SnappingClient != SERVER_DEMO_CLIENT)
+	{
+		int64_t TeamMask = -1LL;
+		TeamMask = m_pRecordFlagChar->Teams()->TeamMask(m_pRecordFlagChar->Team(), -1, pFlagOwner->GetCID());
+		if(!CmaskIsSet(TeamMask, SnappingClient))
+			return pFlagOwner->GetCID();
+	}
 
 	// insert flag
 	CNetObj_Flag *pFlag = (CNetObj_Flag *)Server()->SnapNewItem(NETOBJTYPE_FLAG, TEAM_BLUE, sizeof(CNetObj_Flag));