@@ -1279,6 +1279,8 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource )
1279
1279
// -------------------------------------------------------------------------------------------------
1280
1280
void OpenContain::processDamageToContained ()
1281
1281
{
1282
+ const OpenContainModuleData* data = getOpenContainModuleData ();
1283
+
1282
1284
#if RETAIL_COMPATIBLE_CRC
1283
1285
1284
1286
const ContainedItemsList* items = getContainedItemsList ();
@@ -1292,7 +1294,7 @@ void OpenContain::processDamageToContained()
1292
1294
Object *object = *it++;
1293
1295
1294
1296
// Calculate the damage to be inflicted on each unit.
1295
- Real damage = object->getBodyModule ()->getMaxHealth () * getOpenContainModuleData () ->m_damagePercentageToUnits ;
1297
+ Real damage = object->getBodyModule ()->getMaxHealth () * data ->m_damagePercentageToUnits ;
1296
1298
1297
1299
DamageInfo damageInfo;
1298
1300
damageInfo.in .m_damageType = DAMAGE_UNRESISTABLE;
@@ -1301,7 +1303,7 @@ void OpenContain::processDamageToContained()
1301
1303
damageInfo.in .m_amount = damage;
1302
1304
object->attemptDamage ( &damageInfo );
1303
1305
1304
- if ( !object->isEffectivelyDead () && getOpenContainModuleData () ->m_damagePercentageToUnits == 1 .0f )
1306
+ if ( !object->isEffectivelyDead () && data ->m_damagePercentageToUnits == 1 .0f )
1305
1307
object->kill (); // in case we are carrying flame proof troops we have been asked to kill
1306
1308
1307
1309
// TheSuperHackers @info Calls to Object::attemptDamage and Object::kill will not remove
@@ -1349,16 +1351,16 @@ void OpenContain::processDamageToContained()
1349
1351
DEBUG_ASSERTCRASH ( object, (" Contain list must not contain NULL element" ) );
1350
1352
1351
1353
// Calculate the damage to be inflicted on each unit.
1352
- Real damage = object->getBodyModule ()->getMaxHealth () * percentDamage ;
1354
+ Real damage = object->getBodyModule ()->getMaxHealth () * data-> m_damagePercentageToUnits ;
1353
1355
1354
1356
DamageInfo damageInfo;
1355
1357
damageInfo.in .m_damageType = DAMAGE_UNRESISTABLE;
1356
- damageInfo.in .m_deathType = data-> m_isBurnedDeathToUnits ? DEATH_BURNED : DEATH_NORMAL ;
1358
+ damageInfo.in .m_deathType = DEATH_BURNED;
1357
1359
damageInfo.in .m_sourceID = getObject ()->getID ();
1358
1360
damageInfo.in .m_amount = damage;
1359
1361
object->attemptDamage ( &damageInfo );
1360
1362
1361
- if ( !object->isEffectivelyDead () && percentDamage == 1 .0f )
1363
+ if ( !object->isEffectivelyDead () && data-> m_damagePercentageToUnits == 1 .0f )
1362
1364
object->kill (); // in case we are carrying flame proof troops we have been asked to kill
1363
1365
1364
1366
if ( object->isEffectivelyDead () )
0 commit comments