Changeset 7072 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Feb 7, 2006, 3:06:34 PM (19 years ago)

Author:

bensch

Message:

collision stuff

Location:

trunk/src/world_entities/space_ships

Files:

• hover.cc (modified) (1 diff)
• hover.h (modified) (1 diff)
• turbine_hover.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -226 +226 @@
  */
 void Hover::collidesWith(WorldEntity* entity, const Vector& location)
-{}
+{
+  Playable::collidesWith(entity, location);
+}
 
 

trunk/src/world_entities/space_ships/hover.h

@@ -67 +67 @@
     float                 airViscosity;
 
+    WorldEntity* hitEntity;
 };
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -116 +116 @@
   this->acceleration = 10.0f;
   this->airFriction = 2.0f;
+
+  this->setHealthMax(100);
+  this->setHealth(100);
+
 
   // camera - issue
@@ -256 +260 @@
  */
 void TurbineHover::collidesWith(WorldEntity* entity, const Vector& location)
-{}
+{
+  Playable::collidesWith(entity, location);
+}