Changeset 7082 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:32:14 PM (19 years ago)

Author:

patrick

Message:

trunk: respawn and death patch

Location:

trunk/src

Files:

• story_entities/multi_player_world_data.cc (modified) (3 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)

trunk/src/story_entities/multi_player_world_data.cc

@@ -202 +202 @@
     {
       this->localPlayer = new Player();
-      State::setPlayer(this->localPlayer);
 
       Playable* playable;
@@ -221 +220 @@
       /* create a Player */
       this->localPlayer = new Player();
-      State::setPlayer(this->localPlayer);
     }
 
@@ -228 +226 @@
     PNode::getNullParent()->init();
   }
+  State::setPlayer(this->localPlayer);
 }
 

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -43 +43 @@
   this->bLocalPlayerDead = false;
   this->deathTimeout = 10.0f;     // 5 seconds
+  this->timeout = 0.0f;
 
   this->deathScreen = new Billboard();

trunk/src/world_entities/playable.cc

@@ -148 +148 @@
     State::getGameRules()->onPlayerSpawn();
 
-  this->setAbsCoor(0.0, 0.0, 0.0);
-
-  if( this->getOwner()%2 == 0)
+  if( this->getOwner() % 2 == 0)
+  {
     this->toList(OM_GROUP_00);
+    this->setAbsCoor(213.37, 57.71, -47.98);
+    this->setAbsDir(Quaternion(0.16, 0.98, -0.10));
+  }
   else
+  {
     this->toList(OM_GROUP_01);
+    this->toList(OM_GROUP_01);
+    this->setAbsCoor(-314.450, 40.701, 83.554);
+  }
 }