Changeset 12134 for code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc

Timestamp:

Dec 2, 2018, 10:47:00 PM (5 years ago)

Author:

stadlero

Message:

Troop count is visible in the HUD

File:

• code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) (6 diffs)

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

@@ -1 @@
-
-
-
 
 
@@ -64 +61 @@
                         if (checkMove(SET_TROOPS_INITIAL)){
                             this->target_province->owner_ID = this->Player_ID;
-                            this->target_province->troops += 1;
-                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->troops<<endl;
+                            this->target_province->setTroops(this->target_province->getTroops()+1);
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->getTroops()<<endl;
                             master->playerFinishedStageCallback(this);
                         }else{
@@ -77 +74 @@
                     {
                         if (checkMove(SET_TROOPS)){
-                            this->target_province->troops += 1;
-                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->troops<<endl;
+                            this->target_province->setTroops(this->target_province->getTroops()+1);
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->getTroops()<<endl;
                         }
                             
@@ -87 +84 @@
                         if (checkMove(ATTACK))
                         {
-                            while ((this->origin_province->troops > 1) && (this->target_province->troops > 0)) //still troops available
+                            while ((this->origin_province->getTroops() > 1) && (this->target_province->getTroops() > 0)) //still troops available
                             {
-                                while ((this->origin_province->troops >= 4) && (this->target_province->troops >= 2))
+                                while ((this->origin_province->getTroops() >= 4) && (this->target_province->getTroops() >= 2))
                                 {
                                     //normal fight, 3 attackers, 2 defenders
                                 }
 
-                                if ((this->origin_province->troops == 3) && (this->target_province->troops >= 2))
+                                if ((this->origin_province->getTroops() == 3) && (this->target_province->getTroops() >= 2))
                                 {
                                     //2 attackers, 2 defenders
                                 }
 
-                                if((this->origin_province->troops == 2) && (this->target_province->troops >= 2))
+                                if((this->origin_province->getTroops() == 2) && (this->target_province->getTroops() >= 2))
                                 {
                                     //1 attacker, 2 defenders
@@ -107 +104 @@
                             }
 
-                            if (this->target_province->troops == 0) //attacker won
+                            if (this->target_province->getTroops() == 0) //attacker won
                             {
                                 this->target_province->owner_ID = this->Player_ID;
-                                this->target_province->troops = (this->origin_province->troops - 1);
-                                this->origin_province->troops = 1;
+                                this->target_province->setTroops(this->origin_province->getTroops() - 1);
+                                this->origin_province->setTroops(1);
                             }
                         }
@@ -121 +118 @@
                         if (checkMove(MOVE))
                         {
-                            this->target_province->troops += ((this->origin_province->troops) - 1);
-                            this->origin_province->troops = 1;
+                            this->target_province->setTroops(this->origin_province->getTroops()-1);
+                            this->origin_province->setTroops(1);
                         }
                         break;