From 594b3a4254a2e8aace5c635f5c1fb41b2e1e6498 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 26 Oct 2014 22:53:42 -0700 Subject: [PATCH] remove unnecessary null checks --- .../controller/PlayerCreatureController.cpp | 51 +++++++---------- .../shared/core/ServerBuffBuilderManager.cpp | 24 ++++---- .../core/ServerImageDesignerManager.cpp | 24 ++++---- .../src/shared/object/CreatureObject.cpp | 8 --- .../src/shared/object/FactoryObject.cpp | 1 - .../src/shared/object/GroupObject.cpp | 1 - .../src/shared/object/GuildObject.cpp | 1 - .../object/HarvesterInstallationObject.cpp | 1 - .../src/shared/object/InstallationObject.cpp | 1 - .../object/ManufactureInstallationObject.cpp | 1 - .../object/ManufactureSchematicObject.cpp | 56 +++++++++---------- .../src/shared/object/PlanetObject.cpp | 1 - .../shared/object/ResourceContainerObject.cpp | 1 - .../src/shared/object/ServerObject.cpp | 1 - .../src/shared/object/TangibleObject.cpp | 1 - .../src/shared/object/UniverseObject.cpp | 1 - .../src/shared/object/VehicleObject.cpp | 1 - .../src/shared/object/WeaponObject.cpp | 1 - .../objectTemplate/ServerObjectTemplate.cpp | 1 - .../serverKeyShare/src/shared/KeyServer.cpp | 1 - .../serverKeyShare/src/shared/KeyShare.cpp | 9 --- .../gameGameServer/AiCreatureStateMessage.cpp | 7 +-- .../gameGameServer/AiMovementMessage.cpp | 9 ++- .../src/shared/CityPathGraphManager.cpp | 2 - .../src/shared/ScriptMethodsBuffBuilder.cpp | 14 ++--- .../src/shared/ScriptMethodsCombat.cpp | 2 - .../src/shared/ScriptMethodsCrafting.cpp | 2 - .../src/shared/ScriptMethodsObjectInfo.cpp | 2 +- .../src/shared/ScriptParamArchive.cpp | 1 - .../sharedDebug/src/win32/DebugMonitor.cpp | 2 +- .../src/shared/MemoryManager.cpp | 6 +- .../MessageQueueCraftCustomization.cpp | 1 - .../MessageQueueCraftExperiment.cpp | 1 - .../MessageQueueCraftIngredients.cpp | 1 - .../MessageQueueCreateSaga.cpp | 1 - .../MessageQueueDraftSchematics.cpp | 1 - .../MessageQueueDraftSlots.cpp | 1 - .../MessageQueueDraftSlotsQueryResponse.cpp | 1 - .../MessageQueueNpcConversationMessage.cpp | 1 - .../MessageQueueOpponentInfo.cpp | 1 - .../MessageQueuePushCreature.cpp | 1 - .../MessageQueueStartNpcConversation.cpp | 1 - .../MessageQueueStopNpcConversation.cpp | 1 - .../MessageQueueStringList.cpp | 1 - .../MessageQueueUpdateShipOnCollision.cpp | 1 - .../src/shared/lot/StructureFootprint.cpp | 1 - .../sharedObject/src/shared/portal/Portal.cpp | 1 - .../src/shared/core/TpfFile.cpp | 3 - .../sharedUtility/src/shared/DataTable.cpp | 4 -- .../src/shared/DataTableWriter.cpp | 1 - .../src/shared/TemplateParameter.cpp | 1 - .../src/shared/tree/XmlTreeDocument.cpp | 20 +++---- .../ours/library/unicode/src/shared/utf8.cpp | 11 ++-- .../combat/MessageQueueCombatDamageList.cpp | 2 - .../combat/MessageQueueCombatAction.cpp | 1 - .../combat/MessageQueueCombatDamage.cpp | 4 +- 56 files changed, 98 insertions(+), 199 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp index 26ab51a9..df4260bc 100644 --- a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp @@ -1171,11 +1171,9 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + *outMsg = *inMsg; + recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } else @@ -1188,11 +1186,9 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + *outMsg = *inMsg; + recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } } @@ -1209,12 +1205,10 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(designerController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); - designerController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + *outMsg = *inMsg; + outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); + designerController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } else @@ -1328,11 +1322,9 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + *outMsg = *inMsg; + recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } else @@ -1345,11 +1337,8 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + *outMsg = *inMsg; + recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } } @@ -1366,12 +1355,10 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - *outMsg = *inMsg; - outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); - bufferController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + *outMsg = *inMsg; + outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); + bufferController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } else diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp index 6ae614a4..829055b8 100644 --- a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp @@ -148,13 +148,11 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - outMsg->setBufferId(bufferId); - outMsg->setRecipientId(recipientId); - outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); - bufferController->appendMessage(static_cast(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + outMsg->setBufferId(bufferId); + outMsg->setRecipientId(recipientId); + outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); + bufferController->appendMessage(static_cast(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } //send the cancel message to the recipient @@ -163,13 +161,11 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network if(recipientController && bufferController != recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - outMsg->setBufferId(bufferId); - outMsg->setRecipientId(recipientId); - outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); - recipientController->appendMessage(static_cast(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + outMsg->setBufferId(bufferId); + outMsg->setRecipientId(recipientId); + outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); + recipientController->appendMessage(static_cast(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } //send cancel trigger to buffer player diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp index 7bf10457..80adfdea 100644 --- a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp @@ -591,13 +591,11 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net if(designerController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); - if(outMsg) - { - outMsg->setDesignerId(designerId); - outMsg->setRecipientId(recipientId); - outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); - designerController->appendMessage(static_cast(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + outMsg->setDesignerId(designerId); + outMsg->setRecipientId(recipientId); + outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); + designerController->appendMessage(static_cast(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } //send the cancel message to the recipient @@ -606,13 +604,11 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net if(recipientController && designerController != recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); - if(outMsg) - { - outMsg->setDesignerId(designerId); - outMsg->setRecipientId(recipientId); - outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); - recipientController->appendMessage(static_cast(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + outMsg->setDesignerId(designerId); + outMsg->setRecipientId(recipientId); + outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER); + recipientController->appendMessage(static_cast(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } //send cancel trigger to designer player diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index 2800d79b..c5d5ba69 100644 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -5450,14 +5450,6 @@ int CreatureObject::getInstrumentVisualId() const return visualId; } - // last, check the look at target if no weapon is equipped - if (!hasWeapon) - { - int visualId = internalGetInstrumentVisualId(getLookAtTarget()); - if(visualId) - return visualId; - } - return 0; } diff --git a/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp index cb83f8fa..77e6780b 100644 --- a/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp @@ -231,7 +231,6 @@ void FactoryObject::removeDefaultTemplate() Controller* FactoryObject::createDefaultController() { Controller* controller = new TangibleController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp index a80807be..76390349 100644 --- a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp @@ -130,7 +130,6 @@ GroupObject::~GroupObject() Controller* GroupObject::createDefaultController() { Controller* controller = new GroupController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp index e0cabf77..f0215358 100644 --- a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp @@ -114,7 +114,6 @@ GuildObject::~GuildObject() Controller* GuildObject::createDefaultController() { Controller* controller = new GuildController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp index aa587877..c4c99692 100644 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp @@ -93,7 +93,6 @@ HarvesterInstallationObject::~HarvesterInstallationObject() Controller* HarvesterInstallationObject::createDefaultController(void) { Controller* _controller = new HarvesterInstallationController(this); - NOT_NULL(_controller); setController(_controller); return _controller; diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp index a3f1127f..2f5b622b 100644 --- a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp @@ -129,7 +129,6 @@ void InstallationObject::removeDefaultTemplate(void) Controller* InstallationObject::createDefaultController(void) { Controller* _controller = new InstallationController(this); - NOT_NULL(_controller); setController(_controller); return _controller; diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp index dc5cc52e..c199bd84 100644 --- a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp @@ -190,7 +190,6 @@ void ManufactureInstallationObject::endBaselines() Controller* ManufactureInstallationObject::createDefaultController() { Controller* const _controller = new ManufactureInstallationController(this); - NOT_NULL(_controller); setController(_controller); return _controller; diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp index 93a2e03f..420b527b 100644 --- a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp @@ -298,38 +298,37 @@ void ManufactureSchematicObject::endBaselines() ServerSynchronizedUi * ManufactureSchematicObject::createSynchronizedUi () { ManufactureSchematicSynchronizedUi * sync = new ManufactureSchematicSynchronizedUi(*this); - if (sync) - { - // set up the sync ui for our slots - int i; - int count; - const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( - m_draftSchematic.get()); - NOT_NULL(draft); - DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS); - { - Crafting::IngredientSlot slotData; - count = slots.getCount(); - for (i = 0; i < count; ++i) - { - if (getSlot(i, slotData, false)) - { - sync->createNewSlot(slotData.name, slotData.complexity); - sync->setSlotType(slotData.name, slotData.ingredientType); - sync->setSlotOption(slotData.name, slotData.draftSlotOption); - sync->setSlotIndex(slotData.name, slotData.draftSlotIndex); - } - } - } - count = draft->getExperimentalAttributesCount(); + // set up the sync ui for our slots + int i; + int count; + const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( + m_draftSchematic.get()); + NOT_NULL(draft); + DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS); + { + Crafting::IngredientSlot slotData; + count = slots.getCount(); for (i = 0; i < count; ++i) { - sync->setAttribute(draft->getExperimentalAttribute(i), 0); + if (getSlot(i, slotData, false)) + { + sync->createNewSlot(slotData.name, slotData.complexity); + sync->setSlotType(slotData.name, slotData.ingredientType); + sync->setSlotOption(slotData.name, slotData.draftSlotOption); + sync->setSlotIndex(slotData.name, slotData.draftSlotIndex); + } } - - sync->setReady(); } + + count = draft->getExperimentalAttributesCount(); + for (i = 0; i < count; ++i) + { + sync->setAttribute(draft->getExperimentalAttribute(i), 0); + } + + sync->setReady(); + return sync; } @@ -647,8 +646,7 @@ bool ManufactureSchematicObject::getSlot(int index, Crafting::IngredientSlot & d const DynamicVariableList::NestedList ingredient(slotIngredients,buffer); Crafting::ComponentIngredient * const component = new Crafting::ComponentIngredient(); - if (component == NULL) - return false; + data.ingredients.push_back(Crafting::SimpleIngredientPtr(component)); component->count = 1; if (!ingredient.hasItem(OBJVAR_COMPONENT_NAME)) diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp index 56e4b737..f6a57df4 100644 --- a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp @@ -238,7 +238,6 @@ PlanetObject::~PlanetObject() Controller* PlanetObject::createDefaultController(void) { Controller* controller = new PlanetController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp index 45845613..9b47248b 100644 --- a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp @@ -100,7 +100,6 @@ void ResourceContainerObject::removeDefaultTemplate(void) Controller* ResourceContainerObject::createDefaultController(void) { Controller* _controller = new ResourceContainerController(this); - NOT_NULL(_controller); setController(_controller); return _controller; diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index 0ffc1842..44e5e292 100644 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -1666,7 +1666,6 @@ void ServerObject::conclude() Controller* ServerObject::createDefaultController(void) { Controller* controller = new ServerController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index df48bb7f..fa24fbe5 100644 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -1736,7 +1736,6 @@ void TangibleObject::setPvpRegion(Region const * pvpRegion) Controller* TangibleObject::createDefaultController(void) { Controller* controller = new TangibleController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp index a55013bf..6b283f5e 100644 --- a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp @@ -87,7 +87,6 @@ void UniverseObject::removeDefaultTemplate(void) Controller* UniverseObject::createDefaultController (void) { Controller* controller = new UniverseController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp index a72186d9..f5a9f8b1 100644 --- a/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp @@ -38,7 +38,6 @@ VehicleObject::~VehicleObject() Controller* VehicleObject::createDefaultController(void) { Controller* controller = new VehicleController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp index ae1c7bf8..320d0c0b 100644 --- a/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp @@ -151,7 +151,6 @@ void WeaponObject::onLoadedFromDatabase() Controller* WeaponObject::createDefaultController(void) { Controller* controller = new WeaponController(this); - NOT_NULL(controller); setController(controller); return controller; diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp index e977aa2b..9fef660b 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -136,7 +136,6 @@ void ServerObjectTemplate::registerMe(void) if (XpMap == NULL) { XpMap = new XP_MAP(); - NOT_NULL(XpMap); ExitChain::add(exit, "ServerObjectTemplate"); // @todo: fill in the rest of this map diff --git a/engine/server/library/serverKeyShare/src/shared/KeyServer.cpp b/engine/server/library/serverKeyShare/src/shared/KeyServer.cpp index aef212f2..a6124d8f 100644 --- a/engine/server/library/serverKeyShare/src/shared/KeyServer.cpp +++ b/engine/server/library/serverKeyShare/src/shared/KeyServer.cpp @@ -20,7 +20,6 @@ randomNumberGenerator(0), updateRate(newUpdateRate) { randomNumberGenerator = new RandomGenerator(unsigned(time(0))); //lint !e732 //loss of sign ok. - NOT_NULL(randomNumberGenerator); Key k; for(unsigned int i = 0; i < getKeyCount(); i ++) { diff --git a/engine/server/library/serverKeyShare/src/shared/KeyShare.cpp b/engine/server/library/serverKeyShare/src/shared/KeyShare.cpp index ef5ee7df..fc46f736 100644 --- a/engine/server/library/serverKeyShare/src/shared/KeyShare.cpp +++ b/engine/server/library/serverKeyShare/src/shared/KeyShare.cpp @@ -22,7 +22,6 @@ cipherDataLen(newCipherDataLen), dataLen(newDataLen) { cipherData = new unsigned char[cipherDataLen]; - NOT_NULL(cipherData); memcpy(cipherData, newCipherData, cipherDataLen); memcpy(digest, newDigest, KeyShareConstants::keyLength); } @@ -35,7 +34,6 @@ cipherDataLen(source.cipherDataLen), dataLen(source.dataLen) { cipherData = new unsigned char[cipherDataLen]; - NOT_NULL(cipherData); memcpy(cipherData, source.cipherData, cipherDataLen); memcpy(digest, source.digest, KeyShareConstants::keyLength); } @@ -137,10 +135,6 @@ keys(0) decryptors = new Crypto::TwofishDecryptor *[keyCount]; encryptors = new Crypto::TwofishEncryptor *[keyCount]; - NOT_NULL(keys); - NOT_NULL(decryptors); - NOT_NULL(encryptors); - for(unsigned int i = 0; i < keyCount; i ++) { decryptors[i] = 0; @@ -180,9 +174,6 @@ bool KeyShare::decipherToken(const KeyShare::Token & token, unsigned char * clea unsigned char * cipherText = new unsigned char[cipherDataLen]; unsigned char * clearText = new unsigned char[cipherDataLen]; - NOT_NULL(cipherText); - NOT_NULL(clearText); - memcpy(cipherText, token.getData(), cipherDataLen); for(unsigned int i = 0; i < keyCount; i ++) { diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp index 375cc179..95dc3fd7 100644 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp @@ -52,12 +52,9 @@ MessageQueue::Data * AiCreatureStateMessage::unpack(Archive::ReadIterator & sour { AiCreatureStateMessage * msg = new AiCreatureStateMessage(); - if (msg != NULL) + if (GameServerMessageInterface::getInstance() != NULL) { - if (GameServerMessageInterface::getInstance() != NULL) - { - GameServerMessageInterface::getInstance()->unpack(source, *msg); - } + GameServerMessageInterface::getInstance()->unpack(source, *msg); } return msg; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp index 13635ad4..fde8e298 100644 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp @@ -71,11 +71,10 @@ void AiMovementMessage::pack(const MessageQueue::Data* const data, Archive::Byte MessageQueue::Data* AiMovementMessage::unpack(Archive::ReadIterator & source) { AiMovementMessage * msg = new AiMovementMessage(); - if (msg) - { - if (GameServerMessageInterface::getInstance() != NULL) - GameServerMessageInterface::getInstance()->unpack(source, *msg); - } + + if (GameServerMessageInterface::getInstance() != NULL) + GameServerMessageInterface::getInstance()->unpack(source, *msg); + return msg; } diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp index af8e7e5e..3e511c3c 100644 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp @@ -791,8 +791,6 @@ void CityPathGraphManager::moveBuilding ( BuildingObject * building, Vector cons UNREF(oldPosition); - if(building == NULL) return; - NetworkIdList ids; if (!building->getObjVars().getItem(OBJVAR_PATHFINDING_BUILDING_WAYPOINTS,ids)) return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp index 3f9b5cea..9eaabd1f 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp @@ -198,14 +198,12 @@ jboolean JNICALL ScriptMethodsBuffBuilderNamespace::buffBuilderValidated(JNIEnv if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); - if(outMsg) - { - outMsg->setBufferId(session.bufferId); - outMsg->setRecipientId(session.recipientId); - outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); - outMsg->setAccepted(true); - bufferController->appendMessage(static_cast(CM_buffBuilderChange), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); - } + + outMsg->setBufferId(session.bufferId); + outMsg->setRecipientId(session.recipientId); + outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER); + outMsg->setAccepted(true); + bufferController->appendMessage(static_cast(CM_buffBuilderChange), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); } } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp index 0bbf8cca..a12763bb 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp @@ -1687,8 +1687,6 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doCombatResults(JNIEnv *env, jobj // create a CombatAction message and fill it in MessageQueueCombatAction * message = new MessageQueueCombatAction(); - if (message == NULL) - return JNI_FALSE; message->setActionId(animationString); // @todo: change set postures to set locomotions diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp index 45860e43..9cdcca52 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp @@ -518,11 +518,9 @@ int i; // Create a dummy object. Object *dummyObject = new MemoryBlockManagedObject(); - NOT_NULL(dummyObject); // Create a CustomizationData instance. CustomizationData *customizationData = new CustomizationData(*dummyObject); - NOT_NULL(customizationData); customizationData->fetch(); // Retrieve CustomizationData for crafted object's appearance template name. diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 8d03185d..c50ab576 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -3238,7 +3238,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getCtsDestinationClusters } } - if (!s_ctsDestinationClusters || s_ctsDestinationClusters->empty()) + if (s_ctsDestinationClusters->empty()) return 0; LocalObjectArrayRefPtr valueArray = createNewObjectArray(s_ctsDestinationClusters->size(), JavaLibrary::getClsString()); diff --git a/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp b/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp index 0dd8aca8..967939fb 100644 --- a/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp @@ -36,7 +36,6 @@ void get(ReadIterator & source, std::vector *> & ta for (int i = 0; i < length; ++i) { std::vector * inner = new std::vector(); - NOT_NULL(inner); signed int innerLength = 0; get(source, innerLength); NetworkId id; diff --git a/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp b/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp index 775afc4f..ebc7b249 100644 --- a/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp +++ b/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp @@ -52,7 +52,7 @@ namespace DebugMonitorNamespace DWORD type = 0; DWORD size = sizeof(DWORD); LONG result = RegQueryValueEx(registryKey, name, NULL, &type, reinterpret_cast(&value), &size); - if (result != ERROR_SUCCESS || type != REG_DWORD && size != sizeof(int)) + if ((result != ERROR_SUCCESS || type != REG_DWORD) && (size != sizeof(int))) value = defaultValue; return value; } diff --git a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index 69a79c00..b11bb26b 100644 --- a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -1612,9 +1612,9 @@ int MemoryManagerNamespace::quickGuessIsValidPointerFromHeap(void const * userPo AllocatedBlock const * allocatedBlock = reinterpret_cast(reinterpret_cast(userPointer) - (cms_allocatedBlockSize + cms_guardBandSize)); ms_criticalSection->enter(); - if (!result && allocatedBlock->getNext()->getPrevious() != allocatedBlock) result = 1; - if (!result && allocatedBlock->getPrevious()->getNext() != allocatedBlock) result = 2; - if (!result && allocatedBlock->isFree()) result = 3; + if (allocatedBlock->getNext()->getPrevious() != allocatedBlock) result = 1; + if (allocatedBlock->getPrevious()->getNext() != allocatedBlock) result = 2; + if (allocatedBlock->isFree()) result = 3; ms_criticalSection->leave(); return result; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp index 6443eacf..86d56878 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp @@ -63,7 +63,6 @@ int property, value, itemCount; UNREF(source); MessageQueueCraftCustomization * msg = new MessageQueueCraftCustomization(); - NOT_NULL(msg); Archive::get(source, name); msg->setName(name); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp index 512c9e02..52c2ee33 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp @@ -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; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp index fc0fc49c..e106ba98 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp @@ -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; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp index 3c7ad8b4..41d4bfcc 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp @@ -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; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp index aacb3757..9f95d0e8 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp @@ -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; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp index d7c820d2..76ac3085 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp @@ -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); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp index b20b7463..9d4bbdd6 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp @@ -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); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp index aed700ac..252469b0 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp @@ -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); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp index 5acdb5ab..23c0ad8d 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp @@ -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; } diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp index e4db9b33..0aa7e1b8 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp @@ -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; } diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp index 615eab73..6bbb954b 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp @@ -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); diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp index 49474703..68f9e1d7 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp @@ -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 { diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp index e314288a..d249fccf 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp @@ -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; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp index 7133b286..ab0e7437 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp @@ -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; } diff --git a/engine/shared/library/sharedObject/src/shared/lot/StructureFootprint.cpp b/engine/shared/library/sharedObject/src/shared/lot/StructureFootprint.cpp index 65dfaf07..bee22172 100644 --- a/engine/shared/library/sharedObject/src/shared/lot/StructureFootprint.cpp +++ b/engine/shared/library/sharedObject/src/shared/lot/StructureFootprint.cpp @@ -259,7 +259,6 @@ void StructureFootprint::load_0000 (Iff& iff) //-- allocate footprint IS_NULL (m_data); m_data = new LotType [static_cast (m_width * m_height)]; - NOT_NULL (m_data); //-- convert string to footprint const char* const buffer = footprint.c_str (); diff --git a/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp b/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp index c9d7219c..1fcd8d87 100644 --- a/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp @@ -53,7 +53,6 @@ void Portal::install() { delete ms_doorStyleTable; ms_doorStyleTable = new DataTable(); - NOT_NULL(ms_doorStyleTable); ms_doorStyleTable->load(dataTableIff); } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp index 2ff90c7f..95428c81 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp @@ -1918,7 +1918,6 @@ std::string name; // now parse the objvar data line = paramStart; CompilerDynamicVariableParamData *newData = new CompilerDynamicVariableParamData(name, type); - NOT_NULL(newData); switch (type) { case DynamicVariableParamData::INTEGER: @@ -2431,7 +2430,6 @@ const char *parseWeightedList( TpfFile &file, Q & param, const char *line) { LIST *list = new LIST; - NOT_NULL(list); param.setValue(list); int totalWeight = 0; for (;;) @@ -2439,7 +2437,6 @@ const char *parseWeightedList( VALUE value; Q *valueParam = NULL; value.value = valueParam = new Q; - NOT_NULL(valueParam); list->push_back(value); VALUE *newValue = &list->back(); // test to see if we need to go to the next line diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp index 262dfcf7..0d08193b 100644 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp @@ -614,7 +614,6 @@ int DataTable::searchColumnString( int column, const std::string & searchValue ) if (!voidIndex) { std::pair, std::multimap > * indexPair = new std::pair, std::multimap >; - NOT_NULL(indexPair); m_index[static_cast(column)] = static_cast(indexPair); @@ -653,7 +652,6 @@ int DataTable::searchColumnFloat( int column, float searchValue ) const if (!voidIndex) { std::multimap * index = new std::multimap; - NOT_NULL(index); m_index[static_cast(column)] = static_cast(index); @@ -692,7 +690,6 @@ int DataTable::searchColumnInt( int column, int searchValue ) const if (columnType == DataTableColumnType::DT_Int) { std::multimap * index = new std::multimap; - NOT_NULL(index); m_index[static_cast(column)] = static_cast(index); @@ -709,7 +706,6 @@ int DataTable::searchColumnInt( int column, int searchValue ) const else if (columnType == DataTableColumnType::DT_String) { std::pair, std::multimap > * indexPair = new std::pair, std::multimap >; - NOT_NULL(indexPair); m_index[static_cast(column)] = static_cast(indexPair); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp index 1a004dd2..99ba514f 100644 --- a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp @@ -543,7 +543,6 @@ void DataTableWriter::_loadFromSpreadsheetTab(const char * filename) int bufferLength = fileLength + 1; char* buffer = new char[bufferLength]; memset(buffer, 0, bufferLength); - NOT_NULL(buffer); int bytes_read = inputFile.read(buffer, fileLength); FATAL(!bytes_read, ("Didn't read in any bytes when loading %s.", filename)); diff --git a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp index e5e9895a..751aa045 100644 --- a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp @@ -998,7 +998,6 @@ void DynamicVariableParamData::loadFromIff(Iff &file) for (int i = 0; i < count; ++i) { DynamicVariableParamData *newData = new DynamicVariableParamData; - NOT_NULL(newData); newData->loadFromIff(file); m_data.lparam->push_back(newData); } diff --git a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp index 2e4331f6..2ae18c8d 100644 --- a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp +++ b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp @@ -99,11 +99,10 @@ XmlTreeDocument* XmlTreeDocument::createDocument(const char * rootNodeName) XmlTreeDocument *treeDoc = new XmlTreeDocument(doc); DEBUG_WARNING( !treeDoc, ("Attempted to make new XmlTreeDoc but failed") ); - if (!treeDoc) - { - xmlFree(doc); - return 0; - } + + xmlFree(doc); + return 0; + treeDoc->fetch(); return treeDoc; } @@ -120,12 +119,11 @@ XmlTreeDocument * XmlTreeDocument::buildDocumentFromText(const std::string &inpu return 0; } XmlTreeDocument *treeDoc = new XmlTreeDocument(doc); - if(!treeDoc) - { - DEBUG_FATAL(true, ("Failure building XmlTreeDocument after successful parsing of memory buffer.")); - xmlFree(doc); - return 0; - } + + DEBUG_FATAL(true, ("Failure building XmlTreeDocument after successful parsing of memory buffer.")); + xmlFree(doc); + return 0; + treeDoc->fetch(); return treeDoc; } diff --git a/external/ours/library/unicode/src/shared/utf8.cpp b/external/ours/library/unicode/src/shared/utf8.cpp index 016b0b78..75901043 100644 --- a/external/ours/library/unicode/src/shared/utf8.cpp +++ b/external/ours/library/unicode/src/shared/utf8.cpp @@ -228,12 +228,11 @@ Unicode::String UTF8ToUnicode(const char *source) Unicode::String s = narrowToWide(""); int length = strlen(source) + 1; UTF16 *buffer = new UTF16[length]; - if (buffer != NULL) - { - UTF8_convertToUTF16(const_cast(source) , buffer, length); - s =buffer; - delete [] buffer; - } + + UTF8_convertToUTF16(const_cast(source) , buffer, length); + s =buffer; + delete [] buffer; + return s; } diff --git a/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.cpp b/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.cpp index 552267b2..9e0da80b 100644 --- a/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.cpp +++ b/game/server/library/swgServerNetworkMessages/src/shared/combat/MessageQueueCombatDamageList.cpp @@ -86,8 +86,6 @@ MessageQueue::Data* MessageQueueCombatDamageList::unpack(Archive::ReadIterator & uint8 temp8; MessageQueueCombatDamageList * msg = new MessageQueueCombatDamageList; - NOT_NULL(msg); - uint16 listCount; Archive::get(source, listCount); diff --git a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp index 7395e9f9..e0c98b96 100644 --- a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp +++ b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp @@ -465,7 +465,6 @@ MessageQueue::Data* MessageQueueCombatAction::unpack(Archive::ReadIterator & sou int actionNameCrc; MessageQueueCombatAction * msg = new MessageQueueCombatAction; - NOT_NULL(msg); Archive::get(source, actionId); msg->setActionId(actionId); diff --git a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatDamage.cpp b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatDamage.cpp index 25a16b29..634fe48f 100644 --- a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatDamage.cpp +++ b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatDamage.cpp @@ -88,9 +88,7 @@ MessageQueue::Data* MessageQueueCombatDamage::unpack(Archive::ReadIterator & sou Attributes::Enumerator attribute; Attributes::Value value; - MessageQueueCombatDamage * msg = new MessageQueueCombatDamage; - NOT_NULL(msg); - + MessageQueueCombatDamage * msg = new MessageQueueCombatDamage; Archive::get(source, actionId); msg->setActionId(actionId);