Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 9, 2013, 9:26:46 PM (11 years ago)
Author:
landauf
Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:
code/branches/core6/src/modules/tetris
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/modules/tetris/Tetris.cc

    r9348 r9629  
    6161    @ingroup Tetris
    6262    */
    63     Tetris::Tetris(BaseObject* creator) : Deathmatch(creator)
     63    Tetris::Tetris(Context* context) : Deathmatch(context)
    6464    {
    6565        RegisterObject(Tetris);
     
    379379    {
    380380        // create new futureBrick_
    381         this->futureBrick_ = new TetrisBrick(this->center_);
     381        this->futureBrick_ = new TetrisBrick(this->center_->getContext());
    382382
    383383
  • code/branches/core6/src/modules/tetris/Tetris.h

    r9348 r9629  
    5555    {
    5656        public:
    57             Tetris(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     57            Tetris(Context* context); //!< Constructor. Registers and initializes the object.
    5858            virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
    5959
  • code/branches/core6/src/modules/tetris/TetrisBrick.cc

    r9348 r9629  
    5151    @ingroup Tetris
    5252    */
    53     TetrisBrick::TetrisBrick(BaseObject* creator): ControllableEntity(creator)
     53    TetrisBrick::TetrisBrick(Context* context): ControllableEntity(context)
    5454    {
    5555        RegisterObject(TetrisBrick);
     
    7777        {
    7878            // Create a new stone and add it to the brick.
    79             TetrisStone* stone = new TetrisStone(this);
     79            TetrisStone* stone = new TetrisStone(this->getContext());
    8080            this->brickStones_.push_back(stone);
    8181            this->attach(stone);
  • code/branches/core6/src/modules/tetris/TetrisBrick.h

    r9348 r9629  
    5454    {
    5555        public:
    56             TetrisBrick(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     56            TetrisBrick(Context* context); //!< Constructor. Registers and initializes the object.
    5757            virtual ~TetrisBrick() {}
    5858
  • code/branches/core6/src/modules/tetris/TetrisCenterpoint.cc

    r9348 r9629  
    4848        Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
    4949    */
    50     TetrisCenterpoint::TetrisCenterpoint(BaseObject* creator) : StaticEntity(creator)
     50    TetrisCenterpoint::TetrisCenterpoint(Context* context) : StaticEntity(context)
    5151    {
    5252        RegisterObject(TetrisCenterpoint);
  • code/branches/core6/src/modules/tetris/TetrisCenterpoint.h

    r9348 r9629  
    5959    {
    6060        public:
    61             TetrisCenterpoint(BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
     61            TetrisCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
    6262            virtual ~TetrisCenterpoint() {}
    6363
  • code/branches/core6/src/modules/tetris/TetrisScore.cc

    r9348 r9629  
    5252    @ingroup Tetris
    5353    */
    54     TetrisScore::TetrisScore(BaseObject* creator) : OverlayText(creator)
     54    TetrisScore::TetrisScore(Context* context) : OverlayText(context)
    5555    {
    5656        RegisterObject(TetrisScore);
  • code/branches/core6/src/modules/tetris/TetrisScore.h

    r9348 r9629  
    5757    {
    5858        public:
    59             TetrisScore(BaseObject* creator);
     59            TetrisScore(Context* context);
    6060            virtual ~TetrisScore();
    6161
  • code/branches/core6/src/modules/tetris/TetrisStone.cc

    r9348 r9629  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     TetrisStone::TetrisStone(BaseObject* creator) : MovableEntity(creator)
     50    TetrisStone::TetrisStone(Context* context) : MovableEntity(context)
    5151    {
    5252        RegisterObject(TetrisStone);
  • code/branches/core6/src/modules/tetris/TetrisStone.h

    r9348 r9629  
    5454    {
    5555        public:
    56             TetrisStone(BaseObject* creator); //!< Constructor. Registers and initializes the object.
     56            TetrisStone(Context* context); //!< Constructor. Registers and initializes the object.
    5757            virtual ~TetrisStone() {}
    5858
Note: See TracChangeset for help on using the changeset viewer.