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

Timestamp:

Nov 28, 2018, 11:17:41 PM (5 years ago)

Author:

stadlero

Message:

changed gametype from Deathmatch to Wagnis in Wagnis.oxw + some wip in Wagnis.cc

File:

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

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

@@ -30 +30 @@
         SUPER(WagnisPlayer, tick, dt);
 
+        ///////////TEST//////////////
+        /**
+        if(this->is_active){
+            (master ->* ((orxonox::WagnisPlayer*)this)->orxonox::WagnisPlayer::finishedStageCallback) (this);
+        }
+
+        **/
+        ///////////TEST//////////////
+
+
+
         if(this->is_active)
         {
@@ -45 +56 @@
 
             if((this->province_selection_changed && this->origin_province != nullptr && this->target_province != nullptr)
-            ||(this->province_selection_changed && this->target_province != nullptr && ((gamestage == CHOOSE_PROVINCE_STAGE)||(gamestage == REINFORCEMENT_STAGE)))){
+            ||(this->province_selection_changed && this->target_province != nullptr && ((gameStage == CHOOSE_PROVINCE_STAGE)||(gameStage == REINFORCEMENT_STAGE)))){
                 
                 this->province_selection_changed = false;
-                switch(gamestage){
+                switch(gameStage){
                     case CHOOSE_PROVINCE_STAGE: 
                     {   
@@ -107 +118 @@
                         break;
                     }
+
+                    default: break;
                 }
             }