Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 23, 2017, 2:56:00 PM (7 years ago)
Author:
patricwi
Message:

reset back in time

Location:
code/branches/HUD_HS16
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/HUD_HS16

  • code/branches/HUD_HS16/src/orxonox/infos/Bot.cc

    r11497 r11499  
    6868        static const std::string names[] =
    6969        {
    70             "Berkay Berabi",
    71             "Louis  Meile"
    72             "Muten Roshi",
    73             "Abradolf Lincler",
    74             "Lionel Messi",
     70            "Dr. Julius No",
     71            "Rosa Klebb",
     72            "Auric Goldfinger",
     73            "Emilio Largo",
     74            "Ernst Stavro Blofeld",
     75            "Dr. Kananga",
     76            "Francisco Scaramanga",
     77            "Karl Stromberg",
     78            "Sir Hugo Drax",
     79            "Aris Kristatos",
    7580            "Kamal Khan",
    76             "Karl the Llama",
    77             "Thomas the Tankengine",
    78             "Rick",
    79             "Morty",
    80             "Charlie the Unicorn",
    81             "Kung Fury",
    82             "Postman Pat"
     81            "General Orlov",
     82            "Max Zorin",
     83            "Brad Whitaker",
     84            "General Georgi Koskov",
     85            "Franz Sanchez",
     86            "Alec Trevelyan",
     87            "Elliot Carver",
     88            "Elektra King",
     89            "Viktor Zokas",
     90            "Gustav Graves",
     91            "Le Chiffre",
     92            "Mr. White",
     93            "Dominic Greene"
    8394        };
    8495        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));

  • code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h

    r11497 r11499  
    8383            inline bool isStartCountdownRunning() const
    8484                { return this->bStartCountdownRunning_; }
    85            
    8685            void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
    8786
    … …  
    133132            void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
    134133            void dispatchFadingMessage(const std::string& message) const;
    135             void setStartCountdown(float countdown); // Set the start countdown to the input value.
    136 
    137134
    138135        protected:
    139136            void start(void); // Inform the GametypeInfo that the game has started.
    140137            void end(void); // Inform the GametypeInfo that the game has ended.
     138            void setStartCountdown(float countdown); // Set the start countdown to the input value.
    141139            void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
    142140            void countDown(); // Count down the start countdown counter.
Note: See TracChangeset for help on using the changeset viewer.