Changeset 12119
- Timestamp:
- Nov 28, 2018, 10:02:11 AM (6 years ago)
- 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 3 3 WagnisGameboard.cc 4 4 WagnisPlayer.cc 5 Wagnis.cc 5 6 ) 6 7 -
code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc
r12114 r12119 10 10 RegisterClass(Wagnis); 11 11 12 //Constructor 12 13 Wagnis::Wagnis(Context* context) : Deathmatch(context){ 13 14 RegisterObject(Wagnis); 15 this->gameBoard = nullptr; 14 16 } 15 17 //Destructor 16 18 Wagnis::~Wagnis(){} 19 20 21 //Runs the game 22 void Wagnis::start(){ 23 24 } 25 26 //Creates and links all needed classes 27 void createGame(){ 28 29 } 30 31 32 33 34 35 36 37 38 39 40 41 17 42 18 43 -
code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h
r12114 r12119 28 28 29 29 30 enum GameStage { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE }; 30 31 31 32 namespace orxonox … … 33 34 class /**_WagnisExport**/ Wagnis : public Deathmatch 34 35 { 36 public: 37 Wagnis(Context* context); 38 virtual ~Wagnis(); 39 void start(); 35 40 41 42 43 WagnisGameboard* gameBoard; 44 45 private: 46 void createGame(); 36 47 }; 37 48 } -
code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h
r12114 r12119 33 33 void setConnections_string(const std::string&); 34 34 std::string getConnections_string() const; 35 // 36 std::string connections_string;35 //XML end 36 37 37 void initializeNeighbors(std::string); 38 38 39 39 40 41 std::string connections_string; 40 42 std::vector<WagnisProvince*> provs; 41 43 int parse_int(std::string,unsigned int); -
code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc
r12114 r12119 44 44 45 45 if(this->province_selection_changed && this->origin_province != nullptr && this->target_province != nullptr){ 46 46 47 this->province_selection_changed = false; 47 48 switch(gamestage){ -
code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h
r12114 r12119 18 18 19 19 enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL }; 20 enum GameStagexyz { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE }; 20 21 21 22 22 … … 40 40 41 41 42 GameStage xyzgamestage;42 GameStage gamestage; 43 43 bool province_selection_changed; 44 44 bool is_active; -
code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
r12114 r12119 7 7 #include <vector> 8 8 9 #define WAGNIS_PROVINCE_MAX_HEALTH 1000 .0f9 #define WAGNIS_PROVINCE_MAX_HEALTH 1000000.0f 10 10 11 11 /**TODO … … 29 29 this->markerBillboard = nullptr; 30 30 this->maxHealth_ = WAGNIS_PROVINCE_MAX_HEALTH; 31 this->health_ = WAGNIS_PROVINCE_MAX_HEALTH-10.0f; // <-- DEBUG 31 this->health_ = WAGNIS_PROVINCE_MAX_HEALTH; 32 32 33 } 33 34 //Destructor
Note: See TracChangeset
for help on using the changeset viewer.