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/soundeffect.cpp | |
parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
download | manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/resources/soundeffect.cpp')
-rw-r--r-- | src/resources/soundeffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index e8e5d3dbb..a8da8dd80 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -34,7 +34,7 @@ SoundEffect::~SoundEffect() Resource *SoundEffect::load(void *buffer, unsigned bufferSize) { if (!buffer) - return NULL; + return nullptr; // Load the raw file data from the buffer in an RWops structure SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize); @@ -49,7 +49,7 @@ Resource *SoundEffect::load(void *buffer, unsigned bufferSize) else { logger->log("Error, failed to load sound effect: %s", Mix_GetError()); - return NULL; + return nullptr; } } |