Changeset 10172 for code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc

Timestamp:

Dec 11, 2014, 1:05:08 PM (9 years ago)

Author:

maxima

Message:

final version for presentation

File:

• code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) (3 diffs)

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -52 +52 @@
         const std::string& lifes = multi_cast<std::string>(this->td->getLifes());
         const std::string& credits = multi_cast<std::string>(this->td->getCredit());
-        const std::string& waves = multi_cast<std::string>(this->td->getWaveNumber());
+        const std::string& wave = multi_cast<std::string>(this->td->getWaveNumber());
 
         if(showlives == true)
@@ -59 +59 @@
           this->setCaption(multi_cast<std::string>(credits));
         else if(showwaves == true)
-          this->setCaption(multi_cast<std::string>(waves));
+          this->setCaption(multi_cast<std::string>(wave));
 
 
@@ -87 +87 @@
                     }
                 }
-            /*if (this->getOwner() != NULL && this->getOwner()->getGametype())
-            {
-                this->owner_ = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype().get());
-            }
-            else
-            {
-                this->owner_ = NULL;
-            }*/
         }