Changeset 6846 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2006, 2:37:22 AM (19 years ago)

Author:

bensch

Message:

trunk: valgrind

Location:

trunk/src

Files:

• lib/particles/sprite_particles.cc (modified) (2 diffs)
• lib/sound/sound_engine.cc (modified) (8 diffs)
• world_entities/weapons/ammo_container.cc (modified) (1 diff)

trunk/src/lib/particles/sprite_particles.cc

@@ -103 +103 @@
 void SpriteParticles::draw() const
 {
-  glPushAttrib(GL_ENABLE_BIT);
 
   Particle* drawPart = particles;
@@ -110 +109 @@
   GLboolean checkLight = false;
   glGetBooleanv(GL_LIGHTING, &checkLight);
+  glPushAttrib(GL_LIGHTING_BIT);
   if (checkLight == GL_TRUE)
     glDisable(GL_LIGHTING);
 
-  glEnable(GL_ALPHA_TEST);
   glDepthMask(GL_FALSE);
   /*

trunk/src/lib/sound/sound_engine.cc

@@ -162 +162 @@
   // updating the Listeners Position
   if (likely(this->listener != NULL))
-    {
-      alListener3f(AL_POSITION,
-                   this->listener->getAbsCoor().x,
-                   this->listener->getAbsCoor().y,
-                   this->listener->getAbsCoor().z);
-      alListener3f(AL_VELOCITY,
-                   this->listener->getVelocity().x,
-                   this->listener->getVelocity().y,
-                   this->listener->getVelocity().z);
-      Vector absDirV = this->listener->getAbsDirV();
-      ALfloat orientation [6] = {1,0,0, absDirV.x, absDirV.y, absDirV.z};
-      alListenerfv(AL_ORIENTATION, orientation);
-    }
+  {
+    alListener3f(AL_POSITION,
+                 this->listener->getAbsCoor().x,
+                 this->listener->getAbsCoor().y,
+                 this->listener->getAbsCoor().z);
+    alListener3f(AL_VELOCITY,
+                 this->listener->getVelocity().x,
+                 this->listener->getVelocity().y,
+                 this->listener->getVelocity().z);
+    Vector absDirV = this->listener->getAbsDirV();
+    ALfloat orientation [6] = {1,0,0, absDirV.x, absDirV.y, absDirV.z};
+    alListenerfv(AL_ORIENTATION, orientation);
+  }
   else
     PRINTF(2)("no listener defined\n");
@@ -220 +220 @@
 {
   /// FIXME
-/*  if(this->sourceList && this->bufferList)
-  {
-    tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
-    SoundBuffer* enumBuffer = (SoundBuffer*)bufferIterator->firstElement();
-    while (enumBuffer)
-    {
-      tIterator<BaseObject>* sourceIterator = this->sourceList->getIterator();
-      SoundSource* enumSource = (SoundSource*)sourceIterator->firstElement();
-      while (enumSource)
+  /*  if(this->sourceList && this->bufferList)
+    {
+      tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
+      SoundBuffer* enumBuffer = (SoundBuffer*)bufferIterator->firstElement();
+      while (enumBuffer)
       {
-        if (enumBuffer == enumSource->getBuffer())
-          break;
-        enumSource = (SoundSource*)sourceIterator->nextElement();
+        tIterator<BaseObject>* sourceIterator = this->sourceList->getIterator();
+        SoundSource* enumSource = (SoundSource*)sourceIterator->firstElement();
+        while (enumSource)
+        {
+          if (enumBuffer == enumSource->getBuffer())
+            break;
+          enumSource = (SoundSource*)sourceIterator->nextElement();
+        }
+        delete sourceIterator;
+        if (enumSource == NULL)
+          ResourceManager::getInstance()->unload(enumBuffer);
+        enumBuffer = (SoundBuffer*)bufferIterator->nextElement();
       }
-      delete sourceIterator;
-      if (enumSource == NULL)
-        ResourceManager::getInstance()->unload(enumBuffer);
-      enumBuffer = (SoundBuffer*)bufferIterator->nextElement();
-    }
-    delete bufferIterator;
-}*/ /// FIXME
+      delete bufferIterator;
+  }*/ /// FIXME
 }
 
@@ -278 +278 @@
   const char* deviceList = (const char*)alcGetString(NULL,ALC_DEVICE_SPECIFIER);
   const char* devWalk = deviceList;
-//  if (alcIsExtensionPresent(NULL, (const ALCchar*)"ALC_ENUMERATION_EXT") == AL_TRUE)
-{ // try out enumeration extension
+  //  if (alcIsExtensionPresent(NULL, (const ALCchar*)"ALC_ENUMERATION_EXT") == AL_TRUE)
+  { // try out enumeration extension
     PRINTF(3)("Enumeration-extension found\n");
 
@@ -287 +287 @@
       PRINTF(3)("%s\n", devWalk);
       devWalk += strlen(devWalk)+1;
-    } while (devWalk[0] != '\0');
+    }
+    while (devWalk[0] != '\0');
 
 
@@ -293 +294 @@
   }
   // INITIALIZING THE DEVICE:
-/*
-#ifdef AL_VERSION_1_1
-  ALCchar deviceName[] =
-
-#ifdef __WIN32__
-      "Direct3D";
-#else
-      "'( ( devices '( native null ) ) )";
-#endif
-  //
-  this->device = alcOpenDevice(deviceName);
-
-  this->context = alcCreateContext(this->device, NULL);
-
-  alcMakeContextCurrent(this->context);
-#else*/
+  /*
+  #ifdef AL_VERSION_1_1
+    ALCchar deviceName[] =
+
+  #ifdef __WIN32__
+        "Direct3D";
+  #else
+        "'( ( devices '( native null ) ) )";
+  #endif
+    //
+    this->device = alcOpenDevice(deviceName);
+
+    this->context = alcCreateContext(this->device, NULL);
+
+    alcMakeContextCurrent(this->context);
+  #else*/
   this->device = alcOpenDevice(NULL);
   SoundEngine::checkError("Error opening Device", __LINE__);
@@ -315 +316 @@
   alcMakeContextCurrent(this->context);
   this->checkError("Making Context Current", __LINE__);
-// #endif
+  // #endif
 
   if ((result = alGetError()) != AL_NO_ERROR)
@@ -378 +379 @@
 {
   switch(err)
-    {
+  {
     case AL_NO_ERROR:
       return ("AL_NO_ERROR");
@@ -391 +392 @@
     case AL_OUT_OF_MEMORY:
       return ("AL_OUT_OF_MEMORY");
-    };
+  };
 }
 

trunk/src/world_entities/weapons/ammo_container.cc

@@ -32 +32 @@
    this->setClassID(CL_AMMO_CONTAINER, "AmmoContainer");
 
+   this->projectileType = projectileType;
+   this->maxEnergy = maxEnergy;
+
    this->energy = 0.0;
-   this->maxEnergy = maxEnergy;
 }