Changeset 10321 in orxonox.OLD for trunk/src/world_entities

Timestamp:

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

Author:

patrick

Message:

silvans complete patch

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (6 diffs)
• creatures/fps_player.cc (modified) (2 diffs)
• script_trigger.cc (modified) (1 diff)
• sound_entity.cc (added)
• sound_entity.h (added)

trunk/src/world_entities/WorldEntities.am

@@ +1 @@
+
 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
 WorldEntities_SOURCES_ = \
@@ -25 +26 @@
                 world_entities/bsp_entity.cc \
                 world_entities/mount_point.cc \
+                world_entities/sound_entity.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -65 +67 @@
                 world_entities/environments/model_entity.cc \
                 world_entities/environments/building.cc \
+                world_entities/environments/rotor.cc \
                 world_entities/environments/mapped_water.cc \
-                world_entities/environments/rotor.cc \
                 \
                 world_entities/elements/image_entity.cc \
@@ -130 +132 @@
                 bsp_entity.h \
                 mount_point.h \
+                sound_entity.h \
                 \
                 weapons/test_gun.h \
@@ -169 +172 @@
                 environments/model_entity.h \
                 environments/building.h \
+                environments/rotor.h \
                 environments/mapped_water.h \
-                environments/rotor.h \
                 \
                 elements/image_entity.h \
@@ -206 +209 @@
                 weather_effects/lense_flare.h
 
+

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);
+    }
 
 

trunk/src/world_entities/script_trigger.cc

@@ -187 +187 @@
   }
 
-  if( !invert && this->distance(target) < radius)
-  {
-    executeAction(timestep);
-    scriptCalled = true;
-    return;
-
-  }
-  else if( invert && this->distance(target) > radius)
-  {
-    executeAction(timestep);
-    scriptCalled = true;
-    return;
+  if( this->target != NULL)
+  {
+    if( !invert && this->distance(target) < radius)
+    {
+      executeAction(timestep);
+      scriptCalled = true;
+      return;
+
+    }
+    else if( invert && this->distance(target) > radius)
+    {
+      executeAction(timestep);
+      scriptCalled = true;
+      return;
+    }
   }
  //else