Changeset 7063 for code/branches

Timestamp:

May 31, 2010, 5:21:40 PM (14 years ago)

Author:

jo

Message:

stable version without the ghost-spaceship

Location:

code/branches/presentation3

Files:

• data/levels/gametype_dynamicmatch.oxw (modified) (1 diff)
• src/orxonox/gametypes/Dynamicmatch.cc (modified) (8 diffs)
• src/orxonox/gametypes/Dynamicmatch.h (modified) (1 diff)

code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw

@@ -57 +57 @@
                 createSpaceStationPar(0,2,1,2,1,4,1,50)
               ?>
-                <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
-                <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
-                <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
+                <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+                <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+                <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
             </attached>
           </StaticEntity>

code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc

@@ -82 +82 @@
         this->pointsPerTime=0.0f;
         this->setHUDTemplate("DynamicmatchHUD");
-        this->allowDeath=false;
-        this->notYet=true;
     }
 
@@ -121 +119 @@
                 setPlayerColour(victim->getPlayer());           //victim's new colour
                 numberOf[piggy]++;                              //party switch: number of players is not affected (decrease and increase)
-
-                if (target == killer)
-                {
-                     allowDeath=true;
-                     victim->kill(); //new ship
-                }
 
                     if(tutorial)                                //announce party switch
@@ -143 +135 @@
                         setPlayerColour(originator->getPlayer());               //originator's new colour
                         numberOf[killer]++;
-                        allowDeath=true;
-                        originator->kill(); //new ship for killer
+
                         if(tutorial)                            //announce party switch
                         {
@@ -175 +166 @@
                 numberOf[killer]++;                             //party switch: number of players is not affected (decrease and increase)
 
-                allowDeath=true;
-                originator->kill(); //new ship
+
                 if(tutorial)                            //announce party switch
                 {
@@ -195 +185 @@
                 setPlayerColour(victim->getPlayer());           //victim colour
                 numberOf[chaser]++;                             //party switch: number of players is not affected (decrease and increase)
-                
-                allowDeath=true;
-                victim->kill(); //new ship
 
                 if(tutorial)                                    //announce party switch
@@ -279 +266 @@
             setPlayerColour(originator->getPlayer());           //originator colour
 
-            notYet=false;
-            allowDeath=true;
-            victim->kill(); //new ship
-            originator->kill(); //new ship
-
-
             if(tutorial) //Announce pary switch
             {
@@ -318 +299 @@
     bool Dynamicmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
     {   
-        if (allowDeath)//Hack for Ghost-Spaceship
-        {
-          if (notYet)
-          {allowDeath=false;}
-          else
-          {notYet=true;}
-         return true;
-        }
         //killers can kill chasers and killers can be killed by chasers
         if ((playerParty_[originator->getPlayer()] == killer && playerParty_[victim->getPlayer()] == chaser)||(playerParty_[victim->getPlayer()] == killer &&
@@ -395 +368 @@
         {   pointsPerTime =pointsPerTime + dt;
             gameTime_ = gameTime_ - dt;
-            if (pointsPerTime > 3.0f)//hard coded!! should be changed
+            if (pointsPerTime > 2.0f)//hard coded!! should be changed
             {
                 pointsPerTime=0.0f;

code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h

@@ -79 +79 @@
         protected:
 
-            bool allowDeath;
-            bool notYet;
             std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
             std::vector<ColourValue> partyColours_; //aus TeamDeathmatch