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

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/weapons

Files:

• aim.cc (modified) (1 diff)
• crosshair.cc (modified) (1 diff)
• fps_sniper_rifle.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/aim.cc

@@ -43 +43 @@
     this->loadParams(root);
   else
-    this->setTexture("maps/aim.png");
+    this->setTexture("textures/aim.png");
 }
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -37 +37 @@
     this->loadParams(root);
   else
-    this->setTexture("maps/aim.png");
+    this->setTexture("textures/aim.png");
 }
 

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -84 +84 @@
   this->material->setIllum(3);
   this->material->setAmbient(1.0, 1.0, 1.0);
-  this->material->setDiffuseMap("maps/rifle01tex.jpg");
+  this->material->setDiffuseMap("textures/rifle01tex.jpg");
 
   this->setStateDuration(WS_SHOOTING, .1);
@@ -95 +95 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_SHOOT, "sounds/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");