Changeset 12145 for code/branches/wagnis_HS18/src/modules

Timestamp:

Dec 5, 2018, 10:54:17 AM (6 years ago)

Author:

samuelbl

Message:

Player fixed

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• WagnisPlayer.cc (modified) (9 diffs)
• WagnisPlayer.h (modified) (1 diff)

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

@@ -21 +21 @@
         this->province_selection_changed = false;
         this->gameStage = NOT_READY;
+        this->reinforcements = 0;
     }
     //Destructor
@@ -68 +69 @@
                             orxout()<<"Sorry, someone already owns this provice"<<endl;
                         }
-                        //TODO: Set more troops to provinces before game begins
 
                         break;
@@ -220 +220 @@
     }
 
-
-
-    //Manages a Players turn
-    void WagnisPlayer::playerTurn(){
-        
-    }
     //checks if a move is valid, possible MoveTypes: ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL
     bool WagnisPlayer::checkMove(MoveType move_type)
@@ -265 +259 @@
         return false;
     }
-    
-    //
-    void WagnisPlayer::setTroops(WagnisProvince*){
-
-    }
-    void WagnisPlayer::attack(WagnisProvince*,WagnisProvince*){
-
-    }
-    void WagnisPlayer::moveTroops(WagnisProvince*,WagnisProvince*){
-
-    }
+
     //Return a "Player x" String
     std::string WagnisPlayer::toString(){
@@ -318 +302 @@
     }
 
-    int WagnisPlayer::best3(int a, int b, int c)
+    int WagnisPlayer::best3(int a, int b, int c) //returns best of 3 integers for attack stage
     {
         if(a >= b && a>= c)
@@ -328 +312 @@
     }
 
-    int WagnisPlayer::best2(int a, int b)
+    int WagnisPlayer::best2(int a, int b) //returns best of 2 integers for attack stage
     {
         if(a >= b)
@@ -336 +320 @@
     }
 
-    int WagnisPlayer::second3(int a, int b, int c)
+    int WagnisPlayer::second3(int a, int b, int c) //returns second of 3 integers for attack stage
     {
         if((a >= b && a <= c)||(a <= b && a >= c))
@@ -346 +330 @@
     }
 
-    int WagnisPlayer::second2(int a, int b)
+    int WagnisPlayer::second2(int a, int b) //returns second of 2 integers for attack stage
     {
         if(a <= b)
@@ -353 +337 @@
             return b;    
     }
-
-    int WagnisPlayer::reinforcementCounter() //calculates and sets reeinforcements how many troops a player gets at beginning of his turn
-    {
-        
-        reinforcements = 10;
-        orxout()<<"derp"<<endl;
-        /*
-        int counter = 0;
-
-        for (int i = 0; i <= 100; ++i)
-        {
-            if
-        }
-        */
-
-    }
 }

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

@@ -55 +55 @@
         int second3(int, int, int);
         int second2(int, int);
-        int reinforcementCounter();
     };
 }