Changeset 9162 in orxonox.OLD for branches/presentation

Timestamp:

Jul 4, 2006, 6:15:10 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/presentation/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/creatures/fps_player.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.h (modified) (1 diff)
• world_entities/npcs/ground_turret.cc (modified) (1 diff)
• world_entities/npcs/ground_turret.h (modified) (1 diff)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (1 diff)
• world_entities/projectiles/guided_missile.cc (modified) (2 diffs)
• world_entities/projectiles/guided_missile.h (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.h (modified) (1 diff)
• world_entities/projectiles/laser.cc (modified) (2 diffs)
• world_entities/projectiles/laser.h (modified) (1 diff)
• world_entities/projectiles/projectile.cc (modified) (2 diffs)
• world_entities/projectiles/projectile.h (modified) (1 diff)
• world_entities/projectiles/rocket.cc (modified) (2 diffs)
• world_entities/projectiles/rocket.h (modified) (1 diff)
• world_entities/projectiles/test_bullet.cc (modified) (2 diffs)
• world_entities/projectiles/test_bullet.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/test_entity.cc (modified) (2 diffs)
• world_entities/test_entity.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/presentation/src/lib/coord/p_node.cc ¶

@@ -1089 +1089 @@
 void PNode::varChangeHandler( std::list< int > & id )
 {
+  Synchronizeable::varChangeHandler( id );
+  
   if ( std::find( id.begin(), id.end(), relCoordinate_handle ) != id.end() )
   {

branches/presentation/src/util/multiplayer_team_deathmatch.cc ¶

@@ -210 +210 @@
   while ( this->killList.begin() != this->killList.end() )
   {
+    PRINTF(0)("KKKKKKKKIIIIIIIIILLLLLLLLLLLLL\n");
     onKill( this->killList.begin()->getVictim(), this->killList.begin()->getKiller() );
     this->killList.erase( this->killList.begin() );
@@ -709 +710 @@
 {
   if ( !victim )
-    return;
+  {
+    PRINTF(0)("victim == NULL\n");
+    return;
+  }
   if ( !killer )
-    return;
+  {
+    PRINTF(0)("killer == NULL\n");
+    return;
+  }
   
   int killerUserId = killer->getOwner();
   int victimUserId = victim->getOwner();
+  
+  PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassName(), victim->getClassName());
 
   PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );
@@ -720 +729 @@
   
   if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
-    return;
+  {
+    PRINTF(0)("killerStats.getPlayable() != killer || victimStats.getPlayable() != victim\n");
+    PRINTF(0)("%x %x %x %x\n", killerStats.getPlayable(), killer, victimStats.getPlayable(), victim );
+    PRINTF(0)("%d %d %d %d\n", killerStats.getPlayable()->getUniqueID(), killer->getUniqueID(), victimStats.getPlayable()->getUniqueID(), victim->getUniqueID() );
+    return;
+  }
 
   //check for suicide

branches/presentation/src/world_entities/creatures/fps_player.cc ¶

@@ -416 +416 @@
 }
 
+void FPSPlayer::destroy( WorldEntity* killer )
+{
+  Playable::destroy( killer );
+  
+  toList( OM_DEAD );
+}
+

branches/presentation/src/world_entities/creatures/fps_player.h ¶

@@ -27 +27 @@
     virtual void reset();
     
+    virtual void destroy(WorldEntity* killer);
     virtual void respawn();
 

branches/presentation/src/world_entities/npcs/generic_npc.cc ¶

@@ -581 +581 @@
 
 
-void GenericNPC::destroy()
+void GenericNPC::destroy(WorldEntity* killer)
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);

branches/presentation/src/world_entities/npcs/generic_npc.h ¶

@@ -77 +77 @@
 
 
-  void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   private:

branches/presentation/src/world_entities/npcs/ground_turret.cc ¶

@@ -176 +176 @@
 }
 
-void GroundTurret::destroy()
+void GroundTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

branches/presentation/src/world_entities/npcs/ground_turret.h ¶

@@ -25 +25 @@
   virtual void leftWorld ();
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;

branches/presentation/src/world_entities/playable.cc ¶

@@ -401 +401 @@
 
 
-void Playable::destroy()
-{
-  Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));
-
-
+void Playable::destroy(WorldEntity* killer)
+{
   if( !this->bDead)
   {
@@ -414 +411 @@
       if( this == State::getPlayer()->getPlayable())
         State::getGameRules()->onPlayerDeath();
-
-      //     this->toList(OM_GROUP_05);
-      //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
-      this->setAbsCoor(-2000.0, -2000.0, -2000.0);
-
-      //explosion hack
-
     }
     this->bDead = true;
+    
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }

branches/presentation/src/world_entities/playable.h ¶

@@ -80 +80 @@
 
   // WorldEntity Extensions
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
   virtual void respawn();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);

branches/presentation/src/world_entities/projectiles/guided_missile.cc ¶

@@ -135 +135 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -180 +180 @@
  *  the function gets called, when the projectile is destroyed
  */
-void GuidedMissile::destroy ()
-{
-  Projectile::destroy();
+void GuidedMissile::destroy (WorldEntity* killer)
+{
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY GuidedMissile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

branches/presentation/src/world_entities/projectiles/guided_missile.h ¶

@@ -26 +26 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

branches/presentation/src/world_entities/projectiles/hyperblast.cc ¶

@@ -126 +126 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Hyperblast::destroy ()
+void Hyperblast::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Hyperblast\n");

branches/presentation/src/world_entities/projectiles/hyperblast.h ¶

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

branches/presentation/src/world_entities/projectiles/laser.cc ¶

@@ -107 +107 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -128 +128 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Laser::destroy ()
+void Laser::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

branches/presentation/src/world_entities/projectiles/laser.h ¶

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

branches/presentation/src/world_entities/projectiles/projectile.cc ¶

@@ -162 +162 @@
 
   if (this->tickLifeCycle(dt))
-    this->destroy();
+    this->destroy( NULL );
 }
 
@@ -169 +169 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Projectile::destroy ()
+void Projectile::destroy (WorldEntity* killer)
 {
   if (this->explosionBuffer != NULL)

branches/presentation/src/world_entities/projectiles/projectile.h ¶

@@ -41 +41 @@
     virtual void deactivate() = 0;
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

branches/presentation/src/world_entities/projectiles/rocket.cc ¶

@@ -128 +128 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -149 +149 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Rocket::destroy ()
+void Rocket::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Rocket\n");

branches/presentation/src/world_entities/projectiles/rocket.h ¶

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

branches/presentation/src/world_entities/projectiles/test_bullet.cc ¶

@@ -119 +119 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -147 +147 @@
  *  the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy ()
+void TestBullet::destroy (WorldEntity* killer)
 {
   PRINTF(5)("DESTROY TestBullet\n");

branches/presentation/src/world_entities/projectiles/test_bullet.h ¶

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

branches/presentation/src/world_entities/space_ships/space_ship.cc ¶

@@ -513 +513 @@
 }
 
-void SpaceShip::destroy( )
+void SpaceShip::destroy( WorldEntity* killer )
 {
   PRINTF(0)("spaceship destroy\n");

branches/presentation/src/world_entities/space_ships/space_ship.h ¶

@@ -37 +37 @@
     virtual void leftWorld();
     
-    virtual void destroy();
+    virtual void destroy(WorldEntity* killer);
     virtual void respawn();
 

branches/presentation/src/world_entities/test_entity.cc ¶

@@ -116 +116 @@
   if( this->lastCollided != entity)
   {
-    this->destroy();
+    this->destroy( entity );
     this->lastCollided = entity;
 
@@ -126 +126 @@
 
 
-void TestEntity::destroy()
+void TestEntity::destroy(WorldEntity* killer)
 {
   if( this->bDeath)

branches/presentation/src/world_entities/test_entity.h ¶

@@ -25 +25 @@
   void setAnim(int animationIndex, int animPlaybackMode);
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick (float time);

branches/presentation/src/world_entities/world_entity.cc ¶

@@ -750 +750 @@
   else
   {
-    this->destroy();
-
-    if( State::getGameRules() != NULL)
-      State::getGameRules()->registerKill(Kill(killer, this));
+    this->destroy( killer );
   }
 }
@@ -761 +758 @@
  * destoys the world entity
  */
-void WorldEntity::destroy()
+void WorldEntity::destroy(WorldEntity* killer)
 {
   this->toList(OM_DEAD);

branches/presentation/src/world_entities/world_entity.h ¶

@@ -101 +101 @@
   virtual void hit(float damage, WorldEntity* killer);
 
-  virtual void destroy();
+  virtual void destroy( WorldEntity* killer );