[Orxonox-commit 5193] r9858 - in code/branches/invaders: data/levels/includes src/modules/invader

[zifloria at orxonox.net]

Author: zifloria
Date: 2013-12-02 16:08:30 +0100 (Mon, 02 Dec 2013)
New Revision: 9858

Modified:
   code/branches/invaders/data/levels/includes/invaderWeapon.oxi
   code/branches/invaders/src/modules/invader/Invader.cc
   code/branches/invaders/src/modules/invader/Invader.h
   code/branches/invaders/src/modules/invader/InvaderEnemy.cc
Log:
hbskdjbs

Modified: code/branches/invaders/data/levels/includes/invaderWeapon.oxi
===================================================================
--- code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:05:10 UTC (rev 9857)
+++ code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:08:30 UTC (rev 9858)
@@ -13,11 +13,11 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
         </links>
         <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
           <!--InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
         </Weapon>
         <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
           <!--InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" /-->
         </Weapon>
       </WeaponPack>

Modified: code/branches/invaders/src/modules/invader/Invader.cc
===================================================================
--- code/branches/invaders/src/modules/invader/Invader.cc	2013-12-02 15:05:10 UTC (rev 9857)
+++ code/branches/invaders/src/modules/invader/Invader.cc	2013-12-02 15:08:30 UTC (rev 9858)
@@ -97,6 +97,13 @@
         }
     }
 
+    void Invader::costLife()
+    {
+        lives--;
+        multiplier = 0;
+        if (lives <= 0) end();
+    };
+
     void Invader::comboControll()
     {
         if (b_combo)

Modified: code/branches/invaders/src/modules/invader/Invader.h
===================================================================
--- code/branches/invaders/src/modules/invader/Invader.h	2013-12-02 15:05:10 UTC (rev 9857)
+++ code/branches/invaders/src/modules/invader/Invader.h	2013-12-02 15:08:30 UTC (rev 9858)
@@ -67,7 +67,7 @@
             int getPoints(){return this->point;}
             int getMultiplier(){return this->multiplier;}
 
-            void costLife(){lives--; if (lives <= 0) end();};
+            void costLife();
             void levelUp(){level++;}
             void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
             void comboControll();

Modified: code/branches/invaders/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 15:05:10 UTC (rev 9857)
+++ code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 15:08:30 UTC (rev 9858)
@@ -67,7 +67,7 @@
 
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        setVelocity(Vector3(1000,0,0));
+        // setVelocity(Vector3(1000,0,0));
         removeHealth(2000);
         return false;
     }