diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/game-server/mapcomposite.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index ec881cfa..4a5d800e 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -159,7 +159,7 @@ ZoneIterator::ZoneIterator(const MapRegion &r, const MapContent *m) void ZoneIterator::operator++() { - current = NULL; + current = nullptr; if (!region.empty()) { if (++pos != region.size()) @@ -348,13 +348,13 @@ void ObjectBucket::deallocate(int i) *****************************************************************************/ MapContent::MapContent(Map *map) - : last_bucket(0), zones(NULL) + : last_bucket(0), zones(nullptr) { buckets[0] = new ObjectBucket; buckets[0]->allocate(); // Skip ID 0 for (int i = 1; i < 256; ++i) { - buckets[i] = NULL; + buckets[i] = nullptr; } mapWidth = (map->getWidth() * map->getTileWidth() + zoneDiam - 1) / zoneDiam; |