[Orxonox-commit 7759] r12351 - code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

[ahuwyler at orxonox.net]

Author: ahuwyler
Date: 2019-05-09 13:59:07 +0200 (Thu, 09 May 2019)
New Revision: 12351

Modified:
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
Log:
Walls are coming down

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-09 11:56:28 UTC (rev 12350)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-09 11:59:07 UTC (rev 12351)
@@ -187,6 +187,7 @@
 
         // Call end for the parent class.
         Deathmatch::end();
+        GSLevel::startMainMenu();
     }
 
     OrxoBloxShip* OrxoBlox::getPlayer()
@@ -215,14 +216,13 @@
 
     void OrxoBlox::LevelUp(){
         level_++;
-        this->createWall();
 
         for(OrxoBloxWall* Wall : this->activeWalls_){
-            int x_=(Wall->getPosition()).x;
-            orxout()<<x_<<endl;
-            Wall->setPosition(0,0,x_+10.0f);
+            int z_=(Wall->getPosition()).z;
+            if(z_==90)this->end();
+            Wall->setPosition(0,0,z_+9.0f);
         }
-
+        this->createWall();
         this->activeWalls_.push_back(this->futureWall_);
         for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
             if (this->futureWall_->getStone(i) == nullptr) {