Changeset 9858

Timestamp:

Dec 2, 2013, 4:08:30 PM (12 years ago)

Author:

zifloria

Message:

hbskdjbs

Location:

code/branches/invaders

Files:

• data/levels/includes/invaderWeapon.oxi (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (1 diff)
• src/modules/invader/Invader.h (modified) (1 diff)
• src/modules/invader/InvaderEnemy.cc (modified) (1 diff)

code/branches/invaders/data/levels/includes/invaderWeapon.oxi

@@ -14 +14 @@
         </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>

code/branches/invaders/src/modules/invader/Invader.cc

@@ -98 +98 @@
     }
 
+    void Invader::costLife()
+    {
+        lives--;
+        multiplier = 0;
+        if (lives <= 0) end();
+    };
+
     void Invader::comboControll()
     {

code/branches/invaders/src/modules/invader/Invader.h

@@ -68 +68 @@
             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;}

code/branches/invaders/src/modules/invader/InvaderEnemy.cc

@@ -68 +68 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        setVelocity(Vector3(1000,0,0));
+        // setVelocity(Vector3(1000,0,0));
         removeHealth(2000);
         return false;