[Orxonox-commit 4477] r9148 - code/branches/newlevel2012/src/modules/towerdefense

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-05-04 13:53:59 +0200 (Fri, 04 May 2012)
New Revision: 9148

Modified:
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
Log:
* Changed addWaypointsAndFirstEnemy

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-05-04 11:38:19 UTC (rev 9147)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-05-04 11:53:59 UTC (rev 9148)
@@ -219,11 +219,12 @@
 		newController->addWaypoint(wayPoint2);
 			
 		// The following line causes the game to crash
+
+		newShip->setController(newController);
 //		newController -> getPlayer() -> startControl(newShip);
-		newShip->setController(newController);
 		newShip->setPosition(-7,-7,5);
 		newShip->setScale(0.1);
-		newShip->addSpeed(1);
+		//newShip->addSpeed(1);