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/action.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/resources/action.cpp')
| -rw-r--r-- | src/resources/action.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/action.cpp b/src/resources/action.cpp index a95ebc5e3..c2af3ff9b 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -61,7 +61,7 @@ Animation *Action::getAnimation(int direction) const i = mAnimations.begin(); } - return (i == mAnimations.end()) ? NULL : i->second; + return (i == mAnimations.end()) ? nullptr : i->second; } void Action::setAnimation(int direction, Animation *animation) |