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

Fix many compiler warnings

Browse Source 
Fix many compiler warnings indicating potentially unwanted implicit conversions/truncations.
This commit is contained in:
Kawe Mazidjatari 2023-04-02 00:59:24 +02:00
parent 2fb54ad8c4
commit 4357c9dbf3
17 changed files with 93 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/game/server/player.cpp
View File

@ -51,7 +51,7 @@ QAngle* CPlayer::EyeAngles(QAngle* pAngles)
//------------------------------------------------------------------------------
inline void CPlayer::SetTimeBase(float flTimeBase)
{
float flTime = TIME_TO_TICKS(flTimeBase);
float flTime = float(TIME_TO_TICKS(flTimeBase));
if (flTime < 0.0f)
flTime = 0.0f;

4
r5dev/gameui/IBrowser.cpp
View File

@ -397,8 +397,8 @@ void CBrowser::HiddenServersModal(void)
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.00f, 0.00f, 0.00f, 0.00f)); // Override the style color for child bg.
ImGui::BeginChild("##HiddenServersConnectModal_IconParent", ImVec2(m_rLockedIconBlob.m_nWidth, m_rLockedIconBlob.m_nHeight));
ImGui::Image(m_idLockedIcon, ImVec2(m_rLockedIconBlob.m_nWidth, m_rLockedIconBlob.m_nHeight)); // Display texture.
ImGui::BeginChild("##HiddenServersConnectModal_IconParent", ImVec2(float(m_rLockedIconBlob.m_nWidth), float(m_rLockedIconBlob.m_nHeight)));
ImGui::Image(m_idLockedIcon, ImVec2(float(m_rLockedIconBlob.m_nWidth), float(m_rLockedIconBlob.m_nHeight))); // Display texture.
ImGui::EndChild();
ImGui::PopStyleColor(); // Pop the override for the child bg.

4
r5dev/gameui/IConsole.cpp
View File

@ -393,7 +393,7 @@ void CConsole::SuggestPanel(void)
// Show the flag texture before the cvar name.
const int mainTexIdx = GetFlagTextureIndex(suggest.m_nFlags);
const MODULERESOURCE& mainRes = m_vFlagIcons[mainTexIdx];
ImGui::Image(mainRes.m_idIcon, ImVec2(mainRes.m_nWidth, mainRes.m_nHeight));
ImGui::Image(mainRes.m_idIcon, ImVec2(float(mainRes.m_nWidth), float(mainRes.m_nHeight)));
// Show a more detailed description of the flag when user hovers over the texture.
if (ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly) &&
@ -404,7 +404,7 @@ void CConsole::SuggestPanel(void)
const int hintTexIdx = GetFlagTextureIndex(cvarInfo.m_nFlag);
const MODULERESOURCE& hintRes = m_vFlagIcons[hintTexIdx];
ImGui::Image(hintRes.m_idIcon, ImVec2(hintRes.m_nWidth, hintRes.m_nHeight));
ImGui::Image(hintRes.m_idIcon, ImVec2(float(hintRes.m_nWidth), float(hintRes.m_nHeight)));
ImGui::SameLine();
ImGui::Text(cvarInfo.m_pszDesc);
};

2
r5dev/mathlib/halton.h
View File

@ -55,7 +55,7 @@ public:
zvalue = 2 * zvalue - 1.0f; // map from 0..1 to -1..1
float phi = acos(zvalue);
// now, generate a random rotation angle for x/y
float theta = 2.0f * M_PI * vrot.NextValue();
float theta = 2.0f * float(M_PI) * vrot.NextValue();
float sin_p = sin(phi);
return Vector3D(cos(theta) * sin_p,
sin(theta) * sin_p,

8
r5dev/mathlib/mathlib_base.cpp
View File

@ -5796,9 +5796,9 @@ const Quaternion RandomQuaternion()
{
// Guarantee uniform distribution within S^3. Found on the internet, looked through the proof very briefly, looks sound enough to tentatively trust it before testing or checking the proof for real.
// http://mathproofs.blogspot.com/2005/05/uniformly-distributed-random-unit.html
float u = RandomFloat(0, 2 * M_PI), flSinU = sinf(u);
float u = RandomFloat(0, float(2 * M_PI)), flSinU = sinf(u);
float v = acosf(RandomFloat(-1, 1)), flSinV = sinf(v);
float w = 0.5f * (RandomFloat(0, M_PI) + acosf(RandomFloat(0, 1)) + M_PI / 2), flSinW = sinf(w);
float w = 0.5f * (RandomFloat(0, float(M_PI)) + acosf(RandomFloat(0, 1)) + M_PI / 2), flSinW = sinf(w);
return Quaternion(cosf(u), flSinU * cosf(v), flSinU * flSinV * cosf(w), flSinU * flSinV * flSinW);
}
@ -5806,9 +5806,9 @@ const Quaternion RandomQuaternion(IUniformRandomStream* pRnd)
{
// Guarantee uniform distribution within S^3. Found on the internet, looked through the proof very briefly, looks sound enough to tentatively trust it before testing or checking the proof for real.
// http://mathproofs.blogspot.com/2005/05/uniformly-distributed-random-unit.html
float u = pRnd->RandomFloat(0, 2 * M_PI), flSinU = sinf(u);
float u = pRnd->RandomFloat(0, float(2 * M_PI)), flSinU = sinf(u);
float v = acosf(pRnd->RandomFloat(-1, 1)), flSinV = sinf(v);
float w = 0.5f * (pRnd->RandomFloat(0, M_PI) + acosf(pRnd->RandomFloat(0, 1)) + M_PI / 2), flSinW = sinf(w);
float w = 0.5f * (pRnd->RandomFloat(0, float(M_PI)) + acosf(pRnd->RandomFloat(0, 1)) + M_PI / 2), flSinW = sinf(w);
return Quaternion(cosf(u), flSinU * cosf(v), flSinU * flSinV * cosf(w), flSinU * flSinV * flSinW);
}

6
r5dev/mathlib/ssenoise.cpp
View File

@ -52,9 +52,9 @@ fltx4 NoiseSIMD(const fltx4& x, const fltx4& y, const fltx4& z)
{ unsigned int xi = SubInt( x_idx, i ); \
unsigned int yi = SubInt( y_idx, i ); \
unsigned int zi = SubInt( z_idx, i ); \
SubFloat( xfrac, i ) = (xi & 0xff)*(1.0/256.0); \
SubFloat( yfrac, i ) = (yi & 0xff)*(1.0/256.0); \
SubFloat( zfrac, i ) = (zi & 0xff)*(1.0/256.0); \
SubFloat( xfrac, i ) = (xi & 0xff)*(1.0f/256.0f); \
SubFloat( yfrac, i ) = (yi & 0xff)*(1.0f/256.0f); \
SubFloat( zfrac, i ) = (zi & 0xff)*(1.0f/256.0f); \
xi>>=8; \
yi>>=8; \
zi>>=8; \

46
r5dev/mathlib/vmatrix.cpp
View File

@ -127,7 +127,7 @@ VMatrix SetupMatrixAxisRot(const Vector3D& vAxis, vec_t fDegrees)
vec_t fRadians;
fRadians = fDegrees * (M_PI / 180.0f);
fRadians = fDegrees * (float(M_PI) / 180.0f);
s = (vec_t)sin(fRadians);
c = (vec_t)cos(fRadians);
@ -163,7 +163,7 @@ VMatrix SetupMatrixAxisToAxisRot(const Vector3D& vFromAxis, const Vector3D& vToA
if (s > 0)
{
vAxis *= 1.0 / s;
vAxis *= 1.0f / s;
tx = t * vAxis.x; ty = t * vAxis.y; tz = t * vAxis.z;
sx = s * vAxis.x; sy = s * vAxis.y; sz = s * vAxis.z;
@ -1030,7 +1030,7 @@ void MatrixBuildRotation(VMatrix& dst, const Vector3D& initialDirection, const V
{
CrossProduct(initialDirection, finalDirection, axis);
VectorNormalize(axis);
angle = acos(angle) * 180 / M_PI;
angle = acos(angle) * 180 / float(M_PI);
}
MatrixBuildRotationAboutAxis(dst, axis, angle);
@ -1047,7 +1047,7 @@ void MatrixBuildRotation(VMatrix& dst, const Vector3D& initialDirection, const V
//-----------------------------------------------------------------------------
void MatrixBuildRotateZ(VMatrix& dst, float angleDegrees)
{
float radians = angleDegrees * (M_PI / 180.0f);
float radians = angleDegrees * (float(M_PI) / 180.0f);
float fSin = (float)sin(radians);
float fCos = (float)cos(radians);
@ -1075,8 +1075,8 @@ void MatrixBuildScale(VMatrix& dst, const Vector3D& scale)
void MatrixBuildPerspective(VMatrix& dst, float fovX, float fovY, float zNear, float zFar)
{
// FIXME: collapse all of this into one matrix after we figure out what all should be in here.
float width = 2 * zNear * tan(fovX * (M_PI / 180.0f) * 0.5f);
float height = 2 * zNear * tan(fovY * (M_PI / 180.0f) * 0.5f);
float width = 2 * zNear * (float)tan(fovX * (M_PI / 180.0f) * 0.5f);
float height = 2 * zNear * (float)tan(fovY * (M_PI / 180.0f) * 0.5f);
memset(dst.Base(), 0, sizeof(dst));
dst[0][0] = 2.0F * zNear / width;
@ -1267,36 +1267,36 @@ void MatrixBuildOrtho(VMatrix& dst, double left, double top, double right, doubl
// introduces a -1 scale in the y coordinates
// D3DXMatrixOrthoOffCenterRH( &matrix, left, right, top, bottom, zNear, zFar );
dst.Init(2.0f / (right - left), 0.0f, 0.0f, (left + right) / (left - right),
0.0f, 2.0f / (bottom - top), 0.0f, (bottom + top) / (top - bottom),
0.0f, 0.0f, 1.0f / (zNear - zFar), zNear / (zNear - zFar),
dst.Init(2.0f / vec_t(right - left), 0.0f, 0.0f, vec_t((left + right) / (left - right)),
0.0f, 2.0f / vec_t(bottom - top), 0.0f, vec_t((bottom + top) / (top - bottom)),
0.0f, 0.0f, 1.0f / vec_t(zNear - zFar), vec_t(zNear / (zNear - zFar)),
0.0f, 0.0f, 0.0f, 1.0f);
}
void MatrixBuildPerspectiveX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar)
{
float flWidth = 2.0f * flZNear * tanf(flFovX * M_PI / 360.0f);
float flHeight = flWidth / flAspect;
dst.Init(2.0f * flZNear / flWidth, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f * flZNear / flHeight, 0.0f, 0.0f,
0.0f, 0.0f, flZFar / (flZNear - flZFar), flZNear * flZFar / (flZNear - flZFar),
float flWidth = 2.0f * float(flZNear) * tanf(float(flFovX * M_PI) / 360.0f);
float flHeight = flWidth / float(flAspect);
dst.Init(2.0f * float(flZNear) / flWidth, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f * float(flZNear) / flHeight, 0.0f, 0.0f,
0.0f, 0.0f, float(flZFar / (flZNear - flZFar)), float(flZNear * flZFar / (flZNear - flZFar)),
0.0f, 0.0f, -1.0f, 0.0f);
}
void MatrixBuildPerspectiveOffCenterX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar, double bottom, double top, double left, double right)
{
float flWidth = 2.0f * flZNear * tanf(flFovX * M_PI / 360.0f);
float flHeight = flWidth / flAspect;
float flWidth = 2.0f * float(flZNear) * tanf(float(flFovX * M_PI) / 360.0f);
float flHeight = flWidth / float(flAspect);
// bottom, top, left, right are 0..1 so convert to -<val>/2..<val>/2
float flLeft = -(flWidth / 2.0f) * (1.0f - left) + left * (flWidth / 2.0f);
float flRight = -(flWidth / 2.0f) * (1.0f - right) + right * (flWidth / 2.0f);
float flBottom = -(flHeight / 2.0f) * (1.0f - bottom) + bottom * (flHeight / 2.0f);
float flTop = -(flHeight / 2.0f) * (1.0f - top) + top * (flHeight / 2.0f);
float flLeft = -(flWidth / 2.0f) * (1.0f - float(left)) + float(left) * (flWidth / 2.0f);
float flRight = -(flWidth / 2.0f) * (1.0f - float(right)) + float(right) * (flWidth / 2.0f);
float flBottom = -(flHeight / 2.0f) * (1.0f - float(bottom)) + float(bottom) * (flHeight / 2.0f);
float flTop = -(flHeight / 2.0f) * (1.0f - float(top)) + float(top) * (flHeight / 2.0f);
dst.Init((2.0f * flZNear) / (flRight - flLeft), 0.0f, (flLeft + flRight) / (flRight - flLeft), 0.0f,
0.0f, 2.0f * flZNear / (flTop - flBottom), (flTop + flBottom) / (flTop - flBottom), 0.0f,
0.0f, 0.0f, flZFar / (flZNear - flZFar), flZNear * flZFar / (flZNear - flZFar),
dst.Init((2.0f * float(flZNear)) / (flRight - flLeft), 0.0f, (flLeft + flRight) / (flRight - flLeft), 0.0f,
0.0f, 2.0f * float(flZNear) / (flTop - flBottom), (flTop + flBottom) / (flTop - flBottom), 0.0f,
0.0f, 0.0f, float(flZFar) / float(flZNear - flZFar), float(flZNear * flZFar / (flZNear - flZFar)),
0.0f, 0.0f, -1.0f, 0.0f);
}

6
r5dev/public/utility/utility.cpp
View File

@ -512,11 +512,11 @@ string Base64Decode(const string& svInput)
string UTF8Encode(const wstring& wsvInput)
{
string result;
int nLen = WideCharToMultiByte(CP_UTF8, 0, wsvInput.c_str(), wsvInput.length(), NULL, 0, NULL, NULL);
int nLen = WideCharToMultiByte(CP_UTF8, 0, wsvInput.c_str(), int(wsvInput.length()), NULL, 0, NULL, NULL);
if (nLen > 0)
{
result.resize(nLen);
WideCharToMultiByte(CP_UTF8, 0, wsvInput.c_str(), wsvInput.length(), &result[0], nLen, NULL, NULL);
WideCharToMultiByte(CP_UTF8, 0, wsvInput.c_str(), int(wsvInput.length()), &result[0], nLen, NULL, NULL);
}
return result;
}
@ -932,7 +932,7 @@ pair<vector<uint8_t>, string> PatternToMaskedBytes(const string& svInput)
}
else
{
vBytes.push_back(strtoul(pszCurrentByte, &pszCurrentByte, 16));
vBytes.push_back(uint8_t(strtoul(pszCurrentByte, &pszCurrentByte, 16)));
svMask += 'x';
}
}

4
r5dev/tier0/cpu.cpp
View File

@ -457,10 +457,10 @@ const CPUInformation& GetCPUInformation(void)
// Fixing: si.dwNumberOfProcessors is the number of logical processors according to experiments on i7, P4 and a DirectX sample (Aug'09).
// This is contrary to MSDN documentation on GetSystemInfo().
pi.m_nLogicalProcessors = si.dwNumberOfProcessors;
pi.m_nLogicalProcessors = uint8_t(si.dwNumberOfProcessors);
CpuTopology topo;
pi.m_nPhysicalProcessors = topo.NumberOfSystemCores();
pi.m_nPhysicalProcessors = uint8_t(topo.NumberOfSystemCores());
// Make sure I always report at least one, when running WinXP with the /ONECPU switch,
// it likes to report 0 processors for some reason.

2
r5dev/tier1/bitbuf.cpp
View File

@ -216,7 +216,7 @@ bool CBitRead::Seek(size_t nPosition)
}
m_pDataIn = (uint32 const*)pPartial;
m_nInBufWord >>= (nPosition & 31);
m_nBitsAvail = (nHead << 3) - (nPosition & 31);
m_nBitsAvail = int((nHead << 3) - (nPosition & 31));
}
else
{

2
r5dev/tier1/bitbuf.h
View File

@ -48,7 +48,7 @@ public:
////////////////////////////////////
uint32_t m_nInBufWord;
uint32_t m_nBitsAvail;
int m_nBitsAvail;
const uint32* m_pDataIn;
const uint32* m_pBufferEnd;
const uint32* m_pData;

41
r5dev/tier1/strtools.cpp
View File

@ -161,7 +161,7 @@ bool V_isspace(int c)
#endif
}
int V_StrTrim(char* pStr)
int64_t V_StrTrim(char* pStr)
{
char* pSource = pStr;
char* pDest = pStr;
@ -265,7 +265,7 @@ bool V_StringMatchesPattern(const char* pszSource, const char* pszPattern, int n
continue;
}
int nLength = 0;
size_t nLength = 0;
while ((*pszPattern) != '*' && (*pszPattern) != 0)
{
@ -278,7 +278,7 @@ bool V_StringMatchesPattern(const char* pszSource, const char* pszPattern, int n
const char* pszStartPattern = pszPattern - nLength;
const char* pszSearch = pszSource;
for (int i = 0; i < nLength; i++, pszSearch++, pszStartPattern++)
for (size_t i = 0; i < nLength; i++, pszSearch++, pszStartPattern++)
{
if ((*pszSearch) == 0)
{
@ -333,9 +333,9 @@ void V_FixSlashes(char* pName, char cSeperator /* = CORRECT_PATH_SEPARATOR */)
}
}
void V_AppendSlash(char* pStr, int strSize, char separator)
void V_AppendSlash(char* pStr, size_t strSize, char separator)
{
int len = V_strlen(pStr);
size_t len = V_strlen(pStr);
if (len > 0 && !PATHSEPARATOR(pStr[len - 1]))
{
if (len + 1 >= strSize)
@ -354,7 +354,7 @@ void V_StripTrailingSlash(char* ppath)
{
Assert(ppath);
int len = V_strlen(ppath);
size_t len = V_strlen(ppath);
if (len > 0)
{
if (PATHSEPARATOR(ppath[len - 1]))
@ -412,7 +412,7 @@ bool V_RemoveDotSlashes(char* pFilename, char separator)
*pOut = 0;
// Get rid of a trailing "/." (needless).
int len = V_strlen(pFilename);
size_t len = V_strlen(pFilename);
if (len > 2 && pFilename[len - 1] == '.' && PATHSEPARATOR(pFilename[len - 2]))
{
pFilename[len - 2] = 0;
@ -487,7 +487,7 @@ bool
#else
void
#endif
V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const char* pStartingDir)
V_MakeAbsolutePath(char* pOut, size_t outLen, const char* pPath, const char* pStartingDir)
{
if (V_IsAbsolutePath(pPath))
{
@ -547,14 +547,14 @@ V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const char* pStart
// maxlen -
// Output : Returns true on success, false on failure.
//-----------------------------------------------------------------------------
bool V_StripLastDir(char* dirName, int maxlen)
bool V_StripLastDir(char* dirName, size_t maxlen)
{
if (dirName[0] == 0 ||
!V_stricmp(dirName, "./") ||
!V_stricmp(dirName, ".\\"))
return false;
int len = V_strlen(dirName);
size_t len = V_strlen(dirName);
Assert(len < maxlen);
@ -627,7 +627,7 @@ const char* V_UnqualifiedFileName(const char* in)
// dest - buffer to compose result in
// destSize - size of destination buffer
//-----------------------------------------------------------------------------
void V_ComposeFileName(const char* path, const char* filename, char* dest, int destSize)
void V_ComposeFileName(const char* path, const char* filename, char* dest, size_t destSize)
{
V_strncpy(dest, path, destSize);
V_FixSlashes(dest);
@ -642,13 +642,16 @@ void V_ComposeFileName(const char* path, const char* filename, char* dest, int d
// *out -
// outSize -
//-----------------------------------------------------------------------------
void V_StripExtension(const char* in, char* out, int outSize)
void V_StripExtension(const char* in, char* out, size_t outSize)
{
// Find the last dot. If it's followed by a dot or a slash, then it's part of a
// directory specifier like ../../somedir/./blah.
if (!in || !in[0] || !outSize)
return;
// scan backward for '.'
int end = V_strlen(in) - 1;
size_t end = V_strlen(in) - 1;
while (end > 0 && in[end] != '.' && !PATHSEPARATOR(in[end]))
{
--end;
@ -656,7 +659,7 @@ void V_StripExtension(const char* in, char* out, int outSize)
if (end > 0 && !PATHSEPARATOR(in[end]) && end < outSize)
{
int nChars = MIN(end, outSize - 1);
size_t nChars = MIN(end, outSize - 1);
if (out != in)
{
memcpy(out, in, nChars);
@ -680,7 +683,7 @@ void V_StripExtension(const char* in, char* out, int outSize)
// destSize -
// Output : void V_ExtractFileExtension
//-----------------------------------------------------------------------------
void V_ExtractFileExtension(const char* path, char* dest, int destSize)
void V_ExtractFileExtension(const char* path, char* dest, size_t destSize)
{
*dest = 0;
const char* extension = V_GetFileExtension(path);
@ -696,7 +699,7 @@ void V_ExtractFileExtension(const char* path, char* dest, int destSize)
//-----------------------------------------------------------------------------
const char* V_GetFileExtension(const char* path)
{
int len = V_strlen(path);
size_t len = V_strlen(path);
if (len <= 1)
return NULL;
@ -724,7 +727,7 @@ const char* V_GetFileExtension(const char* path)
// *out -
// maxlen -
//-----------------------------------------------------------------------------
void V_FileBase(const char* in, char* out, int maxlen)
void V_FileBase(const char* in, char* out, size_t maxlen)
{
Assert(maxlen >= 1);
Assert(in);
@ -736,7 +739,7 @@ void V_FileBase(const char* in, char* out, int maxlen)
return;
}
int len, start, end;
size_t len, start, end;
len = V_strlen(in);
@ -775,7 +778,7 @@ void V_FileBase(const char* in, char* out, int maxlen)
// Length of new sting
len = end - start + 1;
int maxcopy = MIN(len + 1, maxlen);
size_t maxcopy = MIN(len + 1, maxlen);
// Copy partial string
V_strncpy(out, &in[start], maxcopy);

18
r5dev/tier1/strtools.h
View File

@ -65,7 +65,7 @@ const char* V_strnchr(const char* pStr, char c, int64_t n);
bool V_isspace(int c);
// Strip white space at the beginning and end of a string
int V_StrTrim(char* pStr);
int64_t V_StrTrim(char* pStr);
int V_UTF8ToUnicode(const char* pUTF8, wchar_t* pwchDest, int cubDestSizeInBytes);
int V_UnicodeToUTF8(const wchar_t* pUnicode, char* pUTF8, int cubDestSizeInBytes);
@ -83,7 +83,7 @@ void V_FixSlashes(char* pname, char separator = CORRECT_PATH_SEPARATOR);
// Adds a path separator to the end of the string if there isn't one already and the string is not empty.
// Triggers a fatal error if it would run out of space.
void V_AppendSlash(INOUT_Z_CAP(strSize) char* pStr, int strSize, char separator = CORRECT_PATH_SEPARATOR);
void V_AppendSlash(INOUT_Z_CAP(strSize) char* pStr, size_t strSize, char separator = CORRECT_PATH_SEPARATOR);
// Remove the final characters of ppath if it's '\' or '/'.
void V_StripTrailingSlash(char* ppath);
@ -104,8 +104,8 @@ bool
#else
void
#endif
V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const char* pStartingDir = NULL);
inline void V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const char* pStartingDir, bool bLowercaseName)
V_MakeAbsolutePath(char* pOut, size_t outLen, const char* pPath, const char* pStartingDir = NULL);
inline void V_MakeAbsolutePath(char* pOut, size_t outLen, const char* pPath, const char* pStartingDir, bool bLowercaseName)
{
V_MakeAbsolutePath(pOut, outLen, pPath, pStartingDir);
if (bLowercaseName)
@ -115,20 +115,20 @@ inline void V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const
}
// Remove the final directory from the path
bool V_StripLastDir(char* dirName, int maxlen);
bool V_StripLastDir(char* dirName, size_t maxlen);
// Returns a pointer to the unqualified file name (no path) of a file name
const char* V_UnqualifiedFileName(const char* in);
// Given a path and a filename, composes "path\filename", inserting the (OS correct) separator if necessary
void V_ComposeFileName(const char* path, const char* filename, char* dest, int destSize);
void V_ComposeFileName(const char* path, const char* filename, char* dest, size_t destSize);
// Remove any extension from in and return resulting string in out
void V_StripExtension(const char* in, char* out, int outLen);
void V_StripExtension(const char* in, char* out, size_t outLen);
// Copy out the file extension into dest
void V_ExtractFileExtension(const char* path, char* dest, int destSize);
void V_ExtractFileExtension(const char* path, char* dest, size_t destSize);
// Returns a pointer to the file extension or NULL if one doesn't exist
const char* V_GetFileExtension(const char* path);
// Extracts the base name of a file (no path, no extension, assumes '/' or '\' as path separator)
void V_FileBase(const char* in, OUT_Z_CAP(maxlen) char* out, int maxlen);
void V_FileBase(const char* in, OUT_Z_CAP(maxlen) char* out, size_t maxlen);

4
r5dev/tier1/utlstring.cpp
View File

@ -356,7 +356,7 @@ CUtlString &CUtlString::operator+=( char c )
{
Assert( !m_Storage.IsReadOnly() );
int nLength = Length();
int64 nLength = Length();
SetLength( nLength + 1 );
m_Storage[ nLength ] = c;
m_Storage[ nLength+1 ] = '\0';
@ -1088,7 +1088,7 @@ size_t CUtlStringBuilder::TrimWhitespace()
return 0;
char *pchString = m_data.Access();
int cChars = V_StrTrim(pchString);
int64 cChars = V_StrTrim(pchString);
if (cChars)
m_data.SetLength(cChars);

7
r5dev/vgui/vgui_debugpanel.cpp
View File

@ -94,18 +94,19 @@ void CTextOverlay::DrawNotify(void)
if (flTimeleft < 1.0f)
{
float f = clamp(flTimeleft, 0.0f, 1.0f) / 1.0f;
c[3] = static_cast<int>(f * 255.0f);
c[3] = int(f * 255.0f);
if (i == 0 && f < 0.2f)
{
y -= m_nFontHeight * (static_cast<float>(1.0f - f / 0.2f));
y -= int(m_nFontHeight * (float(1.0f - f / 0.2f)));
}
}
else
{
c[3] = 255;
}
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, v_Rui_GetFontFace(), m_nFontHeight, x, y, c.r(), c.g(), c.b(), c.a(), m_vNotifyText[i].m_svMessage.c_str());
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, v_Rui_GetFontFace(),
m_nFontHeight, x, y, c.r(), c.g(), c.b(), c.a(), m_vNotifyText[i].m_svMessage.c_str());
if (IsX360())
{

18
r5dev/vstdlib/callback.cpp
View File

@ -1080,8 +1080,8 @@ void Line_f(const CCommand& args)
Vector3D start, end;
for (int i = 0; i < 3; ++i)
{
start[i] = atof(args[i + 1]);
end[i] = atof(args[i + 4]);
start[i] = float(atof(args[i + 1]));
end[i] = float(atof(args[i + 4]));
}
g_pDebugOverlay->AddLineOverlay(start, end, 255, 255, 0, !r_debug_draw_depth_test->GetBool(), 100);
@ -1106,10 +1106,10 @@ void Sphere_f(const CCommand& args)
Vector3D start;
for (int i = 0; i < 3; ++i)
{
start[i] = atof(args[i + 1]);
start[i] = float(atof(args[i + 1]));
}
float radius = atof(args[4]);
float radius = float(atof(args[4]));
int theta = atoi(args[5]);
int phi = atoi(args[6]);
@ -1135,9 +1135,9 @@ void Capsule_f(const CCommand& args)
Vector3D start, end, radius;
for (int i = 0; i < 3; ++i)
{
start[i] = atof(args[i + 1]);
end[i] = atof(args[i + 4]);
radius[i] = atof(args[i + 7]);
start[i] = float(atof(args[i + 1]));
end[i] = float(atof(args[i + 4]));
radius[i] = float(atof(args[i + 7]));
}
g_pDebugOverlay->AddCapsuleOverlay(start, end, radius, { 0,0,0 }, { 0,0,0 }, 141, 233, 135, 0, 100);
}
@ -1166,11 +1166,11 @@ void BHit_f(const CCommand& args)
Vector3D vecAbsEnd;
for (int i = 0; i < 3; ++i)
vecAbsStart[i] = atof(args[i + 4]);
vecAbsStart[i] = float(atof(args[i + 4]));
QAngle vecBulletAngles;
for (int i = 0; i < 2; ++i)
vecBulletAngles[i] = atof(args[i + 7]);
vecBulletAngles[i] = float(atof(args[i + 7]));
vecBulletAngles.z = 180.f; // Flipped axis.
AngleVectors(vecBulletAngles, &vecAbsEnd);

8
r5dev/vstdlib/random.cpp
View File

@ -137,10 +137,10 @@ int CUniformRandomStream::GenerateRandomNumber()
float CUniformRandomStream::RandomFloat(float flLow, float flHigh)
{
// float in [0,1)
float fl = AM * GenerateRandomNumber();
float fl = float(AM) * GenerateRandomNumber();
if (fl > RNMX)
{
fl = RNMX;
fl = float(RNMX);
}
return (fl * (flHigh - flLow)) + flLow; // float in [low,high)
}
@ -148,10 +148,10 @@ float CUniformRandomStream::RandomFloat(float flLow, float flHigh)
float CUniformRandomStream::RandomFloatExp(float flMinVal, float flMaxVal, float flExponent)
{
// float in [0,1)
float fl = AM * GenerateRandomNumber();
float fl = float(AM) * GenerateRandomNumber();
if (fl > RNMX)
{
fl = RNMX;
fl = float(RNMX);
}
if (flExponent != 1.0f)
{