Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 14, 2008, 9:36:26 PM (16 years ago)
Author:
landauf
Message:

removed temporary workaround in Camera and CameraPosition thanks to Oli's changes in r2441

Location:
code/branches/objecthierarchy2/src/orxonox
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

    r2437 r2449  
    4343#include "CameraManager.h"
    4444
    45 // REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
    46 #include "core/Core.h" //--------------------------------------
    47 //----------------------------------------------------------------------------------------
    48 
    4945namespace orxonox
    5046{
    … …  
    6561        this->nearClipDistance_ = 1;
    6662
    67 // REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
    68         if (!Core::isMaster()) //---------------------------------------------------------
    69 //----------------------------------------------------------------------------------------
    70             this->setObjectMode(0x0);
     63        this->setObjectMode(0x0);
    7164
    7265        this->setConfigValues();

  • code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc

    r2437 r2449  
    3434#include "Camera.h"
    3535
    36 // REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
    37 #include "core/Core.h" //--------------------------------------
    38 //----------------------------------------------------------------------------------------
    39 
    4036namespace orxonox
    4137{
    … …  
    4844        this->bDrag_ = false;
    4945
    50 // REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
    51         if (!Core::isMaster()) //---------------------------------------------------------
    52 //----------------------------------------------------------------------------------------
    53             this->setObjectMode(0x0);
     46        this->setObjectMode(0x0);
    5447    }
    5548

  • code/branches/objecthierarchy2/src/orxonox/overlays/hud/GametypeStatus.cc

    r2428 r2449  
    4848
    4949        this->owner_ = 0;
    50 
    51 COUT(0) << "created GametypeStatus" << std::endl;
    5250    }
    5351
Note: See TracChangeset for help on using the changeset viewer.