Changeset 12160 for code/branches/wagnis_HS18/src

Timestamp:

Dec 5, 2018, 7:51:11 PM (6 years ago)

Author:

stadlero

Message:

some bugfixes

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• Wagnis.cc (modified) (5 diffs)
• WagnisGameboard.cc (modified) (3 diffs)
• WagnisHUDinfo.cc (modified) (1 diff)
• WagnisPlayer.cc (modified) (3 diffs)
• WagnisPlayer.h (modified) (1 diff)
• WagnisProvince.cc (modified) (2 diffs)

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

@@ -64 +64 @@
  **/
 void Wagnis::playerFinishedStageCallback(WagnisPlayer* player){
+
+    player->resetProvinceSelection();
 
     if(this->active_player != player->Player_ID){
@@ -132 +134 @@
             player->gameStage = ATTACK_STAGE;
             this->gameStage = ATTACK_STAGE;
+            player->reinforcements = provincesOfPlayerCounter(player->Player_ID);
             orxout()<<"Player "<<player->Player_ID<<"\'s turn. Attack."<<endl;
             break;
@@ -170 +173 @@
     }
 
-    //this->gameBoard->initializeNeighbors();
-
-    //for(WagnisPlayer* p: this->players){
-        //this->playerEntered(p);
-    //}
+    this->gameBoard->initializeNeighbors();
     
     orxout() << "Game creation finished" << endl;
@@ -198 +197 @@
             }
         }else{
-            orxout()<<"Nullpointer found in provines!!!"<<endl;
+            orxout()<<"Nullpointer found in provinces!!!"<<endl;
         }
     }
@@ -212 +211 @@
             }
         }else{
-            orxout()<<"Nullpointer found in provines!!!"<<endl;
+            orxout()<<"Nullpointer found in provinces!!!"<<endl;
         }
     }

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

@@ -64 +64 @@
         orxout() << "String size:" << endl;
         orxout() << str.size() << endl;
+        orxout() << str<<endl;
         unsigned int n = 0;
         while(n < str.size()){
@@ -85 +86 @@
                             if(other->getID() == other_ID){
                                 orig->addNeighbor(other);
-                                orxout() << "Added neighbor province "<< other_ID << " to province " << origin_ID << endl;
+                                //orxout() << "Added neighbor province "<< other_ID << " to province " << origin_ID << endl;
                                 break;
                             }
                         }
                     }
-                    break;
                 }
             }while((n < str.size()) && (str[n] == '+'));
+
             if(n == str.size()) return;
             while((n < str.size()) && (str[n] == ' ')) n++;
@@ -102 +103 @@
             n++;
             while(n < str.size() && str[n] == ' ') n++;
+            orxout()<<"One province finished"<<endl;
         }
     }

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

@@ -79 +79 @@
             }
             case REINFORCEMENT_STAGE: {
-                ss<<"Player "<<wagnisgame->active_player<<" place your reinforcements";
+                ss<<"Player "<<wagnisgame->active_player<<" place your reinforcements: "<<wagnisgame->players.at(wagnisgame->active_player-1)->reinforcements;
                 setCaption( ss.str() );
                 break;

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

@@ -47 +47 @@
                         this->province_selection_changed = true;
                     }else{
+                        if(this->origin_province != nullptr) this->origin_province->dehighlight();
                         this->origin_province = prov;
+                        this->origin_province->highlight();
                         this->province_selection_changed = true;
                     }
@@ -82 +84 @@
                                 this->reinforcements -= 1;
                                 orxout()<<"Province "<<this->target_province->getID()<<" owned by Player "<<this->target_province->getOwner_ID()<<" troops: "<<this->target_province->getTroops()<<endl;
+                                if(reinforcements == 0) master->playerFinishedStageCallback(this);
                             }
                         }   
@@ -351 +354 @@
         return this->is_active;
     }
+
+    //Resets the two province pointers and dehighlights them.
+    void WagnisPlayer::resetProvinceSelection(){
+
+        if(this->origin_province != nullptr)this->origin_province->dehighlight();
+        if(this->target_province != nullptr)this->target_province->dehighlight();
+        this->origin_province = nullptr;
+        this->target_province = nullptr;
+    }
 }

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

@@ -38 +38 @@
         void setActive(bool);
         bool isActive() const;
+        void resetProvinceSelection();
 
 

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

@@ -20 +20 @@
         this->owner_ID = -1;
         this->troops = 0;
-        this->setRadarName(std::to_string(0));
+        this->setRadarName("");
         this->setRadarObjectColour(colour({128,128,128}, 100.0f));
         this->ID = -1;
@@ -81 +81 @@
         this->setOwner_ID( this->getOwner_ID() );
     }
+
+
+
+    
     //set troops
     void WagnisProvince::setTroops(int troops){