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_ns.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_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 27b1ef8b50..a94d4a90b6 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -280,7 +280,7 @@ void Parallaction_ns::switchBackground(const char* background, const char* mask) void Parallaction_ns::runPendingZones() { if (_activeZone) { ZonePtr z = _activeZone; // speak Zone or sound - _activeZone = nullZonePtr; + _activeZone.reset(); runZone(z); } } @@ -299,7 +299,7 @@ void Parallaction_ns::changeLocation(char *location) { _input->stopHovering(); _gfx->freeLabels(); - _zoneTrap = nullZonePtr; + _zoneTrap.reset(); _input->setArrowCursor(); |