Changeset 12180 for code/branches/Merge_HS18/src/modules/towerdefense

Timestamp:

Dec 11, 2018, 2:52:30 PM (6 years ago)

Author:

merholzl

Message:

World Map merging

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc ¶

@@ -272 +272 @@
         if (hasStarted() == false || player_ == nullptr)
         {
+            orxout(internal_warning) << "Heere" << endl;
             return;
         }
+
+        orxout(internal_warning) << "2" << endl;
         timeUntilNextWave_ -= dt;
         timeSinceLastSpawn_ += dt;
@@ -280 +283 @@
         if (selecter != nullptr && selecter->buildTower_ == true)
         {
+             orxout(internal_warning) << "3" << endl;
             selecter->buildTower_ = false;
 

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc ¶

@@ -108 +108 @@
     void TowerDefenseSelecter::moveFrontBack(const Vector2& value)
     {
+        
         if (value.x > 0)
         {