TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #310 from thecelloman/goodbyeDIF

Browse source 
Remove Interior Object format (DIF)
This commit is contained in:
David Wyand 2013-04-20 13:44:11 -07:00
commit 2dcc7f0247
99 changed files with 76 additions and 17318 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,6 @@ const F32 sAnchorMaxDistance = 32.0f;
//
static U32 sCollisionMoveMask = TerrainObjectType |
InteriorObjectType |
WaterObjectType |
PlayerObjectType |
StaticShapeObjectType |
@ -3494,8 +3493,7 @@ void Player::updateDeathOffsets()
//----------------------------------------------------------------------------
static const U32 sPlayerConformMask = InteriorObjectType|StaticShapeObjectType|
StaticObjectType|TerrainObjectType;
static const U32 sPlayerConformMask = StaticShapeObjectType | StaticObjectType | TerrainObjectType;
static void accel(F32& from, F32 to, F32 rate)
{