diff options
author | Nicola Mettifogo | 2009-02-26 10:44:01 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2009-02-26 10:44:01 +0000 |
commit | 88efc8603ec15e726b9a0c3663588f7afe57e0d2 (patch) | |
tree | 879dd576fe5fbf1120a05e4ad5c25517e21894f6 /engines/parallaction/parallaction.cpp | |
parent | 2fbf626d095303ea00799e6ca972c124673897b1 (diff) | |
download | scummvm-rg350-88efc8603ec15e726b9a0c3663588f7afe57e0d2.tar.gz scummvm-rg350-88efc8603ec15e726b9a0c3663588f7afe57e0d2.tar.bz2 scummvm-rg350-88efc8603ec15e726b9a0c3663588f7afe57e0d2.zip |
Removed null*Ptr dummy objects, using SharedPtr's reset method to null pointers instead.
svn-id: r38897
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r-- | engines/parallaction/parallaction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index fa0ceb8576..c3b5799e08 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -210,7 +210,7 @@ AnimationPtr Location::findAnimation(const char *name) { for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); ++it) if (!scumm_stricmp((*it)->_name, name)) return *it; - return nullAnimationPtr; + return AnimationPtr(); } void Location::freeAnimations() { @@ -589,7 +589,7 @@ void Parallaction::exitCommentMode() { _gfx->setHalfbriteMode(false); _cmdExec->run(_commentZone->_commands, _commentZone); - _commentZone = nullZonePtr; + _commentZone.reset(); } void Parallaction::runCommentFrame() { @@ -792,7 +792,7 @@ ZonePtr Parallaction::hitZone(uint32 type, uint16 x, uint16 y) { } } - return nullZonePtr; + return ZonePtr(); } |