TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #548 from asmaloney/more_fixes

Browse source 
More fixes
This commit is contained in:
Thomas Fischer 2014-03-15 15:14:11 +01:00
parent 835649aa2f d63b820e35
commit 022b15720b
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/physics/physx/pxMultiActor.cpp
View file

@ -527,7 +527,7 @@ bool PxMultiActorData::preload( bool server, String &errorBuffer )
return false;
}
if (!shapeName || shapeName == '\0')
if (!shapeName || shapeName[0] == '\0')
{
errorBuffer = "PxMultiActorDatas::preload: no shape name!";
return false;

2
Engine/source/environment/meshRoad.cpp
View file

@ -1074,7 +1074,7 @@ void MeshRoad::unpackUpdate(NetConnection * con, BitStream * stream)
stream->read( &mMaterialName[i] );
if ( !Sim::findObject( mMaterialName[i], pMat ) )
Con::printf( "DecalRoad::unpackUpdate, failed to find Material of name &s!", mMaterialName[i].c_str() );
Con::printf( "DecalRoad::unpackUpdate, failed to find Material of name %s", mMaterialName[i].c_str() );
else
mMaterial[i] = pMat;
}

6
Engine/source/environment/skyBox.cpp
View file

@ -400,7 +400,11 @@ void SkyBox::_initRender()
}
GFXVertexPNTT *vertPtr = mVB.lock();
if(!vertPtr) return;
if (!vertPtr)
{
delete[] tmpVerts;
return;
}
dMemcpy( vertPtr, tmpVerts, sizeof ( GFXVertexPNTT ) * vertCount );

2
Engine/source/gfx/gfxFormatUtils.cpp
View file

@ -81,7 +81,7 @@ void GFXCopyPixels( GFXFormat fromFormat, U32 fromWidth, U32 fromHeight, U8* fr
{
if( fromFormat == toFormat
&& fromWidth == toWidth
&& fromHeight == fromHeight )
&& fromHeight == toHeight )
dMemcpy( toData, fromData, fromWidth * fromHeight * GFXFormatInfo( fromFormat ).getBytesPerPixel() );
else
{