Changeset 10702 in orxonox.OLD for branches/presentation/src/world_entities/weapons/rf_cannon.cc

Timestamp:

Jun 14, 2007, 11:23:51 PM (17 years ago)

Author:

nicolasc

Message:

minor improvements, some cleanup

File:

• branches/presentation/src/world_entities/weapons/rf_cannon.cc (modified) (2 diffs)

branches/presentation/src/world_entities/weapons/rf_cannon.cc

@@ -126 +126 @@
 void RFCannon::fire()
 {
-//   for (int i = 0; i < this->getBarrels(); i++){
-    Projectile* pj =  this->getProjectile();
-    if (pj == NULL)
-      return;
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
 
-    // set the owner
-    pj->setOwner(this->getOwner());
+  // set the owner
+  pj->setOwner(this->getOwner());
 
-    pj->setParent(PNode::getNullParent());
+  pj->setParent(PNode::getNullParent());
 
-    pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190);
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190);
 
-    pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-    pj->setAbsDir(this->getAbsDir());
-    pj->activate();
+  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
+  pj->setAbsDir(this->getAbsDir());
+  pj->activate();
 
-    this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
-//   }
+  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
 }
 
@@ -162 +160 @@
 void RFCannon::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
     Vector tmpRot = this->getAbsDir().getSpacialAxis();