Changeset 5216 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: more fixes due to valgrind

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (2 diffs)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/sound/sound_engine.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/campaign.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (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);

trunk/src/orxonox.cc

@@ -271 +271 @@
   }
    //! @todo this is a hack and should be loadable
-  ResourceManager::getInstance()->addImageDir(ResourceManager::getInstance()->getFullName("maps/"));
-  ResourceManager::getInstance()->debug();
+  char* imageDir = ResourceManager::getInstance()->getFullName("maps/");
+  ResourceManager::getInstance()->addImageDir(imageDir);
+  delete[] imageDir;
 
   PRINT(3)("initializing TextEngine\n");

trunk/src/story_entities/campaign.cc

@@ -294 +294 @@
         {
           //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          delete iterator;
           return entity;
         }

trunk/src/story_entities/world.cc

@@ -381 +381 @@
   localCamera->setClipRegion(1, 10000.0);
   this->localPlayer->setParentMode(PNODE_ALL);
-  Vector* cameraOffset = new Vector (0, 5, -10);
   TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);
 

trunk/src/util/resource_manager.cc

@@ -374 +374 @@
           break;
         }
-      if (tmpResource->pointer)
+      if (tmpResource->pointer != NULL)
         this->resourceList->add(tmpResource);
       delete[] fullName;
     }
-  if (tmpResource->pointer)
+  if (tmpResource->pointer != NULL)
     return tmpResource->pointer;
   else

trunk/src/world_entities/weapons/crosshair.cc

@@ -190 +190 @@
 //   glEnd();
   glPushMatrix();
-  GLdouble pos[3];
+  GLdouble pos[3] = { 0.0, 0.0, 0.0};
   gluProject(this->getAbsCoor().x,
              this->getAbsCoor().y,