[paragui-cvs] CVS: paragui/src/core pgfilearchive.cpp,1.2.4.13,1.2.4.14

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv16859/src/core

Modified Files:
      Tag: devel-1-0
        pgfilearchive.cpp 
Log Message:
- added new PG_FileArchive::LoadSurface method
  (Thanks Keith)



Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.2.4.13
retrieving revision 1.2.4.14
diff -C2 -r1.2.4.13 -r1.2.4.14
*** pgfilearchive.cpp   5 Apr 2003 14:48:33 -0000       1.2.4.13
--- pgfilearchive.cpp   18 Apr 2003 11:15:28 -0000      1.2.4.14
***************
*** 257,260 ****
--- 257,264 ----
  
  SDL_Surface* PG_FileArchive::LoadSurface(const char* filename, bool convert) {
+       return LoadSurface(filename, false, 0, convert);
+ }
+ 
+ SDL_Surface* PG_FileArchive::LoadSurface(const char* filename, bool usekey, 
Uint32 colorkey, bool convert) {
        if(filename == NULL) {
                return NULL;
***************
*** 300,304 ****
                PG_LogERR("SDL reported: '%s'", SDL_GetError());
        }
!       
        if(convert && !PG_Application::GetGLMode()) {
                SDL_Surface* tmpsrf = NULL;
--- 304,312 ----
                PG_LogERR("SDL reported: '%s'", SDL_GetError());
        }
! 
!       if(usekey == true) {
!               SDL_SetColorKey(surface, SDL_SRCCOLORKEY, colorkey);
!       }
! 
        if(convert && !PG_Application::GetGLMode()) {
                SDL_Surface* tmpsrf = NULL;