q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-29 21:25:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix pointer truncation on 64-bit

Browse Source 
Use size_t instead of int for arithmetic on pointers, to avoid

truncation on ILP64 architectures (like amd64).
This commit is contained in:
Steven Chamberlain 2016-04-05 03:09:51 +01:00 committed by Ryan C. Gordon
parent 26f1a33749
commit 3adda272b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Engine/Sound/SoundObject.cpp
View File

@ -147,7 +147,7 @@ void CSoundObject::Set3DParameters( FLOAT fFalloff, FLOAT fHotSpot,
//CPrintF("SET3D: "); //CPrintF("SET3D: ");
CEntity *pen = so_penEntity->GetPredictionTail(); CEntity *pen = so_penEntity->GetPredictionTail();
if (pen!=so_penEntity) { if (pen!=so_penEntity) {
pso = (CSoundObject *)( ((UBYTE*)pen) + (int(this)-int(so_penEntity)) ); pso = (CSoundObject *)( ((UBYTE*)pen) + (size_t(this)-size_t(so_penEntity)) );
} }
} }
} }
@ -175,7 +175,7 @@ CSoundObject *CSoundObject::GetPredictionTail(ULONG ulTypeID, ULONG ulEventID)
// it must not play the sound // it must not play the sound
return NULL; return NULL;
} }
SLONG slOffset = int(this)-int(so_penEntity); SLONG slOffset = size_t(this)-size_t(so_penEntity);
ULONG ulCRC; ULONG ulCRC;
CRC_Start(ulCRC); CRC_Start(ulCRC);