Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9972 for code/trunk/src


Ignore:
Timestamp:
Jan 4, 2014, 2:28:19 PM (11 years ago)
Author:
jo
Message:

Something went wrong. I will correct the error later. So far just this patch.

Location:
code/trunk/src/orxonox/gametypes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/gametypes/Gametype.cc

    r9969 r9972  
    3535#include "core/GameMode.h"
    3636#include "core/command/ConsoleCommand.h"
    37 #include "gamestates/GSLevel.h"
     37//#include "gamestates/GSLevel.h"
    3838
    3939#include "infos/PlayerInfo.h"
     
    6262        this->bAutoStart_ = false;
    6363        this->bForceSpawn_ = false;
    64         this->bAutoEnd_ = true;
     64        //this->bAutoEnd_ = true;
    6565        this->numberOfBots_ = 0;
    6666
     
    106106        SetConfigValue(bAutoStart_, false);
    107107        SetConfigValue(bForceSpawn_, false);
    108         SetConfigValue(bAutoEnd_, true);
     108        //SetConfigValue(bAutoEnd_, true);
    109109        SetConfigValue(numberOfBots_, 0);
    110110        SetConfigValue(scoreboardTemplate_, "defaultScoreboard");
     
    154154    {
    155155        this->gtinfo_->end();
    156         if (this->bAutoEnd_)
    157             this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
     156        //if (this->bAutoEnd_)
     157        //    this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
    158158
    159159        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
     
    519519    }
    520520
    521     void Gametype::showMenu()
    522     {
    523         GSLevel::startMainMenu();
    524     }
     521    //void Gametype::showMenu()
     522    //{
     523    //  GSLevel::startMainMenu();
     524    //}
    525525}
  • code/trunk/src/orxonox/gametypes/Gametype.h

    r9969 r9972  
    4040#include "tools/interfaces/Tickable.h"
    4141#include "infos/GametypeInfo.h"
    42 #include "tools/Timer.h"
     42//#include "tools/Timer.h"
    4343
    4444namespace orxonox
     
    159159            inline unsigned int getNumberOfPlayers() const
    160160                { return this->players_.size(); }
    161             void showMenu();
     161            //void showMenu();
    162162
    163163
     
    176176            bool bAutoStart_;
    177177            bool bForceSpawn_;
    178             bool bAutoEnd_;
     178            //bool bAutoEnd_;
    179179
    180180            float time_;
     
    199199            ConsoleCommand* dedicatedKillBots_;
    200200            /* HACK HACK HACK */
    201             Timer showMenuTimer_;
     201            //Timer showMenuTimer_;
    202202    };
    203203}
Note: See TracChangeset for help on using the changeset viewer.