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

Revert "newer standards prefer nullptr over NULL - this is most of them but there are others too"

Browse Source 
This reverts commit 3e4cc36e7e.
This commit is contained in:
DarthArgus
2016-02-11 19:44:31 -06:00
parent 3e4cc36e7e
commit 8e2160f33e
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp
+9 -9
View File
@@ -295,10 +295,10 @@ void PlayerShipController::handleMessage(int const message, float const value, M
case CM_spaceMiningSaleSellResource:
{
MessageQueueSpaceMiningSellResource const * const msg = dynamic_cast<MessageQueueSpaceMiningSellResource const *>(data);
if (msg != nullptr)
if (msg != NULL)
{
ServerObject * const spaceStation = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->m_spaceStationId));
if (nullptr == spaceStation)
if (NULL == spaceStation)
{
WARNING(true, ("PlayerCreatureController CM_spaceMiningSaleSellResource invalid station [%s]", msg->m_spaceStationId.getValueString().c_str()));
}
@@ -376,16 +376,16 @@ float PlayerShipController::realAlter(float const elapsedTime)
if (owner && owner->isInitialized())
{
if (m_pendingDockingBehavior != nullptr)
if (m_pendingDockingBehavior != NULL)
{
delete m_dockingBehavior;
m_dockingBehavior = m_pendingDockingBehavior;
m_pendingDockingBehavior = nullptr;
m_pendingDockingBehavior = NULL;
getShipOwner()->setCondition(static_cast<int>(TangibleObject::C_docking));
Client * const client = owner->getClient();
if (client != nullptr)
if (client != NULL)
{
ShipClientUpdateTracker::queueForUpdate(*client, *owner);
}
@@ -395,16 +395,16 @@ float PlayerShipController::realAlter(float const elapsedTime)
}
}
if ( (m_dockingBehavior != nullptr)
if ( (m_dockingBehavior != NULL)
&& m_dockingBehavior->isDockFinished())
{
delete m_dockingBehavior;
m_dockingBehavior = nullptr;
m_dockingBehavior = NULL;
getShipOwner()->clearCondition(static_cast<int>(TangibleObject::C_docking));
}
if (m_dockingBehavior != nullptr)
if (m_dockingBehavior != NULL)
{
//-- The docking behavior will calculate new values for m_yaw/m_pitch/m_roll/m_throttle[Position] implicitly through calling ShipController members
m_dockingBehavior->alter(elapsedTime);
@@ -806,7 +806,7 @@ void PlayerShipController::setWeaponIndexPlayerControlled(int const weaponIndex,
{
DEBUG_FATAL((weaponIndex < 0), ("Invalid weaponIndex(%d)", weaponIndex));
if (m_turretTargetingSystem != nullptr)
if (m_turretTargetingSystem != NULL)
{
safe_cast<PlayerShipTurretTargetingSystem*>(m_turretTargetingSystem)->setWeaponIndexPlayerControlled(weaponIndex, playerControlled);
}