diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/sprite.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/sprite.cpp')
-rw-r--r-- | src/emu/sprite.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/sprite.cpp b/src/emu/sprite.cpp index f96d483beeb..7567f0dd0ac 100644 --- a/src/emu/sprite.cpp +++ b/src/emu/sprite.cpp @@ -114,7 +114,7 @@ sparse_dirty_rect *sparse_dirty_bitmap::first_dirty_rect(const rectangle &clipre for (int y = sy; y <= ey; y++) { UINT8 *dirtybase = &m_bitmap.pix(y); - sparse_dirty_rect *currect = NULL; + sparse_dirty_rect *currect = nullptr; // loop over all grid columns that intersect our cliprect for (int x = sx; x <= ex; x++) @@ -122,14 +122,14 @@ sparse_dirty_rect *sparse_dirty_bitmap::first_dirty_rect(const rectangle &clipre // if this tile is not dirty, end our current run and continue if (!dirtybase[x]) { - if (currect != NULL) + if (currect != nullptr) *currect &= cliprect; - currect = NULL; + currect = nullptr; continue; } // if we can't add to an existing rect, create a new one - if (currect == NULL) + if (currect == nullptr) { // allocate a new rect and add it to the list currect = &m_rect_list.append(*m_rect_allocator.alloc()); @@ -147,7 +147,7 @@ sparse_dirty_rect *sparse_dirty_bitmap::first_dirty_rect(const rectangle &clipre } // clip the last rect to the cliprect - if (currect != NULL) + if (currect != nullptr) *currect &= cliprect; } |