swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-26 11:12:51 -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/CityObject.cpp
+10 -10
View File
@@ -130,9 +130,9 @@ void CityObject::setupUniverse()
// build the city info from data read in from DB
// disable notification while building the initial list
m_citizensInfo.setOnErase(NULL, NULL);
m_citizensInfo.setOnInsert(NULL, NULL);
m_citizensInfo.setOnSet(NULL, NULL);
m_citizensInfo.setOnErase(nullptr, nullptr);
m_citizensInfo.setOnInsert(nullptr, nullptr);
m_citizensInfo.setOnSet(nullptr, nullptr);
// build cities
std::map<int, CityInfo> tempCities;
@@ -462,7 +462,7 @@ int CityObject::createCity(std::string const &cityName, NetworkId const &cityHal
incomeTax, propertyTax, salesTax,
travelLoc, travelCost, travelInterplanetary,
cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
ci.setCityCreationTime(static_cast<int>(::time(NULL)));
ci.setCityCreationTime(static_cast<int>(::time(nullptr)));
m_citiesInfo.set(cityId, ci);
std::string citySpec;
@@ -1724,7 +1724,7 @@ CitizenInfo const * CityObject::getCitizenSpec(int cityId, NetworkId const &citi
}
result.clear();
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -1739,7 +1739,7 @@ CityStructureInfo const * CityObject::getCityStructureSpec(int cityId, NetworkId
}
result.clear();
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -1975,7 +1975,7 @@ CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citiz
if (iterFind != m_citizensInfo.end())
return &(iterFind->second);
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -2008,7 +2008,7 @@ CityStructureInfo const *CityObject::getCityStructureInfo(int cityId, NetworkId
if (iterFind != m_structuresInfo.end())
return &(iterFind->second);
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -2071,7 +2071,7 @@ PgcRatingInfo const * CityObject::getPgcRating(NetworkId const &chroniclerId) co
if (iterFind != m_pgcRatingInfo.end())
return &(iterFind->second);
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -2141,7 +2141,7 @@ void CityObject::adjustPgcRating(NetworkId const &chroniclerId, std::string cons
m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId));
}
updatedPgcRating.m_lastRatingTime = static_cast<int>(::time(NULL));
updatedPgcRating.m_lastRatingTime = static_cast<int>(::time(nullptr));
std::string updatedPgcRatingSpec;
CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec);