Changeset 10321 in orxonox.OLD for trunk/src/world_entities/creatures/fps_player.cc

Timestamp:

Jan 24, 2007, 10:28:18 AM (17 years ago)

Author:

patrick

Message:

silvans complete patch

File:

• trunk/src/world_entities/creatures/fps_player.cc (modified) (2 diffs)

trunk/src/world_entities/creatures/fps_player.cc

@@ -119 +119 @@
   registerEvent(EV_MOUSE_MOTION);
 
-
+  this->aimingSystem = NULL;
 
   // weapon manager for the fps
@@ -241 +241 @@
 
 
-    this->aimingSystem->toList(OM_GROUP_01);
-    this->aimingSystem->setParent(&this->cameraNode);
-//     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
-    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
-    this->aimingSystem->setRelCoor(0, -1, -1);
+    if( this->aimingSystem != NULL)
+    {
+      this->aimingSystem->toList(OM_GROUP_01);
+      this->aimingSystem->setParent(&this->cameraNode);
+  //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+      this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
+      this->aimingSystem->setRelCoor(0, -1, -1);
+    }