TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 15:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1441 from Azaezel/alpha41/controlConfusion

Browse source 
handle relfecting the health of the controlled object
This commit is contained in:
Brian Roberts 2025-04-09 12:08:49 -05:00 • committed by GitHub
commit cdaa6533b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,6 +147,11 @@ void GuiHealthBarHud::onRender(Point2I offset, const RectI &updateRect)
if (!conn) if (!conn)
return; return;
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject()); ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
//cover the case of a connection controling an object in turn controlling another
if (control && control->getControlObject())
control = control->getControlObject();
if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType))) if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType)))
return; return;

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

@ -148,7 +148,12 @@ void GuiHealthTextHud::onRender(Point2I offset, const RectI &updateRect)
GameConnection* conn = GameConnection::getConnectionToServer(); GameConnection* conn = GameConnection::getConnectionToServer();
if (!conn) if (!conn)
return; return;
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject()); ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
//cover the case of a connection controling an object in turn controlling another
if (control && control->getControlObject())
control = control->getControlObject();
if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType))) if (!control || !(control->getTypeMask() & (PlayerObjectType | VehicleObjectType)))
return; return;