Changeset 8495 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 15, 2006, 9:50:56 PM (19 years ago)

Author:

bensch

Message:

merged the branche atmos back. no conflicts

Location:

trunk/src/world_entities

Files:

• effects/billboard.cc (modified) (2 diffs)
• space_ships/helicopter.cc (modified) (2 diffs)

trunk/src/world_entities/effects/billboard.cc

@@ -121 +121 @@
     return;
 
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_LIGHTING);
+  glDisable(GL_FOG);
+  
   glPushMatrix();
 
@@ -164 +168 @@
   
   glPopMatrix();
+  
+  glPopAttrib();
 }

trunk/src/world_entities/space_ships/helicopter.cc

@@ -107 +107 @@
   if (this->chopperBuffer != NULL)
     ResourceManager::getInstance()->unload(this->chopperBuffer);
-  this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/chopper.wav", WAV);
+  this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/chopper.wav", WAV);
 
 }
@@ -219 +219 @@
   State::getCameraTargetNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
 
-  this->soundSource.loop(this->chopperBuffer, 0.8f);
-  // PRINTF(0)( "Playing ChopperSound\n" );
+  this->soundSource.play(this->chopperBuffer, 0.7f, true);
 }