Changeset 5216 in orxonox.OLD for trunk/src/lib/graphics
- Timestamp:
- Sep 22, 2005, 4:44:56 PM (19 years ago)
- Location:
- trunk/src/lib/graphics
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/graphics_engine.cc
r5124 r5216 168 168 void GraphicsEngine::setWindowName(const char* windowName, const char* icon) 169 169 { 170 SDL_WM_SetIcon(SDL_LoadBMP(icon), NULL); 171 170 SDL_Surface* iconSurf = SDL_LoadBMP(icon); 171 172 SDL_WM_SetIcon(iconSurf, NULL); 172 173 SDL_WM_SetCaption (windowName, icon); 174 175 delete iconSurf; 173 176 } 174 177 … … 211 214 { 212 215 PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError()); 213 SDL_Quit();216 // SDL_Quit(); 214 217 // return -1; 215 218 } -
trunk/src/lib/graphics/graphics_engine.h
r5084 r5216 28 28 virtual ~GraphicsEngine(); 29 29 /** @returns a Pointer to the only object of this Class */ 30 inline static GraphicsEngine* getInstance() { if (! singletonRef) singletonRef = new GraphicsEngine(); returnsingletonRef; };30 inline static GraphicsEngine* getInstance() { if (!GraphicsEngine::singletonRef) GraphicsEngine::singletonRef = new GraphicsEngine(); return GraphicsEngine::singletonRef; }; 31 31 32 32 int init(); -
trunk/src/lib/graphics/importer/model.cc
r5211 r5216 92 92 this->faceCount = 0; 93 93 this->next = NULL; 94 this->listNumber = 0; 94 95 95 96 this->firstFace = new ModelFace; … … 108 109 if (this->next !=NULL) 109 110 delete this->next; 111 112 // if (this->listNumber != 0) 113 // glDeleteLists(this->listNumber, 1); 110 114 } 111 115
Note: See TracChangeset
for help on using the changeset viewer.