TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-25 23:29:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/controllerCreaceCorrections

Browse source
This commit is contained in:
AzaezelX 2026-03-17 15:46:45 -05:00
commit a074146603
57 changed files with 5351 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/AI/AIController.h
View file

@ -74,7 +74,7 @@ public:
{
if (mCover && mCover->mPosSet && mCover->getPosition() == loc)
{
mCover->mRadius == rad;
mCover->mRadius = rad;
return;
}
delete(mCover); mCover = new AICover(this, loc, rad);
@ -83,7 +83,7 @@ public:
{
if (mCover && mCover->mObj == objIn)
{
mCover->mRadius == rad;
mCover->mRadius = rad;
return;
}
delete(mCover); mCover = new AICover(this, objIn, rad);

2
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -669,8 +669,8 @@ void ImageAsset::populateImage(void)
mImageHeight = tempFile->mHeight;
}
ddsFs->close();
delete tempFile;
delete ddsFs;
}
else
{

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

@ -5221,7 +5221,7 @@ bool Player::updatePos(const F32 travelTime)
Collision& colCheck = collisionList[i];
if (colCheck.object)
{
SceneObject* obj = static_cast<SceneObject*>(col.object);
SceneObject* obj = static_cast<SceneObject*>(colCheck.object);
if (obj->getTypeMask() & PlayerObjectType)
{
_handleCollision( colCheck );