Changeset 10317 in orxonox.OLD for trunk/src/world_entities/projectiles

Timestamp:

Jan 24, 2007, 1:30:29 AM (17 years ago)

Author:

patrick

Message:

merged branche data-fix back to trunk. this breaks compatibility with the old data/trunk data repository! be sure to update your data trunk

Location:

trunk/src/world_entities/projectiles

Files:

• boomerang_projectile.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)
• rocket.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/boomerang_projectile.cc

@@ -87 +87 @@
     BoomerangProjectile::trailParticles = new SpriteParticles(2000);
     BoomerangProjectile::trailParticles->setName("BoomerangProjectileTrailParticles");
-    BoomerangProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     BoomerangProjectile::trailParticles->setLifeSpan(1.0, .3);
     BoomerangProjectile::trailParticles->setRadius(0.0, .5);
@@ -102 +102 @@
     BoomerangProjectile::explosionParticles = new SpriteParticles(200);
     BoomerangProjectile::explosionParticles->setName("BoomerangProjectileExplosionParticles");
-    BoomerangProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     BoomerangProjectile::explosionParticles->setLifeSpan(.5, .3);
     BoomerangProjectile::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -86 +86 @@
     GuidedMissile::trailParticles = new SpriteParticles(2000);
     GuidedMissile::trailParticles->setName("GuidedMissileTrailParticles");
-    GuidedMissile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    GuidedMissile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
     GuidedMissile::trailParticles->setRadius(0.0, .5);
@@ -101 +101 @@
     GuidedMissile::explosionParticles = new SpriteParticles(200);
     GuidedMissile::explosionParticles->setName("GuidedMissileExplosionParticles");
-    GuidedMissile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    GuidedMissile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     GuidedMissile::explosionParticles->setLifeSpan(.5, .3);
     GuidedMissile::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/projectiles/rocket.cc

@@ -80 +80 @@
     Rocket::trailParticles = new SpriteParticles(2000);
     Rocket::trailParticles->setName("RocketTrailParticles");
-    Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Rocket::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     Rocket::trailParticles->setLifeSpan(1.0, .3);
     Rocket::trailParticles->setRadius(0.0, .5);
@@ -95 +95 @@
     Rocket::explosionParticles = new SpriteParticles(200);
     Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Rocket::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     Rocket::explosionParticles->setLifeSpan(.5, .3);
     Rocket::explosionParticles->setRadius(0.0, 10);