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

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-04-27 14:09:48 +0200 (Fri, 27 Apr 2012)
New Revision: 9116

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:
adjusted position of the plazfield

Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-22 08:41:02 UTC (rev 9115)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-27 12:09:48 UTC (rev 9116)
@@ -29,7 +29,7 @@
 <Template name=playfieldcameras defaults=0>
   <Pawn>
     <camerapositions>
-      <CameraPosition position="-200,0,600" absolute=true />
+      <CameraPosition position="-200,0,250" absolute=true />
     </camerapositions>
   </Pawn>
 </Template>
@@ -40,7 +40,7 @@
 <Template name=playfield>
   <Pawn camerapositiontemplate=playfieldcameras>
     <attached>
-      <Model position="0,0,0" mesh="Playfield_ME.mesh" scale3D="10,10,10" /> <!-- crate.mesh -->
+      <Model position="0,0,0" orientation="1,1,1,1" mesh="Playfield_ME.mesh" scale3D="10,10,10" /> <!-- crate.mesh -->
     </attached>
   </Pawn>
 </Template>

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-22 08:41:02 UTC (rev 9115)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-27 12:09:48 UTC (rev 9116)
@@ -81,7 +81,24 @@
         std::string message("The match has ended.");
         ChatManager::message(message);
     }
+    */
 
+
+    void TowerDefense::tick(float dt)
+        {
+            SUPER(TowerDefense, tick, dt);
+
+            static bool test = false;
+            if (!test)
+            {
+            	orxout()<< "First tick." <<endl;
+            }
+            test = true;
+        }
+
+
+
+/*
     void TowerDefense::playerEntered(PlayerInfo* player)
     {
         Deathmatch::playerEntered(player);

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-22 08:41:02 UTC (rev 9115)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-27 12:09:48 UTC (rev 9116)
@@ -41,12 +41,13 @@
             virtual ~TowerDefense() {}
 
             virtual void start(); //<! The function is called when the gametype starts
-            /*virtual void end();
-            virtual void playerEntered(PlayerInfo* player);
-            virtual bool playerLeft(PlayerInfo* player);
+            //virtual void end();
+            virtual void tick(float dt);
+         //   virtual void playerEntered(PlayerInfo* player);
+            //virtual bool playerLeft(PlayerInfo* player);
 
-            virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
-            virtual void playerScored(PlayerInfo* player);*/
+            //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+            //virtual void playerScored(PlayerInfo* player);
     };
 }