Changeset 6926 for code/branches/presentation3/src/libraries/core

Timestamp:

May 20, 2010, 10:23:22 AM (15 years ago)

Author:

scheusso

Message:

merging lod branch into presentation3 merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/libraries/core/BaseObject.cc (modified) (2 diffs)
• src/libraries/core/BaseObject.h (modified) (3 diffs)

code/branches/presentation3/src/libraries/core/BaseObject.cc

@@ -75 +75 @@
             this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
             this->setGametype(this->creator_->getGametype());
+            this->setLevel(this->creator_->getLevel());
         }
         else
@@ -83 +84 @@
             this->sceneID_ = OBJECTID_UNKNOWN;
             this->gametype_ = 0;
+            this->level_ = 0;
         }
     }

code/branches/presentation3/src/libraries/core/BaseObject.h

@@ -51 +51 @@
     class Scene;
     class Gametype;
+    class Level;
 
     //! The BaseObject is the parent of all classes representing an instance in the game.
@@ -153 +154 @@
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
+            
+            inline void setLevel(const SmartPtr<Level>& level)
+            {
+                if (level != this->level_)
+                {
+                    this->level_ = level;
+                    this->changedLevel();
+                }
+            }
+            inline const SmartPtr<Level>& getLevel() const { return this->level_; }
+            virtual void changedLevel() {}
 
             void addEventSource(BaseObject* source, const std::string& state);
@@ -209 +221 @@
             SmartPtr<Gametype>     gametype_;
             Gametype*              oldGametype_;
+            SmartPtr<Level>        level_;
             std::set<Template*>    templates_;