TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up MSVC warning [C4312] conversion from type to type * of greater size

Browse source
This commit is contained in:
suncaller 2019-02-02 23:09:55 -05:00
parent 265e64f6fc
commit 31d0eb16f8
21 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fx/particleEmitter.cpp
View file

@ -490,7 +490,7 @@ void ParticleEmitterData::unpackData(BitStream* stream)
#if defined(AFX_CAP_PARTICLE_POOLS) #if defined(AFX_CAP_PARTICLE_POOLS)
if (stream->readFlag()) if (stream->readFlag())
{ {
pool_datablock = (afxParticlePoolData*)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); pool_datablock = (afxParticlePoolData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
stream->read(&pool_index); stream->read(&pool_index);
pool_depth_fade = stream->readFlag(); pool_depth_fade = stream->readFlag();
pool_radial_fade = stream->readFlag(); pool_radial_fade = stream->readFlag();

2
Engine/source/T3D/shapeBase.cpp
View file

@ -3259,7 +3259,7 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream)
st.play = stream->readFlag(); st.play = stream->readFlag();
if ( st.play ) if ( st.play )
{ {
st.profile = (SFXTrack*) stream->readRangedU32( DataBlockObjectIdFirst, st.profile = (SFXTrack*)(uintptr_t)stream->readRangedU32( DataBlockObjectIdFirst,
DataBlockObjectIdLast ); DataBlockObjectIdLast );
} }

4
Engine/source/T3D/shapeImage.cpp
View file

@ -1202,7 +1202,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream)
} }
projectile = (stream->readFlag() ? projectile = (stream->readFlag() ?
(ProjectileData*)stream->readRangedU32(DataBlockObjectIdFirst, (ProjectileData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast) : 0); DataBlockObjectIdLast) : 0);
cloakable = stream->readFlag(); cloakable = stream->readFlag();
@ -1340,7 +1340,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream)
if (stream->readFlag()) if (stream->readFlag())
{ {
s.emitter = (ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst, s.emitter = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
stream->read(&s.emitterTime); stream->read(&s.emitterTime);

4
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -282,14 +282,14 @@ void FlyingVehicleData::unpackData(BitStream* stream)
for (S32 i = 0; i < MaxSounds; i++) { for (S32 i = 0; i < MaxSounds; i++) {
sound[i] = NULL; sound[i] = NULL;
if (stream->readFlag()) if (stream->readFlag())
sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst, sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
} }
for (S32 j = 0; j < MaxJetEmitters; j++) { for (S32 j = 0; j < MaxJetEmitters; j++) {
jetEmitter[j] = NULL; jetEmitter[j] = NULL;
if (stream->readFlag()) if (stream->readFlag())
jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst, jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
} }

4
Engine/source/T3D/vehicles/hoverVehicle.cpp
View file

@ -411,13 +411,13 @@ void HoverVehicleData::unpackData(BitStream* stream)
for (S32 i = 0; i < MaxSounds; i++) for (S32 i = 0; i < MaxSounds; i++)
sound[i] = stream->readFlag()? sound[i] = stream->readFlag()?
(SFXProfile*) stream->readRangedU32(DataBlockObjectIdFirst, (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast): 0; DataBlockObjectIdLast): 0;
for (S32 j = 0; j < MaxJetEmitters; j++) { for (S32 j = 0; j < MaxJetEmitters; j++) {
jetEmitter[j] = NULL; jetEmitter[j] = NULL;
if (stream->readFlag()) if (stream->readFlag())
jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst, jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
} }

2
Engine/source/T3D/vehicles/vehicle.cpp
View file

@ -374,7 +374,7 @@ void VehicleData::unpackData(BitStream* stream)
for (i = 0; i < Body::MaxSounds; i++) { for (i = 0; i < Body::MaxSounds; i++) {
body.sound[i] = NULL; body.sound[i] = NULL;
if (stream->readFlag()) if (stream->readFlag())
body.sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst, body.sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast); DataBlockObjectIdLast);
} }

2
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -494,7 +494,7 @@ void WheeledVehicleData::unpackData(BitStream* stream)
Parent::unpackData(stream); Parent::unpackData(stream);
tireEmitter = stream->readFlag()? tireEmitter = stream->readFlag()?
(ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst, (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
DataBlockObjectIdLast): 0; DataBlockObjectIdLast): 0;
for (S32 i = 0; i < MaxSounds; i++) for (S32 i = 0; i < MaxSounds; i++)

2
Engine/source/afx/afxEffectGroup.cpp
View file

@ -133,7 +133,7 @@ void afxEffectGroupData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear(); fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
for (int i = 0; i < n_fx; i++) for (int i = 0; i < n_fx; i++)
fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
} }
#define myOffset(field) Offset(field, afxEffectGroupData) #define myOffset(field) Offset(field, afxEffectGroupData)

2
Engine/source/afx/afxEffectWrapper.cpp
View file

@ -608,7 +608,7 @@ void afxEffectWrapperData::unpack_mods(BitStream* stream, afxXM_BaseData* mods[]
{ {
S32 n_mods = stream->readInt(6); S32 n_mods = stream->readInt(6);
for (int i = 0; i < n_mods; i++) for (int i = 0; i < n_mods; i++)
mods[i] = (afxXM_BaseData*) readDatablockID(stream); mods[i] = (afxXM_BaseData*)(uintptr_t)readDatablockID(stream);
} }
bool afxEffectWrapperData::preload(bool server, String &errorStr) bool afxEffectWrapperData::preload(bool server, String &errorStr)

2
Engine/source/afx/afxEffectron.cpp
View file

@ -147,7 +147,7 @@ void afxEffectronData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear(); fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
for (int i = 0; i < n_fx; i++) for (int i = 0; i < n_fx; i++)
fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
} }
void afxEffectronData::packData(BitStream* stream) void afxEffectronData::packData(BitStream* stream)

4
Engine/source/afx/afxMagicSpell.cpp
View file

@ -304,7 +304,7 @@ void afxMagicSpellData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear(); fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
for (int i = 0; i < n_fx; i++) for (int i = 0; i < n_fx; i++)
fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
} }
void afxMagicSpellData::packData(BitStream* stream) void afxMagicSpellData::packData(BitStream* stream)
@ -356,7 +356,7 @@ void afxMagicSpellData::unpackData(BitStream* stream)
mDo_move_interrupts = stream->readFlag(); mDo_move_interrupts = stream->readFlag();
stream->read(&mMove_interrupt_speed); stream->read(&mMove_interrupt_speed);
mMissile_db = (afxMagicMissileData*) readDatablockID(stream); mMissile_db = (afxMagicMissileData*)(uintptr_t)readDatablockID(stream);
stream->read(&mLaunch_on_server_signal); stream->read(&mLaunch_on_server_signal);
stream->read(&mPrimary_target_types); stream->read(&mPrimary_target_types);

2
Engine/source/afx/afxSelectron.cpp
View file

@ -214,7 +214,7 @@ void afxSelectronData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear(); fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
for (int i = 0; i < n_fx; i++) for (int i = 0; i < n_fx; i++)
fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
} }
void afxSelectronData::packData(BitStream* stream) void afxSelectronData::packData(BitStream* stream)

2
Engine/source/afx/afxSpellBook.cpp
View file

@ -128,7 +128,7 @@ void afxSpellBookData::unpackData(BitStream* stream)
do_id_convert = true; do_id_convert = true;
for (S32 i = 0; i < pages_per_book*spells_per_page; i++) for (S32 i = 0; i < pages_per_book*spells_per_page; i++)
rpg_spells[i] = (afxRPGMagicSpellData*) readDatablockID(stream); rpg_spells[i] = (afxRPGMagicSpellData*)(uintptr_t)readDatablockID(stream);
} }
DefineEngineMethod(afxSpellBookData, getPageSlotIndex, S32, (Point2I bookSlot),, DefineEngineMethod(afxSpellBookData, getPageSlotIndex, S32, (Point2I bookSlot),,

4
Engine/source/afx/ce/afxLightBase_T3D.cpp
View file

@ -195,8 +195,8 @@ void afxT3DLightBaseData::unpackData(BitStream* stream)
stream->read( &mAnimState.animationPhase ); stream->read( &mAnimState.animationPhase );
stream->read( &mFlareScale ); stream->read( &mFlareScale );
mAnimationData = (LightAnimData*) readDatablockID(stream); mAnimationData = (LightAnimData*)(uintptr_t)readDatablockID(stream);
mFlareData = (LightFlareData*) readDatablockID(stream); mFlareData = (LightFlareData*)(uintptr_t)readDatablockID(stream);
do_id_convert = true; do_id_convert = true;
} }

2
Engine/source/afx/ce/afxPhraseEffect.cpp
View file

@ -215,7 +215,7 @@ void afxPhraseEffectData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear(); fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
for (int i = 0; i < n_fx; i++) for (int i = 0; i < n_fx; i++)
fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
} }
void afxPhraseEffectData::packData(BitStream* stream) void afxPhraseEffectData::packData(BitStream* stream)

8
Engine/source/forest/editor/forestUndo.cpp
View file

@ -55,7 +55,7 @@ void ForestCreateUndoAction::addItem( ForestItemData *data,
// We store the datablock ID rather than the actual pointer // We store the datablock ID rather than the actual pointer
// since the pointer could go bad. // since the pointer could go bad.
SimObjectId dataId = item.getData()->getId(); SimObjectId dataId = item.getData()->getId();
mItems.last().setData( (ForestItemData*)dataId ); mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
} }
void ForestCreateUndoAction::redo() void ForestCreateUndoAction::redo()
@ -110,7 +110,7 @@ void ForestDeleteUndoAction::removeItem( const ForestItem &item )
SimObjectId dataId = item.getData()->getId(); SimObjectId dataId = item.getData()->getId();
mItems.push_back( item ); mItems.push_back( item );
mItems.last().setData( (ForestItemData*)dataId ); mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
mData->removeItem( item.getKey(), item.getPosition() ); mData->removeItem( item.getKey(), item.getPosition() );
} }
@ -171,7 +171,7 @@ void ForestUpdateAction::saveItem( const ForestItem &item )
// We store the datablock ID rather than the actual pointer // We store the datablock ID rather than the actual pointer
// since the pointer could go bad. // since the pointer could go bad.
SimObjectId dataId = item.getData()->getId(); SimObjectId dataId = item.getData()->getId();
mItems.last().setData( (ForestItemData*)dataId ); mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
} }
void ForestUpdateAction::_swapState() void ForestUpdateAction::_swapState()
@ -215,7 +215,7 @@ void ForestUpdateAction::_swapState()
item.getScale() ); item.getScale() );
// Save the state before this swap for the next swap. // Save the state before this swap for the next swap.
newItem.setData( (ForestItemData*)data->getId() ); newItem.setData( (ForestItemData*)(uintptr_t)data->getId() );
mItems.push_back( newItem ); mItems.push_back( newItem );
} }

4
Engine/source/gfx/gfxStringEnumTranslate.cpp
View file

@ -77,11 +77,11 @@ _STRING_VALUE_LOOKUP_FXN(GFXStringBlendOp);
#define INIT_LOOKUPTABLE( tablearray, enumprefix, type ) \ #define INIT_LOOKUPTABLE( tablearray, enumprefix, type ) \
for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \
tablearray[i] = (type)GFX_UNINIT_VAL; tablearray[i] = (type)(uintptr_t)GFX_UNINIT_VAL;
#define INIT_LOOKUPTABLE_EX( tablearray, enumprefix, type, typeTable ) \ #define INIT_LOOKUPTABLE_EX( tablearray, enumprefix, type, typeTable ) \
for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \
{\ {\
tablearray[i] = (type)GFX_UNINIT_VAL;\ tablearray[i] = (type)(uintptr_t)GFX_UNINIT_VAL;\
typeTable[i] = &defaultStringValueLookup;\ typeTable[i] = &defaultStringValueLookup;\
} }

2
Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp
View file

@ -131,7 +131,7 @@ void GFXGLPrimitiveBuffer::finish()
GLvoid* GFXGLPrimitiveBuffer::getBuffer() GLvoid* GFXGLPrimitiveBuffer::getBuffer()
{ {
// NULL specifies no offset into the hardware buffer // NULL specifies no offset into the hardware buffer
return (GLvoid*)mBufferOffset; return (GLvoid*)(uintptr_t)mBufferOffset;
} }
void GFXGLPrimitiveBuffer::zombify() void GFXGLPrimitiveBuffer::zombify()

18
Engine/source/gfx/gl/gfxGLVertexDecl.cpp
View file

@ -130,7 +130,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -141,7 +141,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -152,7 +152,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -163,7 +163,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -174,7 +174,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -185,7 +185,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = true; glElement.normalized = true;
glElement.type = GL_UNSIGNED_BYTE; glElement.type = GL_UNSIGNED_BYTE;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -196,7 +196,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -207,7 +207,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_UNSIGNED_BYTE; glElement.type = GL_UNSIGNED_BYTE;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
} }
@ -221,7 +221,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream)
glElement.normalized = false; glElement.normalized = false;
glElement.type = GL_FLOAT; glElement.type = GL_FLOAT;
glElement.stride = vertexSize; glElement.stride = vertexSize;
glElement.pointerFirst = (void*)buffer; glElement.pointerFirst = (void*)(uintptr_t)buffer;
buffer += element.getSizeInBytes(); buffer += element.getSizeInBytes();
++texCoordIndex; ++texCoordIndex;

4
Engine/source/gui/controls/guiListBoxCtrl.cpp
View file

@ -631,7 +631,7 @@ DefineEngineMethod( GuiListBoxCtrl, addItem, S32, (const char* newItem, const ch
else if(elementCount == 1) else if(elementCount == 1)
{ {
U32 objId = dAtoi( color ); U32 objId = dAtoi( color );
return object->addItem( newItem, (void*)objId ); return object->addItem( newItem, (void*)(uintptr_t)objId );
} }
else else
{ {
@ -1523,7 +1523,7 @@ void GuiListBoxCtrl::_mirror()
if ( !found ) if ( !found )
{ {
addItem( _makeMirrorItemName( curObj ), (void*)curId ); addItem( _makeMirrorItemName( curObj ), (void*)(uintptr_t)curId );
} }
} }
} }

2
Engine/source/ts/loader/tsShapeLoader.cpp
View file

@ -412,7 +412,7 @@ void TSShapeLoader::generateObjects()
AppMesh* mesh = subshape->objMeshes[iMesh]; AppMesh* mesh = subshape->objMeshes[iMesh];
mesh->detailSize = 2; mesh->detailSize = 2;
String name = String::GetTrailingNumber( mesh->getName(), mesh->detailSize ); String name = String::GetTrailingNumber( mesh->getName(), mesh->detailSize );
name = getUniqueName( name, cmpMeshNameAndSize, meshNames, &(subshape->objMeshes), (void*)mesh->detailSize ); name = getUniqueName( name, cmpMeshNameAndSize, meshNames, &(subshape->objMeshes), (void*)(uintptr_t)mesh->detailSize );
meshNames.push_back( name ); meshNames.push_back( name );
// Fix up any collision details that don't have a negative detail level. // Fix up any collision details that don't have a negative detail level.