From 7c90f74f4383704804dac526b3f7944689cae752 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 31 Jan 2016 16:58:24 -0600 Subject: [PATCH] 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 --- .../serverGame/src/shared/object/ShipObject.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp index 00c36e25..badd8030 100755 --- a/engine/server/library/serverGame/src/shared/object/ShipObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp @@ -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(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(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;