Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 9, 2005, 11:29:19 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:
orxonox/branches/heightMap
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/src/lib/graphics/graphics_engine.cc

    r3844 r4122  
    1717
    1818#include "graphics_engine.h"
     19#include "resource_manager.h"
    1920
    2021#include "debug.h"
    … …  
    101102 
    102103  // TO DO: Create a cool icon and use it here
    103   SDL_WM_SetIcon(SDL_LoadBMP("../data/pictures/orxonox-icon32x32.bmp"), NULL); 
    104 
     104  char* loadPic = new char[strlen(ResourceManager::getInstance()->getDataDir())+ 100];
     105  sprintf(loadPic, "%s%s", ResourceManager::getInstance()->getDataDir(),  "pictures/orxonox-icon32x32.bmp");
     106  SDL_WM_SetIcon(SDL_LoadBMP(loadPic), NULL); 
     107  delete loadPic;
    105108  // Enable default GL stuff
    106109  glEnable(GL_DEPTH_TEST);
Note: See TracChangeset for help on using the changeset viewer.