Changeset 10495 for code/branches/clangenb

Timestamp:

May 27, 2015, 10:07:27 AM (9 years ago)

Author:

maxima

Message:

small changes

Location:

code/branches/clangenb

Files:

• data/levels/clangenb.oxw (added)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)

code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi

@@ -40 +40 @@
         </Weapon>
         <Weapon>
-          <!--SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 /-->
-          <LaserFire mode=2 muzzleoffset="5,5,0" damage=30 shielddamage=20 />
-          <FusionFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
         </Weapon>

code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc

@@ -74 +74 @@
             // Create rocket model
             Model* model = new Model(this->getContext());
-            model->setMeshSource("can.mesh");
+            model->setMeshSource("rocket.mesh");
             model->scale(0.7f);
             this->attach(model);