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

Timestamp:

Nov 29, 2018, 7:22:46 PM (5 years ago)

Author:

stadlero

Message:

Wagnis runs without crashing on startup

File:

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

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

@@ -21 +21 @@
         this->target_province = nullptr;
         this->province_selection_changed = false;
+        this->gameStage = NOT_READY;
     }
     //Destructor
@@ -30 +31 @@
         SUPER(WagnisPlayer, tick, dt);
 
-        ///////////TEST//////////////
-        /**
-        if(this->is_active){
-            (master ->* ((orxonox::WagnisPlayer*)this)->orxonox::WagnisPlayer::finishedStageCallback) (this);
-        }
-
-        **/
-        ///////////TEST//////////////
-
-
-
         if(this->is_active)
         {
+            
             for(WagnisProvince* prov:this->gameBoard->provs){
+                //orxout()<<"province health: "<<prov->getHealth()<<endl;
                 if(prov->getHealth() < prov->getMaxHealth()){
+                    //Check if next-player-button was hit
+                    if(prov->getID() == 1000){
+                        master->playerFinishedStageCallback(this);
+                        break;
+                    }
+                    //Check left/right click
                     if(prov->getHealth() <= prov->getMaxHealth()-1000.0f){
                         this->target_province = prov;
@@ -52 +50 @@
                         this->province_selection_changed = true;
                     }
+                    prov->setHealth(prov->getMaxHealth());
                 }
             }