Changeset 5216 in orxonox.OLD for trunk/src/lib

Timestamp:

Sep 22, 2005, 4:44:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more fixes due to valgrind

Location:

trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (2 diffs)
• graphics/graphics_engine.h (modified) (1 diff)
• graphics/importer/model.cc (modified) (2 diffs)
• physics/physics_engine.cc (modified) (1 diff)
• sound/sound_engine.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -168 +168 @@
 void GraphicsEngine::setWindowName(const char* windowName, const char* icon)
 {
-  SDL_WM_SetIcon(SDL_LoadBMP(icon), NULL);
-
+  SDL_Surface* iconSurf = SDL_LoadBMP(icon);
+
+  SDL_WM_SetIcon(iconSurf, NULL);
   SDL_WM_SetCaption (windowName, icon);
+
+  delete iconSurf;
 }
 
@@ -211 +214 @@
     {
       PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError());
-      SDL_Quit();
+      //    SDL_Quit();
       //    return -1;
     }

trunk/src/lib/graphics/graphics_engine.h

@@ -28 +28 @@
     virtual ~GraphicsEngine();
     /** @returns a Pointer to the only object of this Class */
-    inline static GraphicsEngine* getInstance() { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
+    inline static GraphicsEngine* getInstance() { if (!GraphicsEngine::singletonRef) GraphicsEngine::singletonRef = new GraphicsEngine();  return GraphicsEngine::singletonRef; };
 
     int init();

trunk/src/lib/graphics/importer/model.cc

@@ -92 +92 @@
   this->faceCount = 0;
   this->next = NULL;
+  this->listNumber = 0;
 
   this->firstFace = new ModelFace;
@@ -108 +109 @@
   if (this->next !=NULL)
     delete this->next;
+
+  //  if (this->listNumber != 0)
+//    glDeleteLists(this->listNumber, 1);
 }
 

trunk/src/lib/physics/physics_engine.cc

@@ -70 +70 @@
 //   }
 //   delete itPI;
-//   delete this->interfaces;
+   delete this->interfaces;
 //
 //   // delete all PhysicsFields, still in existence (this could be dangerous)

trunk/src/lib/sound/sound_engine.h

@@ -74 +74 @@
     virtual ~SoundEngine();
     /** @returns a Pointer to the only object of this Class */
-    inline static SoundEngine* getInstance() { if (!singletonRef) singletonRef = new SoundEngine();  return singletonRef; };
+    inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine();  return SoundEngine::singletonRef; };
 
     void loadSettings(IniParser* iniParser);