diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/resources/animation.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/resources/animation.cpp')
| -rw-r--r-- | src/resources/animation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 32b57b3b1..363e9b2ac 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -44,12 +44,12 @@ void Animation::addFrame(Image *image, int delay, int offsetX, int offsetY, void Animation::addTerminator(int rand) { - addFrame(NULL, 0, 0, 0, rand); + addFrame(nullptr, 0, 0, 0, rand); } bool Animation::isTerminator(const Frame &candidate) { - return (candidate.image == NULL && candidate.type == Frame::ANIMATION); + return (!candidate.image && candidate.type == Frame::ANIMATION); } void Animation::addJump(std::string name, int rand) |