Changeset 5024 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Aug 15, 2005, 1:00:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: icon and name get displayed correctly again

File:

• orxonox/trunk/src/lib/graphics/graphics_engine.cc (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -115 +115 @@
   if (this->isInit)
     return -1;
-  // initialize SDL_VIDEO
+  //   initialize SDL_VIDEO
   if (SDL_Init(SDL_INIT_VIDEO) == -1)
-    {
-      PRINTF(1)("could not initialize SDL Video\n");
+  {
+    PRINTF(1)("could not initialize SDL Video\n");
       //      return -1;
-    }
+  }
   // initialize SDL_GL-settings
   this->setGLattribs();
@@ -145 +145 @@
   this->setResolution(resX, resY, bbp);
 
-  // TO DO: Create a cool icon and use it here
-  char* loadPic = new char[strlen(ResourceManager::getInstance()->getDataDir())+ 100];
-  sprintf(loadPic, "%s%s", ResourceManager::getInstance()->getDataDir(),  "pictures/orxonox-icon32x32.bmp");
-  SDL_WM_SetIcon(SDL_LoadBMP(loadPic), NULL);
-  delete loadPic;
   // Enable default GL stuff
   glEnable(GL_DEPTH_TEST);
@@ -165 +160 @@
 void GraphicsEngine::setWindowName(const char* windowName, const char* icon)
 {
-  // Set window labeling
+  SDL_WM_SetIcon(SDL_LoadBMP(icon), NULL);
+
   SDL_WM_SetCaption (windowName, icon);
 }