mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
Merge #1587
1587: Small fixxings r=heinrich5991 a=ChillerDragon Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
This commit is contained in:
commit
5d9d0d7d35
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -64,8 +64,10 @@ versionsrv
|
|||
generated
|
||||
|
||||
.cproject
|
||||
.idea
|
||||
.project
|
||||
.settings
|
||||
.vscode
|
||||
cscope.files
|
||||
cscope.out
|
||||
|
||||
|
|
|
@ -695,7 +695,8 @@ void CGraphics_Threaded::ChangeColorOfCurrentQuadVertices(float r, float g, floa
|
|||
}
|
||||
}
|
||||
|
||||
void CGraphics_Threaded::ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
|
||||
void CGraphics_Threaded::ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
|
||||
{
|
||||
if(g_Config.m_GfxQuadAsTriangle && !m_UseOpenGL3_3)
|
||||
{
|
||||
m_aVertices[QuadOffset * 6].m_Color.r = r;
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include <base/tl/string.h>
|
||||
#include <engine/keys.h>
|
||||
#include <engine/graphics.h>
|
||||
#include <engine/storage.h>
|
||||
#include "ghost.h"
|
||||
|
||||
|
|
|
@ -36,18 +36,19 @@ void CGameTeams::OnCharacterStart(int ClientID)
|
|||
{
|
||||
pStartingChar->m_DDRaceState = DDRACE_STARTED;
|
||||
pStartingChar->m_StartTime = Tick;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
bool Waiting = false;
|
||||
for(int i = 0; i < MAX_CLIENTS; ++i)
|
||||
{
|
||||
if (m_Core.Team(ClientID) == m_Core.Team(i))
|
||||
{
|
||||
if(m_Core.Team(ClientID) != m_Core.Team(i))
|
||||
continue;
|
||||
CPlayer* pPlayer = GetPlayer(i);
|
||||
if (pPlayer && pPlayer->IsPlaying()
|
||||
&& GetDDRaceState(pPlayer) == DDRACE_FINISHED)
|
||||
{
|
||||
if(!pPlayer || !pPlayer->IsPlaying())
|
||||
continue;
|
||||
if(GetDDRaceState(pPlayer) != DDRACE_FINISHED)
|
||||
continue;
|
||||
|
||||
Waiting = true;
|
||||
pStartingChar->m_DDRaceState = DDRACE_NONE;
|
||||
|
||||
|
@ -76,8 +77,6 @@ void CGameTeams::OnCharacterStart(int ClientID)
|
|||
m_LastChat[i] = Tick;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(m_TeamState[m_Core.Team(ClientID)] < TEAMSTATE_STARTED && !Waiting)
|
||||
{
|
||||
|
@ -127,7 +126,6 @@ void CGameTeams::OnCharacterStart(int ClientID)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CGameTeams::OnCharacterFinish(int ClientID)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue