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

Timestamp:

Jan 24, 2007, 1:30:29 AM (18 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/weather_effects

Files:

• lightning_effect.cc (modified) (1 diff)
• snow_effect.cc (modified) (1 diff)

trunk/src/world_entities/weather_effects/lightning_effect.cc

@@ -263 +263 @@
 
   if (this->thunderTextureA) {
-    this->thunderBolt[0]->setTexture("maps/thunderbA1.png");
-    this->thunderBolt[1]->setTexture("maps/thunderbA2.png");
-    this->thunderBolt[2]->setTexture("maps/thunderbA3.png");
-    this->thunderBolt[3]->setTexture("maps/thunderbA4.png");
+    this->thunderBolt[0]->setTexture("textures/thunderbA1.png");
+    this->thunderBolt[1]->setTexture("textures/thunderbA2.png");
+    this->thunderBolt[2]->setTexture("textures/thunderbA3.png");
+    this->thunderBolt[3]->setTexture("textures/thunderbA4.png");
   }
   else {
-    this->thunderBolt[0]->setTexture("maps/thunderbB1.png");
-    this->thunderBolt[1]->setTexture("maps/thunderbB2.png");
-    this->thunderBolt[2]->setTexture("maps/thunderbB3.png");
-    this->thunderBolt[3]->setTexture("maps/thunderbB4.png");
+    this->thunderBolt[0]->setTexture("textures/thunderbB1.png");
+    this->thunderBolt[1]->setTexture("textures/thunderbB2.png");
+    this->thunderBolt[2]->setTexture("textures/thunderbB3.png");
+    this->thunderBolt[3]->setTexture("textures/thunderbB4.png");
   }
 

trunk/src/world_entities/weather_effects/snow_effect.cc

@@ -107 +107 @@
   this->snowMove = false;
   this->particles = 12000;
-  this->texture = "maps/snow_flake_01_32x32.png";
+  this->texture = "textures/snow_flake_01_32x32.png";
   this->snowLife = 8;
   this->randomLife = 2;