kill another useless warning, but leave another intact for the falcon npe instance - the only one left now is more of an informational message in debug mode, letting us know that the falcon is invulnerable

This commit is contained in:
DarthArgus
2016-01-31 16:58:24 -06:00
parent 97e89e2be2
commit 7c90f74f43
@@ -1476,11 +1476,10 @@ void ShipObject::constructFromTemplate()
if (shipComponentData != NULL)
{
if (!installComponentFromData(i, *shipComponentData)) {
#ifdef _DEBUG
WARNING(true, ("ShipObject::constructFromTemplate() failed to install component at slot [%s]", ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(i)).c_str()));
#else
continue; //gcc complains without something to do inside this if statement
#endif
std::string chassis = shipChassis->getName().getString();
DEBUG_WARNING((chassis != "player_yt1300"), ("ShipObject::constructFromTemplate() failed to install component at slot [%s]",
ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(i)).c_str()));
}
}
}
@@ -2401,6 +2400,7 @@ float ShipObject::getMovementPercent() const
void ShipObject::setInvulnerabilityTimer(float duration)
{
//note: this isn't really a warning but an FYI - in the case of the falcon for the npe instance, it is always invulnerable
DEBUG_REPORT_LOG(true, ("Setting ship invulnerability timer for %s to %g\n", getDebugInformation().c_str(), duration));
PvpUpdateObserver o(this, Archive::ADOO_generic);
m_invulnerabilityTimer = duration;