Changeset 7085 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:51:47 PM (19 years ago)

Author:

patrick

Message:

trunk: entity is reset now after death

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/space_ship.h (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -148 +148 @@
     State::getGameRules()->onPlayerSpawn();
 
+  this->reset();
+
   if( this->getOwner() % 2 == 0)
   {
@@ -157 +159 @@
   {
     this->toList(OM_GROUP_01);
-    this->toList(OM_GROUP_01);
     this->setAbsCoor(-314.450, 40.701, 83.554);
+    this->setAbsDir(Quaternion(0.0, 0.0, 0.0));
   }
 }

trunk/src/world_entities/space_ships/space_ship.cc

@@ -257 +257 @@
 }
 
+
+void SpaceShip::reset()
+{
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
+
+  xMouse = yMouse = 0;
+
+  this->setHealth(80);
+  this->velocity = Vector(0.0, 0.0, 0.0);
+}
 
 

trunk/src/world_entities/space_ships/space_ship.h

@@ -32 +32 @@
     virtual void leave();
 
+    virtual void reset();
+
     virtual void postSpawn();
     virtual void leftWorld();
@@ -43 +45 @@
     virtual int       writeBytes(const byte* data, int length, int sender);
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
+
 
   private:

trunk/src/world_entities/world_entity.cc

@@ -291 +291 @@
 
 /**
+ * resets the WorldEntity to its initial values. eg. used for multiplayer games: respawning
+ */
+void WorldEntity::reset()
+{}
+
+/**
  *  this method is called every frame
  * @param time: the time in seconds that has passed since the last tick

trunk/src/world_entities/world_entity.h

@@ -51 +51 @@
   inline bool isVisible() const { return this->bVisible; };
 
-
+  virtual void reset();
 
   virtual void postSpawn ();