swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-25 10:12:52 -04:00
Code Issues Projects Releases Wiki Activity

this fixes ord mantell; may throw some warns we don't like in release mode.

Browse Source
This commit is contained in:
DarthArgus
2016-01-22 13:45:19 -06:00
parent be034c71ee
commit 38a6f39ef7
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp
-8
View File
@@ -1899,24 +1899,20 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con
ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ());
if (shipChassis == NULL)
{
#ifdef _DEBUG
WARNING (true, ("Ship [%s] chassis [%d] is invalid for installing component [%s]",
getNetworkId().getValueString().c_str(),
static_cast<int>(getChassisType ()),
shipComponentData.getDescriptor().getName().getString()));
#endif
return false;
}
if (isSlotInstalled (chassisSlot))
{
#ifdef _DEBUG
WARNING (true, ("Ship [%s] chassis [%s] slot [%s] is already filled, cannot install [%s]",
getNetworkId().getValueString().c_str(),
shipChassis->getName().getString(),
ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
shipComponentData.getDescriptor().getName().getString()));
#endif
return false;
}
@@ -1928,19 +1924,16 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con
ShipChassisSlot const * const slot = shipChassis->getSlot (static_cast<ShipChassisSlotType::Type>(effectiveCompatibilitySlot));
if (slot == NULL)
{
#ifdef _DEBUG
WARNING (true, ("Ship [%s] chassis [%s] does not support slot [%s] for installing component [%s]",
getNetworkId().getValueString().c_str(),
shipChassis->getName().getString(),
ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
shipComponentData.getDescriptor().getName().getString()));
return false;
#endif
}
if (!slot->canAcceptComponent(shipComponentData.getDescriptor()))
{
#ifdef _DEBUG
WARNING (true, ("Component [%s], compat [%s] cannot be installed in ship [%s] chassis [%s], slot [%s], compats [%s].",
shipComponentData.getDescriptor().getName().getString(),
shipComponentData.getDescriptor().getCompatibility().getString(),
@@ -1948,7 +1941,6 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con
shipChassis->getName().getString(),
ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
slot->getCompatibilityString().c_str()));
#endif
return false;
}