Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 14, 2011, 2:38:37 PM (12 years ago)
Author:
jo
Message:

teamgametype merged into trunk

Location:
code/branches/presentation2011
Files:
5 edited
4 copied

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2011

  • code/branches/presentation2011/src/orxonox/gametypes/CMakeLists.txt

    r8178 r8980  
    99  LastManStanding.cc
    1010  LastTeamStanding.cc
     11  TeamGametype.cc
     12  Mission.cc
    1113)

  • code/branches/presentation2011/src/orxonox/gametypes/Gametype.cc

    r8858 r8980  
    8585        this->dedicatedKillBots_ = createConsoleCommand( "dedicatedKillBots", createExecutor( createFunctor(&Gametype::killBots, this) ) );
    8686        /* HACK HACK HACK */
     87        //this->numberOfPlayers_ = 0;
    8788    }
    8889
    … …  
    132133                    this->gtinfo_->playerReadyToSpawn(it->first);
    133134            }
    134                    
     135
    135136            this->checkStart();
    136137        }
    … …  
    439440            if(player->isHumanPlayer())
    440441                this->gtinfo_->playerSpawned(player);
    441            
     442
    442443            this->playerPostSpawn(player);
    443444        }

  • code/branches/presentation2011/src/orxonox/gametypes/Gametype.h

    r8706 r8980  
    123123                { return this->gtinfo_->getHUDTemplate(); }
    124124
    125             void addBots(unsigned int amount);
     125            virtual void addBots(unsigned int amount);
    126126            void killBots(unsigned int amount = 0);
    127 
    128             inline unsigned int getNumberOfPlayers() const
    129                 { return this->players_.size(); }
    130127
    131128            virtual void addTime(float t);
    … …  
    151148
    152149            //inline bool getForceSpawn()
    153             //  { return this->bForceSpawn_; }       
     150            //  { return this->bForceSpawn_; }
    154151
    155152            virtual void resetTimer();
    156153            virtual void resetTimer(float t);
     154            inline unsigned int getNumberOfPlayers()
     155              { return this->gtinfo_->getNumberOfPlayers(); }
    157156
    158157        protected:
    … …  
    192191            ConsoleCommand* dedicatedKillBots_;
    193192            /* HACK HACK HACK */
     193
    194194    };
    195195}

  • code/branches/presentation2011/src/orxonox/gametypes/TeamDeathmatch.h

    r5781 r8980  
    5656
    5757            int getTeam(PlayerInfo* player);
    58 
    5958            inline const ColourValue& getTeamColour(int teamnr) const
    6059                { return this->teamcolours_[teamnr]; }
Note: See TracChangeset for help on using the changeset viewer.