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 #1173 from Azaezel/alpha41/hudwerk

Browse source 
allow misc health readouts to detect vehicles
This commit is contained in:
Brian Roberts 2024-01-08 17:09:59 -06:00 committed by GitHub
parent 78b56688d3 22df872f2d
commit 6b1507f791
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fps/guiHealthBarHud.cpp
View file

@ -147,7 +147,7 @@ void GuiHealthBarHud::onRender(Point2I offset, const RectI &updateRect)
if (!conn)
return;
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
if (!control || !(control->getTypeMask() & PlayerObjectType))
if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType)))
return;
if(mDisplayEnergy)

2
Engine/source/T3D/fps/guiHealthTextHud.cpp
View file

@ -149,7 +149,7 @@ void GuiHealthTextHud::onRender(Point2I offset, const RectI &updateRect)
if (!conn)
return;
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
if (!control || !(control->getTypeMask() & PlayerObjectType))
if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType)))
return;
// Just grab the damage/energy right off the control object.

2
Engine/source/T3D/fps/guiShapeNameHud.cpp
View file

@ -209,7 +209,7 @@ void GuiShapeNameHud::onRender( Point2I, const RectI &updateRect)
// Target pos to test, if it's a player run the LOS to his eye
// point, otherwise we'll grab the generic box center.
Point3F shapePos;
if (shape->getTypeMask() & PlayerObjectType)
if (shape->getTypeMask() & (PlayerObjectType | VehicleObjectType))
{
MatrixF eye;