Arbitrary code cleanups

Just some stuff that piles up while "looking" at the code, which
eventually gets annoying to ignore while staging real changes.

* Replaced a few NULL occurrences with 0
* Rely on default parameter for std::vector::resize.
* Replaced a few "" with std::string()
* Prefer .empty() to == ""
* Removed a few comparisons with NULL
* Don't check pointers before deleting them
* Removed a bunch of redundant semicolons
* Made some global variables static (local to their compilation unit)
* Prefer prefix ++/-- operators to postfix versions when possible
* Corrected location of a comment

1 files changed, 4 insertions, 5 deletions

diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index e96137c4..d77005c7 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -184,7 +184,7 @@ void CompoundSprite::addSprite(Sprite* sprite)
     mNeedsRedraw = true;
 }
 
-void CompoundSprite::setSprite(int layer, Sprite* sprite)
+void CompoundSprite::setSprite(int layer, Sprite *sprite)
 {
     // Skip if it won't change anything
     if (at(layer) == sprite)
@@ -199,7 +199,7 @@ void CompoundSprite::setSprite(int layer, Sprite* sprite)
 void CompoundSprite::removeSprite(int layer)
 {
     // Skip if it won't change anything
-    if (at(layer) == NULL)
+    if (!at(layer))
         return;
 
     delete at(layer);
@@ -223,7 +223,7 @@ void CompoundSprite::ensureSize(size_t layerCount)
     if (size() >= layerCount)
         return;
 
-    resize(layerCount, NULL);
+    resize(layerCount);
 }
 
 /**
@@ -234,8 +234,7 @@ size_t CompoundSprite::getCurrentFrame(size_t layer)
     if (layer >= size())
         return 0;
 
-    Sprite *s = getSprite(layer);
-    if (s)
+    if (Sprite *s = getSprite(layer))
         return s->getCurrentFrame();
 
     return 0;