Fix Mapbase compilation on Linux/64bit

This commit is contained in:
ALLEN-PC\acj30 2025-03-02 11:06:16 -06:00
parent 14b5256b27
commit 524c46a8fb
5 changed files with 9 additions and 9 deletions

View File

@ -4556,7 +4556,7 @@ void CClientShadowMgr::ComputeShadowDepthTextures( const CViewSetup &viewSetup )
#ifdef MAPBASE
if ( j <= ( INT_FLASHLIGHT_DEPTHTEXTURE_FALLBACK_LAST - INT_FLASHLIGHT_DEPTHTEXTURE_FALLBACK_FIRST ) )
{
pRenderContext->SetIntRenderingParameter( INT_FLASHLIGHT_DEPTHTEXTURE_FALLBACK_FIRST + j, int((ITexture*)shadowDepthTexture) );
pRenderContext->SetIntRenderingParameter( INT_FLASHLIGHT_DEPTHTEXTURE_FALLBACK_FIRST + j, intp((ITexture*)shadowDepthTexture) );
FlashlightState_t state = shadowmgr->GetFlashlightState( shadow.m_ShadowHandle );

View File

@ -9060,7 +9060,7 @@ void CBaseEntity::InputRemoveOutput( inputdata_t& inputdata )
// If our names match, remove
if (Matcher_NamesMatch(szOutput, dataDesc->externalName))
{
CBaseEntityOutput *pOutput = (CBaseEntityOutput *)((int)this + (int)dataDesc->fieldOffset[0]);
CBaseEntityOutput *pOutput = (CBaseEntityOutput *)((intp)this + (int)dataDesc->fieldOffset[0]);
pOutput->DeleteAllElements();
}
}
@ -9122,7 +9122,7 @@ void CBaseEntity::InputReplaceOutput( inputdata_t& inputdata )
// If our names match, replace
if (Matcher_NamesMatch(szOutput, dataDesc->externalName))
{
CBaseEntityOutput *pOutput = (CBaseEntityOutput *)((int)this + (int)dataDesc->fieldOffset[0]);
CBaseEntityOutput *pOutput = (CBaseEntityOutput *)((intp)this + (int)dataDesc->fieldOffset[0]);
const char *szTarget;
const char *szInputName;
const char *szParam;

View File

@ -819,7 +819,7 @@ void CNPC_Citizen::SelectModel()
// model_path, model_head, gender
ScriptVariant_t args[] = { pszModelPath, pszModelName, (int)scriptGender };
ScriptVariant_t returnValue = NULL;
ScriptVariant_t returnValue = 0;
g_Hook_SelectModel.Call( m_ScriptScope, &returnValue, args );
if (returnValue.m_type == FIELD_CSTRING && returnValue.m_pszString[0] != '\0')

View File

@ -70,7 +70,7 @@ void variant_t::SetScriptVariant( ScriptVariant_t &var )
{
switch (FieldType())
{
case FIELD_VOID: var = NULL; break;
case FIELD_VOID: var.Free(); break;
case FIELD_INTEGER: var = iVal; break;
case FIELD_FLOAT: var = flVal; break;
case FIELD_STRING: var = STRING(iszVal); break;

View File

@ -3685,7 +3685,7 @@ void SquirrelVM::WriteObject( const SQObjectPtr &obj, CUtlBuffer* pBuffer, Write
WriteObject( ci->_closure, pBuffer, writeState );
int offset = (int)ci->_ip - (int)ci->_closure._unVal.pClosure->_function->_instructions;
int offset = (intp)ci->_ip - (intp)ci->_closure._unVal.pClosure->_function->_instructions;
pBuffer->PutInt( offset );
pBuffer->PutInt( ci->_etraps );
pBuffer->PutInt( ci->_prevstkbase );
@ -3741,7 +3741,7 @@ void SquirrelVM::WriteObject( const SQObjectPtr &obj, CUtlBuffer* pBuffer, Write
Assert( ci._ip && ci._ip >= ci._closure._unVal.pClosure->_function->_instructions );
Assert( pThis->_etraps.size() >= (SQUnsignedInteger)ci._etraps );
int offset = (int)ci._ip - (int)ci._closure._unVal.pClosure->_function->_instructions;
int offset = (intp)ci._ip - (intp)ci._closure._unVal.pClosure->_function->_instructions;
pBuffer->PutInt( offset );
pBuffer->PutInt( ci._etraps );
pBuffer->PutInt( ci._prevstkbase );
@ -4332,7 +4332,7 @@ void SquirrelVM::ReadObject( SQObjectPtr &pObj, CUtlBuffer* pBuffer, ReadStateMa
int offset = pBuffer->GetInt();
int funcsize = sizeof(SQInstruction) * closure._unVal.pClosure->_function->_ninstructions;
int start = (int)(closure._unVal.pClosure->_function->_instructions);
int start = (intp)(closure._unVal.pClosure->_function->_instructions);
int pos = start + offset;
ci->_ip = (SQInstruction*)pos;
@ -4413,7 +4413,7 @@ void SquirrelVM::ReadObject( SQObjectPtr &pObj, CUtlBuffer* pBuffer, ReadStateMa
int offset = pBuffer->GetInt();
int funcsize = sizeof(SQInstruction) * closure._unVal.pClosure->_function->_ninstructions;
int start = (int)(closure._unVal.pClosure->_function->_instructions);
int start = (intp)(closure._unVal.pClosure->_function->_instructions);
int pos = start + offset;
ci._ip = (SQInstruction*)pos;