Changeset 6222 in orxonox.OLD for trunk/src/util/state.cc

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/state.cc (modified) (2 diffs)

trunk/src/util/state.cc

@@ -26 +26 @@
 
 
-const PNode* State::camera = NULL;
-const PNode* State::cameraTarget = NULL;
+PNode* State::camera = NULL;
+PNode* State::cameraTarget = NULL;
 
 ObjectManager* State::objectManager = NULL;
@@ -34 +34 @@
  *  sets camera and target of the current Camera
 */
-void State::setCamera(const PNode* camera, const PNode* cameraTarget)
+void State::setCamera(PNode* camera, PNode* cameraTarget)
 {
   State::camera = camera;