[Orxonox-commit 5937] r10596 - in code/branches/clangenb: data/levels src/modules/weapons/weaponmodes

[landauf at orxonox.net]

Author: landauf
Date: 2015-09-27 12:32:52 +0200 (Sun, 27 Sep 2015)
New Revision: 10596

Modified:
   code/branches/clangenb/data/levels/emptyLevel.oxw
   code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc
   code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc
   code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc
Log:
cleanup: empty level is empty again & tabs->spaces.

Modified: code/branches/clangenb/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/clangenb/data/levels/emptyLevel.oxw	2015-09-27 10:11:43 UTC (rev 10595)
+++ code/branches/clangenb/data/levels/emptyLevel.oxw	2015-09-27 10:32:52 UTC (rev 10596)
@@ -14,7 +14,7 @@
 <?lua
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipHeartAttack.oxt")
+  include("templates/spaceshipEscort.oxt")
 ?>
 
 <Level>
@@ -29,27 +29,8 @@
   >
 
     <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=spaceshipHeartAttack />
-    <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate">
-                            <events>
-                                <visibility>
-                                    <EventListener event="boxtrigger4" />
-                                </visibility>
-                            </events>
-                    <templates>
-                      <Template link=spaceshippirate />
-                    </templates>
-                    <controller>
-                      <WaypointController team=1>
-                         <waypoints>
-                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-200" />
-                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-700" />
-                          <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
-                          <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
-                       </waypoints>
-                    </WaypointController>
-                  </controller>
-                </SpaceShip>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    
   </Scene>
 </Level>
 

Modified: code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc	2015-09-27 10:11:43 UTC (rev 10595)
+++ code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc	2015-09-27 10:32:52 UTC (rev 10596)
@@ -107,7 +107,7 @@
         projectile->attach(model);
         model->setScale(5);
 
-	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);

Modified: code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc	2015-09-27 10:11:43 UTC (rev 10595)
+++ code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc	2015-09-27 10:32:52 UTC (rev 10596)
@@ -66,8 +66,8 @@
     void FusionFire::fire()
     {
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
-	
-	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);

Modified: code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc	2015-09-27 10:11:43 UTC (rev 10595)
+++ code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc	2015-09-27 10:32:52 UTC (rev 10596)
@@ -65,7 +65,7 @@
     {
         ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
 
-	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);