[Orxonox-commit 7216] r11830 - in code/branches/TowerDefense_FS18: data/levels src/modules/towerdefense

[skaeser at orxonox.net]

Author: skaeser
Date: 2018-03-22 16:14:34 +0100 (Thu, 22 Mar 2018)
New Revision: 11830

Modified:
   code/branches/TowerDefense_FS18/data/levels/towerDefense.oxw
   code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefenseEnemy.cc
Log:
changed map

Modified: code/branches/TowerDefense_FS18/data/levels/towerDefense.oxw
===================================================================
--- code/branches/TowerDefense_FS18/data/levels/towerDefense.oxw	2018-03-22 15:12:23 UTC (rev 11829)
+++ code/branches/TowerDefense_FS18/data/levels/towerDefense.oxw	2018-03-22 15:14:34 UTC (rev 11830)
@@ -22,7 +22,7 @@
 <Template name=selectercameras defaults=0>
   <TowerDefenseSelecter>
     <camerapositions>
-      <CameraPosition position="0,0,1300" lookat="0,0,0" absolute=true drag=true mouselook=true/>
+      <CameraPosition position="0,0,1600" lookat="0,0,0" absolute=true drag=true mouselook=true/>
     </camerapositions>
   </TowerDefenseSelecter>
 </Template>
@@ -498,19 +498,19 @@
             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
-            F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
+            F1F1F1I2F1F1F1F1F1F1F1Y1F1Y1F1F1
             F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
-            F1F1F1R2I3I3I3I3L3F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            X1I1I1I1R0F1F1F1I2F1F1F1F1F1F1F1
+            F1F1F1R2I3I3I3I3I3I3I3I3I3I3L3F1
+            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
+            X1I1I1I1R0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1R1I1I1I1I1I1L2F1
             F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
             F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1"
-    width=16
+            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1"
+    width=18
     height=16
     tileScale=100
     position="0,0,0"

Modified: code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefenseEnemy.cc	2018-03-22 15:12:23 UTC (rev 11829)
+++ code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefenseEnemy.cc	2018-03-22 15:14:34 UTC (rev 11830)
@@ -47,6 +47,7 @@
         
         if (getGame() && once_ == false && getHealth() <= 0)
         {
+            
             getGame()->addCredit(1);
             once_ = true;
         }