Changeset 8941 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:55:49 AM (18 years ago)

Author:

patrick

Message:

isOnGround bug found and repair station workd

Location:

branches/single_player_map/src/world_entities

Files:

• npcs/repair_station.cc (modified) (2 diffs)
• npcs/repair_station.h (modified) (3 diffs)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

branches/single_player_map/src/world_entities/npcs/repair_station.cc

@@ -120 +120 @@
 
 
+
+
+
+void RepairStation::activate()
+{}
+
+void RepairStation::deactivate()
+{}
+
+void RepairStation::toggleRotation()
+{}
+
+
 /**
  * ticks the door
@@ -129 +142 @@
     ((InteractiveModel*)this->getModel(0))->tick(time);
 
-  if( !this->bOpen)
-  {
-    if( this->checkOpen())
-    {
-      this->open();
-    }
-  }
-  else
-  {
-    if( !this->checkOpen())
-    {
-      this->close();
-    }
-  }
 
 }

branches/single_player_map/src/world_entities/npcs/repair_station.h

@@ -21 +21 @@
   REPAIR_CYCLE08,
 
-  DOOR_MAX_ANIMATIONS
+  REPAIR_MAX_ANIMATIONS
 };
 
@@ -37 +37 @@
     void setScale(float scale) { this->scale = scale; }
 
+    void activate();
+    void deactivate();
+    void toggleRotation();
+
     virtual void tick (float time);
 
@@ -49 +53 @@
     static sAnim   animationList[8];  //!< list of the animations
 
+    int            animationCurrent;  //!< number of the current animation
+    int            animationStep;     //!< the incrementation step of the animation
 
 };

branches/single_player_map/src/world_entities/world_entity.cc

@@ -76 +76 @@
 
   this->objectListNumber = OM_INIT;
+  this->lastObjectListNumber = OM_INIT;
   this->objectListIterator = NULL;
 

branches/single_player_map/src/world_entities/world_entity.h

@@ -95 +95 @@
 
   /** @returns true if this entity is standing on ground (BSP model) */
-  bool isOnGround() const { return this->isOnGround(); }
+  bool isOnGround() const { return this->bOnGround; }
   /** @param flag: marks if this entity is standing on ground */
   void setOnGround(bool flag) { this->bOnGround = flag; }