remove unnecessary null checks

This commit is contained in:
DarthArgus
2014-10-26 22:53:42 -07:00
parent eb2e7c78d8
commit 594b3a4254
56 changed files with 98 additions and 199 deletions
@@ -63,7 +63,6 @@ int property, value, itemCount;
UNREF(source);
MessageQueueCraftCustomization * msg = new MessageQueueCraftCustomization();
NOT_NULL(msg);
Archive::get(source, name);
msg->setName(name);
@@ -57,7 +57,6 @@ MessageQueue::Data* MessageQueueCraftExperiment::unpack(Archive::ReadIterator &
uint8 sequenceId;
Archive::get(source, sequenceId);
MessageQueueCraftExperiment* const msg = new MessageQueueCraftExperiment(sequenceId);
NOT_NULL(msg);
int count;
int attribute, points;
@@ -53,7 +53,6 @@ void MessageQueueCraftIngredients::pack(const MessageQueue::Data* const data, Ar
MessageQueue::Data* MessageQueueCraftIngredients::unpack(Archive::ReadIterator & source)
{
MessageQueueCraftIngredients* const msg = new MessageQueueCraftIngredients();
NOT_NULL(msg);
int count;
Unicode::String name;
@@ -61,7 +61,6 @@ void MessageQueueCreateSaga::pack(const MessageQueue::Data* const data, Archive:
MessageQueue::Data* MessageQueueCreateSaga::unpack(Archive::ReadIterator & source)
{
MessageQueueCreateSaga* const msg = new MessageQueueCreateSaga();
NOT_NULL(msg);
std::string questName;
std::string questDescription;
@@ -93,7 +93,6 @@ MessageQueue::Data* MessageQueueDraftSchematics::unpack(Archive::ReadIterator &
Archive::get(source, stationId);
MessageQueueDraftSchematics* const msg = new MessageQueueDraftSchematics(toolId, stationId);
NOT_NULL(msg);
int count, category;
uint32 serverCrc, sharedCrc;
@@ -71,7 +71,6 @@ MessageQueue::Data* MessageQueueDraftSlots::unpack(Archive::ReadIterator & sourc
Archive::get(source, canManufacture);
MessageQueueDraftSlots * const msg = new MessageQueueDraftSlots(toolId, manfSchemId);
NOT_NULL(msg);
msg->setPrototypeId(testProtoId);
msg->setVolume(volume);
@@ -83,7 +83,6 @@ MessageQueue::Data* MessageQueueDraftSlotsQueryResponse::unpack(Archive::ReadIte
Archive::get(source, canManufacture);
MessageQueueDraftSlotsQueryResponse * const msg = new MessageQueueDraftSlotsQueryResponse (crc);
NOT_NULL(msg);
msg->setComplexity(complexity);
msg->setVolume(volume);
msg->setCanManufacture(canManufacture);
@@ -44,7 +44,6 @@ void MessageQueueNpcConversationMessage::pack(const MessageQueue::Data* const da
MessageQueue::Data* MessageQueueNpcConversationMessage::unpack(Archive::ReadIterator & source)
{
MessageQueueNpcConversationMessage * msg = new MessageQueueNpcConversationMessage;
NOT_NULL(msg);
Unicode::String response;
Archive::get(source, response);
@@ -60,7 +60,6 @@ MessageQueue::Data* MessageQueueOpponentInfo::unpack(Archive::ReadIterator & sou
MessageQueueOpponentInfo * msg = new MessageQueueOpponentInfo();
msg->setOpponent(opponent);
msg->setAttributes(health, action, mind);
NOT_NULL(msg);
return msg;
}
@@ -76,7 +76,6 @@ MessageQueue::Data* MessageQueuePushCreature::unpack(Archive::ReadIterator & sou
Archive::get(source, distance);
MessageQueuePushCreature * const msg = new MessageQueuePushCreature(attacker, defender, attackerPos, defenderPos, distance);
NOT_NULL(msg);
return msg;
}
@@ -48,7 +48,6 @@ void MessageQueueStartNpcConversation::pack(const MessageQueue::Data* const data
MessageQueue::Data* MessageQueueStartNpcConversation::unpack(Archive::ReadIterator & source)
{
MessageQueueStartNpcConversation * msg = new MessageQueueStartNpcConversation;
NOT_NULL(msg);
NetworkId npc;
Archive::get(source, npc);
@@ -47,7 +47,6 @@ void MessageQueueStopNpcConversation::pack(const MessageQueue::Data* const data,
MessageQueue::Data* MessageQueueStopNpcConversation::unpack(Archive::ReadIterator & source)
{
MessageQueueStopNpcConversation * msg = new MessageQueueStopNpcConversation;
NOT_NULL(msg);
// npc
{
@@ -58,7 +58,6 @@ void MessageQueueStringList::pack(const MessageQueue::Data* const data, Archive:
MessageQueue::Data* MessageQueueStringList::unpack(Archive::ReadIterator & source)
{
MessageQueueStringList * msg = new MessageQueueStringList;
NOT_NULL(msg);
uint8 count;
Unicode::String string;
@@ -72,7 +72,6 @@ MessageQueue::Data* MessageQueueUpdateShipOnCollision::unpack(Archive::ReadItera
Archive::get(source, clampedStrengthOfImpact);
MessageQueueUpdateShipOnCollision * const msg = new MessageQueueUpdateShipOnCollision(deltaToMove, newVelocity, clampedStrengthOfImpact);
NOT_NULL(msg);
return msg;
}