swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-19 09:02:53 -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/serverGame/src/shared/controller/PlayerCreatureController.cpp
+19 -32
View File
@@ -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