edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some style fixes

Browse source
This commit is contained in:
heinrich5991 2018-06-19 14:28:53 +02:00
parent 45cf274fa9
commit c739aef60e
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/client/client.cpp
View file

@ -2099,7 +2099,7 @@ void CClient::FinishMapDownload()
const char *pError;
m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "download complete, loading map");
int prev = m_MapdownloadTotalsize;
int Prev = m_MapdownloadTotalsize;
m_MapdownloadTotalsize = -1;
// load map
@ -2113,7 +2113,7 @@ void CClient::FinishMapDownload()
else if(m_pMapdownloadTask) // fallback
{
ResetMapDownload();
m_MapdownloadTotalsize = prev;
m_MapdownloadTotalsize = Prev;
SendMapRequest();
}
else

6
src/engine/shared/console.cpp
View file

@ -693,14 +693,14 @@ static void StrVariableCommand(IConsole::IResult *pResult, void *pUserData)
const char *pString = pResult->GetString(0);
if(!str_utf8_check(pString))
{
char Temp[4];
char aTemp[4];
int Length = 0;
while(*pString)
{
int Size = str_utf8_encode(Temp, static_cast<const unsigned char>(*pString++));
int Size = str_utf8_encode(aTemp, static_cast<unsigned char>(*pString++));
if(Length+Size < pData->m_MaxSize)
{
mem_copy(pData->m_pStr+Length, &Temp, Size);
mem_copy(pData->m_pStr+Length, aTemp, Size);
Length += Size;
}
else

6
src/game/server/player.cpp
View file

@ -48,12 +48,12 @@ void CPlayer::Reset()
m_LastInvited = 0;
m_WeakHookSpawn = false;
int* idMap = Server()->GetIdMap(m_ClientID);
int *pIdMap = Server()->GetIdMap(m_ClientID);
for (int i = 1;i < VANILLA_MAX_CLIENTS;i++)
{
idMap[i] = -1;
pIdMap[i] = -1;
}
idMap[0] = m_ClientID;
pIdMap[0] = m_ClientID;
// DDRace

2
src/game/server/player.h
View file

@ -134,8 +134,6 @@ private:
int64 m_ForcePauseTime;
int64 m_LastPause;
// DDRace
public:
enum
{