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

Timestamp:

Jul 3, 2006, 6:39:10 PM (18 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

File:

• trunk/src/world_entities/projectiles/laser.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/laser.cc

@@ -140 +140 @@
 void Laser::draw () const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
+
+  WorldEntity::draw();
+/*  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
 
   float matrix[4][4];
@@ -151 +153 @@
   glScalef(2.0, 2.0, 2.0);
   this->getModel()->draw();
+  glPopMatrix();*/
+
   glPopAttrib();
-  glPopMatrix();
 }