Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12119


Ignore:
Timestamp:
Nov 28, 2018, 10:02:11 AM (6 years ago)
Author:
stadlero
Message:

Wagnis class does now compile

Location:
code/branches/wagnis_HS18/src/modules/wagnis
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt

    r12109 r12119  
    33  WagnisGameboard.cc
    44  WagnisPlayer.cc
     5  Wagnis.cc
    56)
    67
  • code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc

    r12114 r12119  
    1010RegisterClass(Wagnis);
    1111
     12//Constructor
    1213Wagnis::Wagnis(Context* context) : Deathmatch(context){
    1314    RegisterObject(Wagnis);
     15    this->gameBoard = nullptr;
    1416}
    1517//Destructor
    1618Wagnis::~Wagnis(){}
     19
     20
     21//Runs the game
     22void Wagnis::start(){
     23   
     24}
     25
     26//Creates and links all needed classes
     27void createGame(){
     28
     29}
     30
     31
     32
     33
     34
     35
     36
     37
     38
     39
     40
     41
    1742
    1843
  • code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h

    r12114 r12119  
    2828
    2929
     30enum GameStage { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
    3031
    3132namespace orxonox
     
    3334    class /**_WagnisExport**/ Wagnis : public Deathmatch
    3435    {
     36        public:
     37        Wagnis(Context* context);
     38        virtual ~Wagnis();
     39        void start();
    3540
     41
     42
     43        WagnisGameboard* gameBoard;
     44
     45        private:
     46        void createGame();
    3647    };
    3748}
  • code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h

    r12114 r12119  
    3333        void setConnections_string(const std::string&);
    3434        std::string getConnections_string() const;
    35         //
    36         std::string connections_string;
     35        //XML end
     36       
    3737        void initializeNeighbors(std::string);
    3838
    3939
     40       
     41        std::string connections_string;
    4042        std::vector<WagnisProvince*> provs;
    4143        int parse_int(std::string,unsigned int);
  • code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc

    r12114 r12119  
    4444
    4545            if(this->province_selection_changed && this->origin_province != nullptr && this->target_province != nullptr){
     46               
    4647                this->province_selection_changed = false;
    4748                switch(gamestage){
  • code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h

    r12114 r12119  
    1818
    1919enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL };
    20 enum GameStagexyz { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
     20
    2121
    2222
     
    4040
    4141
    42         GameStagexyz gamestage;
     42        GameStage gamestage;
    4343        bool province_selection_changed;
    4444        bool is_active;
  • code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc

    r12114 r12119  
    77#include <vector>
    88
    9 #define WAGNIS_PROVINCE_MAX_HEALTH 1000.0f
     9#define WAGNIS_PROVINCE_MAX_HEALTH 1000000.0f
    1010
    1111/**TODO
     
    2929        this->markerBillboard = nullptr;
    3030        this->maxHealth_ = WAGNIS_PROVINCE_MAX_HEALTH;
    31         this->health_ = WAGNIS_PROVINCE_MAX_HEALTH-10.0f; // <-- DEBUG
     31        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH;
     32       
    3233    }
    3334    //Destructor
Note: See TracChangeset for help on using the changeset viewer.