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

Timestamp:

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

Author:

stadlero

Message:

some bugfixes

File:

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

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;
+    }
 }