R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

/W4: Fix implicit type conversion warnings

Browse Source 
Explicitly convert them to avoid any warnings or potential bugs.
This commit is contained in:
Kawe Mazidjatari 2023-04-02 17:23:53 +02:00
parent 7727f13efa
commit bae2e0a99c
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/server/sv_rcon.cpp
View File

@ -47,7 +47,7 @@ void CRConServer::Init(void)
}
m_Address.SetFromString(hostip->GetString(), true);
m_Address.SetPort(htons(hostport->GetInt()));
m_Address.SetPort(htons(uint16_t(hostport->GetInt())));
m_Socket.CreateListenSocket(m_Address, false);

10
r5dev/mathlib/color_conversion.cpp
View File

@ -110,7 +110,7 @@ static void CheckExponentTable()
{
for (int i = 0; i < 256; i++)
{
float testAgainst = pow(2.0f, i - 128) / 255.0f;
float testAgainst = float(pow(2.0f, i - 128)) / 255.0f;
float diff = testAgainst - power2_n[i];
float relativeDiff = diff / testAgainst;
Assert(testAgainst == 0 ?
@ -157,7 +157,7 @@ void BuildGammaTable(float gamma, float texGamma, float brightness, int overbrig
inf = 0;
if (inf > 255)
inf = 255;
texgammatable[i] = inf;
texgammatable[i] = byte(inf);
}
for (i = 0; i < 1024; i++)
@ -619,9 +619,9 @@ void VectorToColorRGBExp32(const Vector3D& vin, ColorRGBExp32& c)
int green = (int)(vin.y * scalar);
int blue = (int)(vin.z * scalar);
c.r = red;
c.g = green;
c.b = blue;
c.r = byte(red);
c.g = byte(green);
c.b = byte(blue);
}
/*
c.r = ( unsigned char )(vin.x * scalar);

2
r5dev/tier1/NetAdr.cpp
View File

@ -231,7 +231,7 @@ bool CNetAdr::SetFromString(const char* pch, bool bUseDNS)
if (pchColon && strchr(portStart, ':') == pchColon)
{
pchColon[0] = '\0'; // Set the port.
SetPort(htons(atoi(&pchColon[1])));
SetPort(uint16_t(htons(uint16_t(atoi(&pchColon[1])))));
}
}

6
r5dev/tier1/bitbuf.cpp
View File

@ -94,7 +94,7 @@ void CBitRead::GrabNextDWord(bool bOverFlowImmediately)
}
else
{
assert(reinterpret_cast<int>(m_pDataIn) + 3 < reinterpret_cast<int>(m_pBufferEnd));
assert(reinterpret_cast<uintptr_t>(m_pDataIn) + 3 < reinterpret_cast<uintptr_t>(m_pBufferEnd));
m_nInBufWord = LittleDWord(*(m_pDataIn++));
}
}
@ -242,7 +242,7 @@ bool CBitRead::Seek(int64_t nPosition)
void CBitRead::StartReading(const void* pData, size_t nBytes, int64_t iStartBit, int64_t nBits)
{
// Make sure it's dword aligned and padded.
assert(((unsigned long)pData & 3) == 0);
assert((int64_t(pData) & 3) == 0);
m_pData = (uint32*)pData;
m_pDataIn = m_pData;
m_nDataBytes = nBytes;
@ -253,7 +253,7 @@ void CBitRead::StartReading(const void* pData, size_t nBytes, int64_t iStartBit,
}
else
{
assert(nBits <= nBytes * 8);
assert(nBits <= int64_t(nBytes * 8));
m_nDataBits = nBits;
}
m_bOverflow = false;

10
r5dev/tier1/cvar.cpp
View File

@ -901,10 +901,10 @@ bool ConVar::SetColorFromString(const char* pszValue)
// Stuff all the values into each byte of our int.
unsigned char* pColorElement = (reinterpret_cast<unsigned char*>(&m_Value.m_nValue));
pColorElement[0] = nRGBA[0];
pColorElement[1] = nRGBA[1];
pColorElement[2] = nRGBA[2];
pColorElement[3] = nRGBA[3];
pColorElement[0] = unsigned char(nRGBA[0]);
pColorElement[1] = unsigned char(nRGBA[1]);
pColorElement[2] = unsigned char(nRGBA[2]);
pColorElement[3] = unsigned char(nRGBA[3]);
// Copy that value into our float.
m_Value.m_fValue = static_cast<float>(m_Value.m_nValue);
@ -1398,7 +1398,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
{
PrintListHeader(f);
}
for (int i = sorted.FirstInorder(); i != sorted.InvalidIndex(); i = sorted.NextInorder(i))
for (unsigned short i = sorted.FirstInorder(); i != sorted.InvalidIndex(); i = sorted.NextInorder(i))
{
var = sorted[i];
if (var->IsCommand())

10
r5dev/tier1/utlbuffer.cpp
View File

@ -203,7 +203,7 @@ CUtlBuffer::CUtlBuffer(int64 growSize, int64 initSize, int nFlags) :
m_Put = 0;
m_nTab = 0;
m_nOffset = 0;
m_Flags = nFlags;
m_Flags = unsigned char(nFlags);
if ((initSize != 0) && !IsReadOnly())
{
m_nMaxPut = -1;
@ -225,7 +225,7 @@ CUtlBuffer::CUtlBuffer(const void* pBuffer, int64 nSize, int nFlags) :
m_Put = 0;
m_nTab = 0;
m_nOffset = 0;
m_Flags = nFlags;
m_Flags = unsigned char(nFlags);
if (IsReadOnly())
{
m_nMaxPut = m_Put = nSize;
@ -399,7 +399,7 @@ void CUtlBuffer::SetExternalBuffer(void* pMemory, int64 nSize, int64 nInitialPut
m_nTab = 0;
m_Error = 0;
m_nOffset = 0;
m_Flags = nFlags;
m_Flags = unsigned char(nFlags);
m_nMaxPut = -1;
AddNullTermination(m_Put);
}
@ -417,7 +417,7 @@ void CUtlBuffer::AssumeMemory(void* pMemory, int64 nSize, int64 nInitialPut, int
m_nTab = 0;
m_Error = 0;
m_nOffset = 0;
m_Flags = nFlags;
m_Flags = unsigned char(nFlags);
m_nMaxPut = -1;
AddNullTermination(m_Put);
}
@ -1572,7 +1572,7 @@ void CUtlBuffer::PutDelimitedString(CUtlCharConversion* pConv, const char* pStri
void CUtlBuffer::VaPrintf(const char* pFmt, va_list list)
{
char temp[8192];
int64 nLen = V_vsnprintf(temp, sizeof(temp), pFmt, list);
//int64 nLen = V_vsnprintf(temp, sizeof(temp), pFmt, list);
//ErrorIfNot(nLen < sizeof(temp), ("CUtlBuffer::VaPrintf: String overflowed buffer [%d]\n", sizeof(temp)));
PutString(temp);
}

4
r5dev/tier1/utlstring.cpp
View File

@ -281,7 +281,7 @@ void CUtlString::ToUpper()
{
for ( int64 nLength = Length() - 1; nLength >= 0; nLength--)
{
m_Storage[nLength] = toupper(m_Storage[nLength]);
m_Storage[nLength] = unsigned char(toupper( m_Storage[ nLength ] ));
}
}
@ -289,7 +289,7 @@ void CUtlString::ToLower()
{
for( int64 nLength = Length() - 1; nLength >= 0; nLength-- )
{
m_Storage[ nLength ] = tolower( m_Storage[ nLength ] );
m_Storage[ nLength ] = unsigned char(tolower( m_Storage[ nLength ] ));
}
}

6
r5dev/tier2/socketcreator.cpp
View File

@ -46,7 +46,7 @@ void CSocketCreator::ProcessAccept(void)
{
sockaddr_storage inClient{};
int nLengthAddr = sizeof(inClient);
SocketHandle_t newSocket = ::accept(m_hListenSocket, reinterpret_cast<sockaddr*>(&inClient), &nLengthAddr);
SocketHandle_t newSocket = SocketHandle_t(::accept(SOCKET(m_hListenSocket), reinterpret_cast<sockaddr*>(&inClient), &nLengthAddr));
if (newSocket == -1)
{
if (!IsSocketBlocking())
@ -128,7 +128,7 @@ bool CSocketCreator::CreateListenSocket(const netadr_t& netAdr, bool bListenOnAl
{
CloseListenSocket();
m_ListenAddress = netAdr;
m_hListenSocket = ::socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
m_hListenSocket = SocketHandle_t(::socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP));
if (m_hListenSocket != INVALID_SOCKET)
{
@ -187,7 +187,7 @@ int CSocketCreator::ConnectSocket(const netadr_t& netAdr, bool bSingleSocket)
CloseAllAcceptedSockets();
}
SocketHandle_t hSocket = ::socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
SocketHandle_t hSocket = SocketHandle_t(::socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP));
if (hSocket == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Unable to create socket (%s)\n", NET_ErrorString(WSAGetLastError()));

2
r5dev/vgui/vgui_debugpanel.cpp
View File

@ -94,7 +94,7 @@ void CTextOverlay::DrawNotify(void)
if (flTimeleft < 1.0f)
{
float f = clamp(flTimeleft, 0.0f, 1.0f) / 1.0f;
c[3] = int(f * 255.0f);
c[3] = uint8_t(f * 255.0f);
if (i == 0 && f < 0.2f)
{