silence some more warnings in release mode

This commit is contained in:
DarthArgus
2016-12-18 04:47:37 +00:00
parent b91a2717ef
commit ea7f5ef581
8 changed files with 144 additions and 144 deletions
@@ -4787,7 +4787,7 @@ void GameServer::handleCharacterCreateNameVerification(const VerifyNameResponse
Object* appearanceInventory = itemId.getObject();
if(appearanceInventory == nullptr)
{
WARNING(true, ("Player %s has lost their appearance inventory", newCharacterObject->getNetworkId().getValueString().c_str()));
DEBUG_WARNING(true, ("Player %s has lost their appearance inventory", newCharacterObject->getNetworkId().getValueString().c_str()));
appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *newCharacterObject, slot, false);
if(!appearanceInventory)
{
@@ -320,7 +320,7 @@ void ServerWorldNamespace::issueCollisionNearWarpWarning(Object const &object, V
//-- Only issue these for authoritative server objects. Proxy server objects will hit this condition after an intra-planet teleport.
// @todo allow proxies to know about a teleport and inform CollisionWorld so that we can always report these.
WARNING(!serverObject || serverObject->isAuthoritative(),
DEBUG_WARNING(!serverObject || serverObject->isAuthoritative(),
("CollisionWorld::update() had %d segments for object id=[%s], template=[%s], authority=[%s], game sever id=[%d], start position=[%.2f,%.2f,%.2f], end position=[%.2f,%.2f,%.2f], object probably should have warped but collision system is not warping it.",
segmentCount,
object.getNetworkId().getValueString().c_str(),
@@ -344,7 +344,7 @@ void ServerWorldNamespace::issueCollisionFarWarpWarning(Object const &object, Ve
//-- Only issue these for authoritative server objects. Proxy server objects will hit this condition after an intra-planet teleport.
// @todo allow proxies to know about a teleport and inform CollisionWorld so that we can always report these.
WARNING(!serverObject || serverObject->isAuthoritative(),
DEBUG_WARNING(!serverObject || serverObject->isAuthoritative(),
("CollisionWorld::update() had %d segments for object id=[%s], template=[%s], authority=[%s], game sever id=[%d], start position=[%.2f,%.2f,%.2f], end position=[%.2f,%.2f,%.2f], collision system will consider this a warp and adjust accordingly.",
segmentCount,
object.getNetworkId().getValueString().c_str(),
@@ -3547,4 +3547,4 @@ void ServerWorldNamespace::updatePlanetServer()
}
}
// ======================================================================
// ======================================================================
@@ -1837,7 +1837,7 @@ void CreatureObject::onLoadedFromDatabase()
Object* appearanceInventory = itemId.getObject();
if(appearanceInventory == nullptr)
{
WARNING(true, ("Player %s has lost their appearance inventory", getNetworkId().getValueString().c_str()));
DEBUG_WARNING(true, ("Player %s has lost their appearance inventory", getNetworkId().getValueString().c_str()));
appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *this, slot, false);
if(!appearanceInventory)
{
@@ -4251,7 +4251,7 @@ static const int internalTagBufLen = strlen(internalTagBuf);
// check if we're making a potentially dangerous mod
if (!Attributes::isAttribPool(mod.attrib))
{
WARNING(true, ("Creature %s is having non-pool attribute %d instantly "
DEBUG_WARNING(true, ("Creature %s is having non-pool attribute %d instantly "
"modified! This change will be permanent!",
getNetworkId().getValueString().c_str(), mod.attrib));
}
@@ -6688,7 +6688,7 @@ void CreatureObject::setAttribute(Attributes::Enumerator attribute, Attributes::
}
if (!Attributes::isAttribPool(attribute))
{
WARNING(true, ("CreatureObject::setAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
DEBUG_WARNING(true, ("CreatureObject::setAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
attribute, getNetworkId().getValueString().c_str()));
return;
}
@@ -6716,7 +6716,7 @@ void CreatureObject::setMaxAttribute(Attributes::Enumerator attribute, Attribute
}
if (!Attributes::isAttribPool(attribute))
{
WARNING(true, ("CreatureObject::setMaxAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
DEBUG_WARNING(true, ("CreatureObject::setMaxAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
attribute, getNetworkId().getValueString().c_str()));
return;
}
@@ -763,12 +763,12 @@ int PlayerObject::getExperienceLimit(const std::string & experienceType) const
{
// use the default limit
limit = SkillManager::getInstance().getDefaultXpLimit(experienceType);
WARNING(limit == static_cast<uint32>(-1), ("No default xp limit defined "
DEBUG_WARNING(limit == static_cast<uint32>(-1), ("No default xp limit defined "
"for xp type %s for player object %s", experienceType.c_str(), getNetworkId().getValueString().c_str()));
}
}
WARNING(limit == static_cast<uint32>(-1), ("No xp limit defined "
DEBUG_WARNING(limit == static_cast<uint32>(-1), ("No xp limit defined "
"for xp type %s for player object %s", experienceType.c_str(), getNetworkId().getValueString().c_str()));
return limit;
@@ -4128,7 +4128,7 @@ void ServerObject::performCombatSpam (const MessageQueueCombatSpam & spamMsg, bo
{
if (!isAuthoritative ())
{
WARNING_STRICT_FATAL (true, ("Do not call performCombatSpam on non-authoritative objects"));
DEBUG_WARNING (true, ("Do not call performCombatSpam on non-authoritative objects"));
return;
}
@@ -4143,7 +4143,7 @@ void ServerObject::performCombatSpam (const MessageQueueCombatSpam & spamMsg, bo
target->seeCombatSpam (spamMsg);
}
} else {
WARNING_STRICT_FATAL (!sendToSelf && !sendToBystanders, ("nullptr target_obj in commandFuncCombatSpam, when sendToTarget was set true"));
DEBUG_WARNING (!sendToSelf && !sendToBystanders, ("nullptr target_obj in commandFuncCombatSpam, when sendToTarget was set true"));
}
}
@@ -8104,7 +8104,7 @@ void ServerObject::removePatrolPathObserver()
getNetworkId().getValueString().c_str(), pprp->getObserverCount()));
if (pprp->getObserverCount() < 0)
{
WARNING(true, ("ServerObject::removePatrolPathObserver %s has negative patrol path observer count of %d",
DEBUG_WARNING(true, ("ServerObject::removePatrolPathObserver %s has negative patrol path observer count of %d",
getNetworkId().getValueString().c_str(), pprp->getObserverCount()));
}
}
@@ -157,7 +157,7 @@ void TangibleObject::endNpcConversation()
}
else
{
WARNING(true,("TangibleObject::endNpcConversation: creature %s has a non-nullptr m_npcConversation pointer %p but is not a player-controlled object!",
DEBUG_WARNING(true,("TangibleObject::endNpcConversation: creature %s has a non-nullptr m_npcConversation pointer %p but is not a player-controlled object!",
getNetworkId().getValueString().c_str(), m_npcConversation));
m_conversations.clear();
}