Changeset 6588 in orxonox.OLD for branches/powerups/src/world_entities/weapons/turret.cc

Timestamp:

Jan 18, 2006, 4:41:00 PM (18 years ago)

Author:

manuel

Message:

prepare to merge…

File:

• branches/powerups/src/world_entities/weapons/turret.cc (modified) (2 diffs)

branches/powerups/src/world_entities/weapons/turret.cc

@@ -45 +45 @@
   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
-  this->loadModel("models/guns/turret1.obj");
 }
 
@@ -97 +96 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
+  this->loadModel("models/guns/turret1.obj");
+
 }