Changeset 12119 for code/branches

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:

• CMakeLists.txt (modified) (1 diff)
• Wagnis.cc (modified) (1 diff)
• Wagnis.h (modified) (2 diffs)
• WagnisGameboard.h (modified) (1 diff)
• WagnisPlayer.cc (modified) (1 diff)
• WagnisPlayer.h (modified) (2 diffs)
• WagnisProvince.cc (modified) (2 diffs)

code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt

@@ -3 +3 @@
   WagnisGameboard.cc
   WagnisPlayer.cc
+  Wagnis.cc
 )
 

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc

@@ -10 +10 @@
 RegisterClass(Wagnis);
 
+//Constructor
 Wagnis::Wagnis(Context* context) : Deathmatch(context){
     RegisterObject(Wagnis);
+    this->gameBoard = nullptr;
 }
 //Destructor
 Wagnis::~Wagnis(){}
+
+
+//Runs the game
+void Wagnis::start(){
+    
+}
+
+//Creates and links all needed classes
+void createGame(){
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h

@@ -28 +28 @@
 
 
+enum GameStage { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
 
 namespace orxonox
@@ -33 +34 @@
     class /**_WagnisExport**/ Wagnis : public Deathmatch
     {
+        public:
+        Wagnis(Context* context);
+        virtual ~Wagnis();
+        void start();
 
+
+
+        WagnisGameboard* gameBoard;
+
+        private:
+        void createGame();
     };
 }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h

@@ -33 +33 @@
         void setConnections_string(const std::string&);
         std::string getConnections_string() const;
-        //
-        std::string connections_string;
+        //XML end
+        
         void initializeNeighbors(std::string);
 
 
+        
+        std::string connections_string;
         std::vector<WagnisProvince*> provs;
         int parse_int(std::string,unsigned int);

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc

@@ -44 +44 @@
 
             if(this->province_selection_changed && this->origin_province != nullptr && this->target_province != nullptr){
+                
                 this->province_selection_changed = false;
                 switch(gamestage){

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h

@@ -18 +18 @@
 
 enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL };
-enum GameStagexyz { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
+
 
 
@@ -40 +40 @@
 
 
-        GameStagexyz gamestage;
+        GameStage gamestage;
         bool province_selection_changed;
         bool is_active;

code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc

@@ -7 +7 @@
 #include <vector>
 
-#define WAGNIS_PROVINCE_MAX_HEALTH 1000.0f
+#define WAGNIS_PROVINCE_MAX_HEALTH 1000000.0f
 
 /**TODO
@@ -29 +29 @@
         this->markerBillboard = nullptr;
         this->maxHealth_ = WAGNIS_PROVINCE_MAX_HEALTH;
-        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH-10.0f; // <-- DEBUG
+        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH;
+        
     }
     //Destructor