Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw

    r7062 r7063  
    5757                createSpaceStationPar(0,2,1,2,1,4,1,50)
    5858              ?>
    59                 <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
    60                 <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
    61                 <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipghost/>
     59                <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
     60                <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
     61                <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    6262            </attached>
    6363          </StaticEntity>
  • code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc

    r7062 r7063  
    8282        this->pointsPerTime=0.0f;
    8383        this->setHUDTemplate("DynamicmatchHUD");
    84         this->allowDeath=false;
    85         this->notYet=true;
    8684    }
    8785
     
    121119                setPlayerColour(victim->getPlayer());           //victim's new colour
    122120                numberOf[piggy]++;                              //party switch: number of players is not affected (decrease and increase)
    123 
    124                 if (target == killer)
    125                 {
    126                      allowDeath=true;
    127                      victim->kill(); //new ship
    128                 }
    129121
    130122                    if(tutorial)                                //announce party switch
     
    143135                        setPlayerColour(originator->getPlayer());               //originator's new colour
    144136                        numberOf[killer]++;
    145                         allowDeath=true;
    146                         originator->kill(); //new ship for killer
     137
    147138                        if(tutorial)                            //announce party switch
    148139                        {
     
    175166                numberOf[killer]++;                             //party switch: number of players is not affected (decrease and increase)
    176167
    177                 allowDeath=true;
    178                 originator->kill(); //new ship
     168
    179169                if(tutorial)                            //announce party switch
    180170                {
     
    195185                setPlayerColour(victim->getPlayer());           //victim colour
    196186                numberOf[chaser]++;                             //party switch: number of players is not affected (decrease and increase)
    197                
    198                 allowDeath=true;
    199                 victim->kill(); //new ship
    200187
    201188                if(tutorial)                                    //announce party switch
     
    279266            setPlayerColour(originator->getPlayer());           //originator colour
    280267
    281             notYet=false;
    282             allowDeath=true;
    283             victim->kill(); //new ship
    284             originator->kill(); //new ship
    285 
    286 
    287268            if(tutorial) //Announce pary switch
    288269            {
     
    318299    bool Dynamicmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
    319300    {   
    320         if (allowDeath)//Hack for Ghost-Spaceship
    321         {
    322           if (notYet)
    323           {allowDeath=false;}
    324           else
    325           {notYet=true;}
    326          return true;
    327         }
    328301        //killers can kill chasers and killers can be killed by chasers
    329302        if ((playerParty_[originator->getPlayer()] == killer && playerParty_[victim->getPlayer()] == chaser)||(playerParty_[victim->getPlayer()] == killer &&
     
    395368        {   pointsPerTime =pointsPerTime + dt;
    396369            gameTime_ = gameTime_ - dt;
    397             if (pointsPerTime > 3.0f)//hard coded!! should be changed
     370            if (pointsPerTime > 2.0f)//hard coded!! should be changed
    398371            {
    399372                pointsPerTime=0.0f;
  • code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h

    r7062 r7063  
    7979        protected:
    8080
    81             bool allowDeath;
    82             bool notYet;
    8381            std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
    8482            std::vector<ColourValue> partyColours_; //aus TeamDeathmatch
Note: See TracChangeset for help on using the changeset viewer.