From 99e8bcb817db7b05d00569f5fdddb646c0054bf3 Mon Sep 17 00:00:00 2001 From: thecelloman Date: Thu, 4 Oct 2012 15:55:46 -0400 Subject: [PATCH] Add getMaxDamage() method. This will be needed for the forthcoming HealthTextHud GuiControl. --- Engine/source/T3D/shapeBase.cpp | 12 ++++++++++++ Engine/source/T3D/shapeBase.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp index 666f64e32..170a5c07a 100644 --- a/Engine/source/T3D/shapeBase.cpp +++ b/Engine/source/T3D/shapeBase.cpp @@ -1632,6 +1632,11 @@ F32 ShapeBase::getDamageValue() return mDamage / mDataBlock->maxDamage; } +F32 ShapeBase::getMaxDamage() +{ + return mDataBlock->maxDamage; +} + void ShapeBase::updateDamageLevel() { if (mDamageThread) { @@ -4534,6 +4539,13 @@ DefineEngineMethod( ShapeBase, getDamagePercent, F32, (),, { return object->getDamageValue(); } + +DefineEngineMethod(ShapeBase, getMaxDamage, F32, (),, + "Get the object's maxDamage level.\n" + "@return datablock.maxDamage\n") +{ + return object->getMaxDamage(); +} DefineEngineMethod( ShapeBase, setDamageState, bool, ( const char* state ),, "@brief Set the object's damage state.\n\n" diff --git a/Engine/source/T3D/shapeBase.h b/Engine/source/T3D/shapeBase.h index 96392041a..af1e0287d 100644 --- a/Engine/source/T3D/shapeBase.h +++ b/Engine/source/T3D/shapeBase.h @@ -1265,6 +1265,9 @@ public: /// /// @return Damage factor, between 0.0 - 1.0 F32 getDamageValue(); + + /// Returns the datablock.maxDamage value + F32 getMaxDamage(); /// Returns the rate at which the object regenerates damage F32 getRepairRate() { return mRepairRate; }