mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-07 17:29:36 +00:00
fpersmissive fixes
This commit is contained in:
@@ -1098,10 +1098,10 @@ void CBaseClient::EndTrace( bf_write &msg )
|
||||
}
|
||||
|
||||
if ( sv_netspike_output.GetInt() & 1 )
|
||||
COM_LogString( SERVER_PACKETS_LOG, logData.String() );
|
||||
COM_LogString( SERVER_PACKETS_LOG, (const char*)logData.String() );
|
||||
if ( sv_netspike_output.GetInt() & 2 )
|
||||
Log( "%s", logData.String() );
|
||||
ETWMark1S( "netspike", logData.String() );
|
||||
Log( "%s", (const char*)logData.String() );
|
||||
ETWMark1S( "netspike", (const char*)logData.String() );
|
||||
m_Trace.m_Records.RemoveAll();
|
||||
m_iTracing = 0;
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ void CM_CreateDispPhysCollide( dphysdisp_t *pDispLump, int dispLumpSize )
|
||||
{
|
||||
g_VirtualTerrain.LevelInit(pDispLump, dispLumpSize);
|
||||
g_TerrainList.SetCount( g_DispCollTreeCount );
|
||||
for ( int i = 0; i < g_DispCollTreeCount; i++ )
|
||||
for ( intp i = 0; i < g_DispCollTreeCount; i++ )
|
||||
{
|
||||
// Don't create a physics collision model for displacements that have been tagged as such.
|
||||
CDispCollTree *pDispTree = &g_pDispCollTrees[i];
|
||||
|
||||
@@ -39,7 +39,7 @@ void EncodeFloat( const SendProp *pProp, float fVal, bf_write *pOut, int objectI
|
||||
}
|
||||
else // standard clamped-range float
|
||||
{
|
||||
unsigned long ulVal;
|
||||
unsigned int ulVal;
|
||||
int nBits = pProp->m_nBits;
|
||||
if ( flags & SPROP_NOSCALE )
|
||||
{
|
||||
@@ -109,7 +109,7 @@ static float DecodeFloat(SendProp const *pProp, bf_read *pIn)
|
||||
}
|
||||
else // standard clamped-range float
|
||||
{
|
||||
unsigned long dwInterp = pIn->ReadUBitLong(pProp->m_nBits);
|
||||
unsigned int dwInterp = pIn->ReadUBitLong(pProp->m_nBits);
|
||||
float fVal = (float)dwInterp / ((1 << pProp->m_nBits) - 1);
|
||||
fVal = pProp->m_fLowValue + (pProp->m_fHighValue - pProp->m_fLowValue) * fVal;
|
||||
return fVal;
|
||||
@@ -281,7 +281,7 @@ void Int_Decode( DecodeInfo *pInfo )
|
||||
{
|
||||
if ( flags & SPROP_UNSIGNED )
|
||||
{
|
||||
pInfo->m_Value.m_Int = (long)pInfo->m_pIn->ReadVarInt32();
|
||||
pInfo->m_Value.m_Int = (int)pInfo->m_pIn->ReadVarInt32();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -295,7 +295,7 @@ void Int_Decode( DecodeInfo *pInfo )
|
||||
|
||||
if( bits != 32 && (flags & SPROP_UNSIGNED) == 0 )
|
||||
{
|
||||
unsigned long highbit = 1ul << (pProp->m_nBits - 1);
|
||||
unsigned int highbit = 1ul << (pProp->m_nBits - 1);
|
||||
if ( pInfo->m_Value.m_Int & highbit )
|
||||
{
|
||||
pInfo->m_Value.m_Int -= highbit; // strip high bit...
|
||||
|
||||
@@ -310,12 +310,12 @@ int CSaveRestoreFileSystem::GetFileIndex( const char *filename )
|
||||
|
||||
FileHandle_t CSaveRestoreFileSystem::GetFileHandle( const char *filename )
|
||||
{
|
||||
int idx = GetFileIndex( filename );
|
||||
intp idx = GetFileIndex( filename );
|
||||
if ( idx == INVALID_INDEX )
|
||||
{
|
||||
idx = 0;
|
||||
}
|
||||
return (void*)idx;
|
||||
return (FileHandle_t)idx;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -339,7 +339,7 @@ bool CSaveRestoreFileSystem::HandleIsValid( FileHandle_t hFile )
|
||||
//-----------------------------------------------------------------------------
|
||||
void CSaveRestoreFileSystem::RenameFile( char const *pOldPath, char const *pNewPath, const char *pathID )
|
||||
{
|
||||
int idx = GetFileIndex( pOldPath );
|
||||
intp idx = GetFileIndex( pOldPath );
|
||||
if ( idx != INVALID_INDEX )
|
||||
{
|
||||
CUtlSymbol newID = AddString( Q_UnqualifiedFileName( pNewPath ) );
|
||||
@@ -369,7 +369,7 @@ FileHandle_t CSaveRestoreFileSystem::Open( const char *pFullName, const char *pO
|
||||
{
|
||||
SaveFile_t *pFile = NULL;
|
||||
CUtlSymbol id = AddString( Q_UnqualifiedFileName( pFullName ) );
|
||||
int idx = GetDirectory().Find( id );
|
||||
intp idx = GetDirectory().Find( id );
|
||||
if ( idx == INVALID_INDEX )
|
||||
{
|
||||
// Don't create a read-only file
|
||||
|
||||
@@ -75,6 +75,7 @@
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
#include "tier0/memalloc.h"
|
||||
|
||||
extern CNetworkStringTableContainer *networkStringTableContainerServer;
|
||||
extern CNetworkStringTableContainer *networkStringTableContainerClient;
|
||||
|
||||
@@ -100,6 +100,7 @@
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
#include "tier0/memalloc.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Globals
|
||||
|
||||
Reference in New Issue
Block a user