From 9ec9e0136e958f4e9b08a118c7534b5265659be0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 22 Feb 2009 22:34:05 -0500 Subject: Creature can now fail to set the containment --- sigencore/Creature.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sigencore/Creature.cpp') diff --git a/sigencore/Creature.cpp b/sigencore/Creature.cpp index 941d5649..db2950b6 100644 --- a/sigencore/Creature.cpp +++ b/sigencore/Creature.cpp @@ -77,10 +77,14 @@ Sigscript::SigmodWrapper* Sigencore::Creature::sigmod() const return m_sigmod; } -void Sigencore::Creature::setContainment(Containment* containment) +bool Sigencore::Creature::setContainment(Containment* containment) { - m_containment->removeMember(this); - m_containment = containment; + if (m_containment && m_containment->removeMember(this)) + { + m_containment = containment; + return true; + } + return false; } Sigencore::Containment* Sigencore::Creature::containment() const -- cgit