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 #332 from tdev/beamng

Browse source 
some small patches
This commit is contained in:
SilentMike 2013-04-17 16:48:10 -07:00
parent 38a1eca0be ffc1ee829b
commit 57d92d522e
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -726,6 +726,7 @@ ParticleEmitter::ParticleEmitter()
mCurBuffSize = 0;
mDead = false;
mDataBlock = NULL;
// ParticleEmitter should be allocated on the client only.
mNetFlags.set( IsGhost );

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

@ -958,6 +958,7 @@ ShapeBase::~ShapeBase()
if( mShapeInstance && (mShapeInstance->getDebrisRefCount() == 0) )
{
delete mShapeInstance;
mShapeInstance = NULL;
}
CollisionTimeout* ptr = mTimeoutList;

19
Engine/source/app/mainLoop.cpp
View file

@ -241,6 +241,16 @@ void StandardMainLoop::init()
DebugOutputConsumer::init();
#endif
// init Filesystem first, so we can actually log errors for all components that follow
Platform::FS::InstallFileSystems(); // install all drives for now until we have everything using the volume stuff
Platform::FS::MountDefaults();
// Set our working directory.
Torque::FS::SetCwd( "game:/" );
// Set our working directory.
Platform::setCurrentDirectory( Platform::getMainDotCsDir() );
Processor::init();
Math::init();
Platform::init(); // platform specific initialization
@ -386,15 +396,6 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv )
for (i = 0; i < argc; i++)
Con::setVariable(avar("Game::argv%d", i), argv[i]);
Platform::FS::InstallFileSystems(); // install all drives for now until we have everything using the volume stuff
Platform::FS::MountDefaults();
// Set our working directory.
Torque::FS::SetCwd( "game:/" );
// Set our working directory.
Platform::setCurrentDirectory( Platform::getMainDotCsDir() );
#ifdef TORQUE_PLAYER
if(argc > 2 && dStricmp(argv[1], "-project") == 0)
{