[Orxonox-commit 4451] r9122 - in code/branches/newlevel2012: data/levels src/modules/towerdefense

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-04-27 14:49:43 +0200 (Fri, 27 Apr 2012)
New Revision: 9122

Modified:
   code/branches/newlevel2012/data/levels/towerDefense.oxw
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
Log:
Updated oxw and added method call to spawnEnemy

Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-27 12:41:35 UTC (rev 9121)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-27 12:49:43 UTC (rev 9122)
@@ -29,7 +29,7 @@
 <Template name=playfieldcameras defaults=0>
   <Pawn>
     <camerapositions>
-      <CameraPosition position="-200,0,250" absolute=true />
+      <CameraPosition position="-100,0,250" absolute=true />
     </camerapositions>
   </Pawn>
 </Template>
@@ -63,7 +63,7 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <!--SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=Pawn pawndesign=playfield />
+    <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=Pawn pawndesign=playfield />
  
 
     <!--StaticEntity position="0,0,0" direction="0,0,0" collistionType=static mass=100000>

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-27 12:41:35 UTC (rev 9121)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-27 12:49:43 UTC (rev 9122)
@@ -55,6 +55,8 @@
  */
 
 #include "TowerDefense.h"
+#include "worldentities/SpawnPoint.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
 {
@@ -92,6 +94,7 @@
             if (!test)
             {
             	orxout()<< "First tick." <<endl;
+            	spawnEnemy();
             }
             test = true;
         }

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-27 12:41:35 UTC (rev 9121)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-27 12:49:43 UTC (rev 9122)
@@ -43,13 +43,13 @@
             virtual void start(); //<! The function is called when the gametype starts
             //virtual void end();
             virtual void tick(float dt);
-         //   virtual void playerEntered(PlayerInfo* player);
+            //virtual void playerEntered(PlayerInfo* player);
             //virtual bool playerLeft(PlayerInfo* player);
 
             //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
             //virtual void playerScored(PlayerInfo* player);
 		private:
-				void TowerDefense::spawnEnemy();
+				void spawnEnemy();
     };
 }