Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2144


Ignore:
Timestamp:
Nov 5, 2008, 5:32:54 PM (16 years ago)
Author:
scheusso
Message:

small change in synchronisable and baseobject (check when changing activity)

Location:
code/branches/objecthierarchy/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/objecthierarchy/src/core/BaseObject.h

    r2114 r2144  
    7272
    7373            /** @brief Sets the state of the objects activity. @param bActive True = active */
    74             inline void setActive(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
     74            inline void setActive(bool bActive)
     75            {
     76                bool bTemp = this->bActive_;
     77                this->bActive_ = bActive;
     78                if ( bTemp != bActive )
     79                    this->changedActivity();
     80            }
    7581            /** @brief Returns the state of the objects activity. @return The state of the activity */
    7682            inline bool isActive() const { return this->bActive_; }
  • code/branches/objecthierarchy/src/network/Synchronisable.cc

    r2143 r2144  
    297297        it++;
    298298    }
    299     assert(0); //if we reach this point something went wrong
     299    bool unregistered_nonexistent_variable = false;
     300    assert(unregistered_nonexistent_variable); //if we reach this point something went wrong:
     301    // the variable has not been registered before
    300302  }
    301303 
Note: See TracChangeset for help on using the changeset viewer.