Changeset 10300 in orxonox.OLD for branches/improvements

Timestamp:

Jan 22, 2007, 5:21:42 PM (18 years ago)

Author:

snellen

Message:

update

Location:

branches/improvements/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (3 diffs)

branches/improvements/src/story_entities/game_world.cc

@@ -306 +306 @@
     this->dataTank->music->play();
 
+  PNode::getNullParent()->updateNode(0.01);
+  PNode::getNullParent()->updateNode(0.01);
+
+  
   while( this->bRunning) /* @todo implement pause */
   {

branches/improvements/src/world_entities/creatures/fps_player.cc

@@ -358 +358 @@
   if( this->bJump && likely(this->getModel(0) != NULL))
   {
-    //printf("pedestrianOne:walkTo( %f, 35, %f) \n", this->getAbsCoor().x, this->getAbsCoor().z);
-    //this->bJump = false;
+    printf("dummyVariable:walkTo( %f, 35, %f) \n", this->getAbsCoor().x, this->getAbsCoor().z);
+    this->bJump = false;
     if( this->jumpForce < 1.0f)
     {

branches/improvements/src/world_entities/script_trigger.cc

@@ -63 +63 @@
   addToScript = false;
   this->activeOnCreation = false;
+  target = NULL;
 
   if(root != NULL)
@@ -186 +187 @@
   }
 
+  if(target != NULL)
+  {
   if( !invert && this->distance(target) < radius)
   {
+ //  printf("Trigger position is: %f %f %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
+ //  printf("Target position is: %f %f %f \n", this->target->getAbsCoor().x, this->target->getAbsCoor().y, this->target->getAbsCoor().z);
     executeAction(timestep);
     scriptCalled = true;
     return;
+
   }
   else if( invert && this->distance(target) > radius)
@@ -200 +206 @@
  //else
    //printf("SCRIPTTRIGGER: target out of range\n");
-
+  }
 }