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

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/afx/afxEffectGroup.cpp
View file

@ -133,7 +133,7 @@ void afxEffectGroupData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
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)

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);
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)

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

@ -147,7 +147,7 @@ void afxEffectronData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
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)

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

@ -304,7 +304,7 @@ void afxMagicSpellData::unpack_fx(BitStream* stream, afxEffectList& fx)
fx.clear();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
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)
@ -356,7 +356,7 @@ void afxMagicSpellData::unpackData(BitStream* stream)
mDo_move_interrupts = stream->readFlag();
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(&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();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
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)

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

@ -128,7 +128,7 @@ void afxSpellBookData::unpackData(BitStream* stream)
do_id_convert = true;
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),,

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( &mFlareScale );
mAnimationData = (LightAnimData*) readDatablockID(stream);
mFlareData = (LightFlareData*) readDatablockID(stream);
mAnimationData = (LightAnimData*)(uintptr_t)readDatablockID(stream);
mFlareData = (LightFlareData*)(uintptr_t)readDatablockID(stream);
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();
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
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)