From 8932ee5f7c72e4029c8ebd631ea3feeaffecfa4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Sat, 1 Feb 2014 10:06:05 +0200 Subject: [PATCH] Fixed|libcommon|64-bit: Casts from integer to pointer Use the INT2PTR() macro to make casts with the correct integer sizes. --- doomsday/plugins/common/src/p_saveg.cpp | 12 ++++++------ doomsday/plugins/hexen/src/acscript.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doomsday/plugins/common/src/p_saveg.cpp b/doomsday/plugins/common/src/p_saveg.cpp index c03c80e50d..3ad73481d3 100644 --- a/doomsday/plugins/common/src/p_saveg.cpp +++ b/doomsday/plugins/common/src/p_saveg.cpp @@ -1434,7 +1434,7 @@ static void SV_ReadPlayer(player_t *p, Reader *reader) { pspdef_t *psp = &p->pSprites[i]; - psp->state = (state_t *) Reader_ReadInt32(reader); + psp->state = INT2PTR(state_t, Reader_ReadInt32(reader)); psp->tics = Reader_ReadInt32(reader); psp->pos[VX] = FIX2FLT(Reader_ReadInt32(reader)); psp->pos[VY] = FIX2FLT(Reader_ReadInt32(reader)); @@ -1950,7 +1950,7 @@ static int SV_ReadMobj(thinker_t *th, Reader *reader, int /*mapVersion*/) mo->ddFlags |= DDMF_DONTDRAW; mo->tics = Reader_ReadInt32(reader); // state tic counter - mo->state = (state_t *) Reader_ReadInt32(reader); + mo->state = INT2PTR(state_t, Reader_ReadInt32(reader)); #if __JHEXEN__ mo->damage = Reader_ReadInt32(reader); @@ -1998,7 +1998,7 @@ static int SV_ReadMobj(thinker_t *th, Reader *reader, int /*mapVersion*/) mo->moveCount = Reader_ReadInt32(reader); // when 0, select a new dir #if __JHEXEN__ - mo->target = (mobj_t *) Reader_ReadInt32(reader); + mo->target = INT2PTR(mobj_t, Reader_ReadInt32(reader)); #endif // Reaction time: if non 0, don't attack yet. @@ -2011,7 +2011,7 @@ static int SV_ReadMobj(thinker_t *th, Reader *reader, int /*mapVersion*/) // Additional info record for player avatars only. // Only valid if type == MT_PLAYER - mo->player = (player_t *) Reader_ReadInt32(reader); + mo->player = INT2PTR(player_t, Reader_ReadInt32(reader)); // Player number last looked for. mo->lastLook = Reader_ReadInt32(reader); @@ -2098,10 +2098,10 @@ static int SV_ReadMobj(thinker_t *th, Reader *reader, int /*mapVersion*/) #if __JHEXEN__ if(ver >= 4) - mo->tracer = (mobj_t *) Reader_ReadInt32(reader); + mo->tracer = INT2PTR(mobj_t, Reader_ReadInt32(reader)); if(ver >= 4) - mo->lastEnemy = (mobj_t *) Reader_ReadInt32(reader); + mo->lastEnemy = INT2PTR(mobj_t, Reader_ReadInt32(reader)); #else if(ver >= 5) mo->floorClip = FIX2FLT(Reader_ReadInt32(reader)); diff --git a/doomsday/plugins/hexen/src/acscript.cpp b/doomsday/plugins/hexen/src/acscript.cpp index cd9636b4ae..8faa124acf 100644 --- a/doomsday/plugins/hexen/src/acscript.cpp +++ b/doomsday/plugins/hexen/src/acscript.cpp @@ -1751,7 +1751,7 @@ int ACScript::read(Reader *reader, int mapVersion) // Note: the thinker class byte has already been read. int ver = Reader_ReadByte(reader); // version byte. - activator = (mobj_t *) Reader_ReadInt32(reader); + activator = INT2PTR(mobj_t, Reader_ReadInt32(reader)); activator = SV_GetArchiveThing(PTR2INT(activator), &activator); int temp = Reader_ReadInt32(reader); @@ -1794,7 +1794,7 @@ int ACScript::read(Reader *reader, int mapVersion) Reader_Read(reader, junk, 16); // Start of used data members. - activator = (mobj_t *) Reader_ReadInt32(reader); + activator = INT2PTR(mobj_t, Reader_ReadInt32(reader)); activator = SV_GetArchiveThing(PTR2INT(activator), &activator); int temp = Reader_ReadInt32(reader);