swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-03 18:12:58 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DarthArgus
2016-02-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
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/object/CreatureObject_Ships.cpp
+4 -4
View File
@@ -71,7 +71,7 @@ bool CreatureObject::pilotShip(ServerObject &pilotSlotObject)
SlotId const pilotSlotId = pilotSlotObject.asShipObject() ? ShipSlotIdManager::getShipPilotSlotId() : ShipSlotIdManager::getPobShipPilotSlotId();
Container::ContainerErrorCode errorCode = Container::CEC_Success;
bool const transferSuccess = ContainerInterface::transferItemToSlottedContainer(pilotSlotObject, *this, pilotSlotId, NULL, errorCode);
bool const transferSuccess = ContainerInterface::transferItemToSlottedContainer(pilotSlotObject, *this, pilotSlotId, nullptr, errorCode);
DEBUG_FATAL(transferSuccess && (errorCode != Container::CEC_Success), ("pilotShip(): transferItemToSlottedContainer() returned success but container error code returned error %d.", static_cast<int>(errorCode)));
if (transferSuccess)
@@ -199,7 +199,7 @@ void CreatureObject::getAllShipsInDatapad(std::vector<NetworkId> & result) const
for(ContainerConstIterator iter = datapadContainer->begin(); iter != datapadContainer->end(); ++iter)
{
Object const * const itemO = (*iter).getObject();
ServerObject const * const itemSO = itemO ? itemO->asServerObject() : NULL;
ServerObject const * const itemSO = itemO ? itemO->asServerObject() : nullptr;
if(itemSO && (itemSO->getGameObjectType() == SharedObjectTemplate::GOT_data_ship_control_device))
{
Container const * const itemContainer = ContainerInterface::getContainer(*itemSO);
@@ -211,8 +211,8 @@ void CreatureObject::getAllShipsInDatapad(std::vector<NetworkId> & result) const
for(ContainerConstIterator iter2 = itemContainer->begin(); iter2 != itemContainer->end(); ++iter2)
{
Object const * const o = (*iter2).getObject();
ServerObject const * const so = o ? o->asServerObject() : NULL;
ShipObject const * const ship = so ? so->asShipObject() : NULL;
ServerObject const * const so = o ? o->asServerObject() : nullptr;
ShipObject const * const ship = so ? so->asShipObject() : nullptr;
if(ship)
{
result.push_back(ship->getNetworkId());