swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-30 00:15:47 -04:00
Code Issues Projects Releases Wiki Activity

remove unnecessary null checks

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp
+6 -8
View File
@@ -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<int>(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<int>(CM_buffBuilderChange), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
}
}
engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp
-2
View File
@@ -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
engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp
-2
View File
@@ -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.
engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp
+1 -1
View File
@@ -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());
engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp
-1
View File
@@ -36,7 +36,6 @@ void get(ReadIterator & source, std::vector<const std::vector<NetworkId> *> & ta
for (int i = 0; i < length; ++i)
{
std::vector<NetworkId> * inner = new std::vector<NetworkId>();
NOT_NULL(inner);
signed int innerLength = 0;
get(source, innerLength);
NetworkId id;