diff options
author | lukaslw | 2014-10-08 18:09:18 +0200 |
---|---|---|
committer | lukaslw | 2014-10-08 18:09:18 +0200 |
commit | a554fa9f7d35679c36cb9149a080d9f8a1e5cbe4 (patch) | |
tree | 2c84d55778f54e80789f97b1d76ad32e2d515421 /engines/prince/hero.cpp | |
parent | 78684333478cd567c820b930d0ba6663a0cecdd0 (diff) | |
download | scummvm-rg350-a554fa9f7d35679c36cb9149a080d9f8a1e5cbe4.tar.gz scummvm-rg350-a554fa9f7d35679c36cb9149a080d9f8a1e5cbe4.tar.bz2 scummvm-rg350-a554fa9f7d35679c36cb9149a080d9f8a1e5cbe4.zip |
PRINCE: Changing all occurrences of NULL to nullptr
To beconsistent and to keep just one of them
Diffstat (limited to 'engines/prince/hero.cpp')
-rw-r--r-- | engines/prince/hero.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp index bc127b398b..15dd7eb054 100644 --- a/engines/prince/hero.cpp +++ b/engines/prince/hero.cpp @@ -69,8 +69,8 @@ bool Hero::loadAnimSet(uint32 animSetNr) { _moveSet.resize(kMoveSetSize); for (uint32 i = 0; i < kMoveSetSize; i++) { debug("Anim set item %d %s", i, animSet[i]); - Animation *anim = NULL; - if (animSet[i] != NULL) { + Animation *anim = nullptr; + if (animSet[i] != nullptr) { anim = new Animation(); Resource::loadResource(anim, animSet[i], false); } @@ -93,7 +93,7 @@ Graphics::Surface *Hero::getSurface() { Graphics::Surface *heroFrame = heroAnim->getFrame(phaseFrameIndex); return heroFrame; } - return NULL; + return nullptr; } uint16 Hero::getData(AttrId dataId) { |