[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.2.4.11,1.2.4.12 pgfile.cpp,1.1.6.2,1.1.6.3 pgfilearchive.cpp,1.2.4.7,1.2.4.8 pgmessageobject.cpp,1.1.6.2,1.1.6.3

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-1-0
        pgapplication.cpp pgfile.cpp pgfilearchive.cpp 
        pgmessageobject.cpp 
Log Message:
physfs sync
memleaks fixed
fixed callbacks within modal loops



Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.2.4.11
retrieving revision 1.2.4.12
diff -C2 -r1.2.4.11 -r1.2.4.12
*** pgapplication.cpp   30 Jul 2002 09:21:55 -0000      1.2.4.11
--- pgapplication.cpp   30 Jul 2002 20:50:26 -0000      1.2.4.12
***************
*** 124,130 ****
        // remove all archives from PG_FileArchive
        PG_FileArchive::RemoveAllArchives();
- 
-       // shutdown PhysFS
-       PG_FileArchive::Deinit();
  }
  
--- 124,127 ----
***************
*** 418,427 ****
  
        PG_Rect fillrect = rect;
-       //PG_Application::LockScreen();
  
        if(!my_background) {
                SDL_Color c = my_backcolor;
                SDL_FillRect(screen, (SDL_Rect*)&fillrect, 
SDL_MapRGB(screen->format, c.r, c.g, c.b));
-               PG_Application::UnlockScreen();
                return;
        }
--- 415,422 ----
***************
*** 448,453 ****
                PG_Draw::DrawTile(screen, screenrect, rect, my_background);
        }
-       
-       //PG_Application::UnlockScreen();
  }
  
--- 443,446 ----

Index: pgfile.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfile.cpp,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -C2 -r1.1.6.2 -r1.1.6.3
*** pgfile.cpp  10 Jul 2002 19:12:49 -0000      1.1.6.2
--- pgfile.cpp  30 Jul 2002 20:50:26 -0000      1.1.6.3
***************
*** 91,99 ****
        std::string result;
        char c = 0;
!       
!       while(!eof() && ((c = getc()) != 0x0A)) {
                if(c != 0x0D) {
                        result += c;
                }
        }
        
--- 91,101 ----
        std::string result;
        char c = 0;
! 
!       c = getc();
!       while(!eof() && (c != 0x0A)) {
                if(c != 0x0D) {
                        result += c;
                }
+               c = getc();
        }
        

Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.2.4.7
retrieving revision 1.2.4.8
diff -C2 -r1.2.4.7 -r1.2.4.8
*** pgfilearchive.cpp   30 Jul 2002 09:21:55 -0000      1.2.4.7
--- pgfilearchive.cpp   30 Jul 2002 20:50:26 -0000      1.2.4.8
***************
*** 289,292 ****
--- 289,297 ----
        surface = SDL_LoadBMP_RW(rw, 1);
  #endif
+ 
+       if(surface == NULL) {
+               PG_LogWRN("Failed to load imagedata from '%s' !", filename);
+               return NULL;
+       }
        
        if(surface == NULL) {

Index: pgmessageobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmessageobject.cpp,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -C2 -r1.1.6.2 -r1.1.6.3
*** pgmessageobject.cpp 18 Jun 2002 08:10:23 -0000      1.1.6.2
--- pgmessageobject.cpp 30 Jul 2002 20:50:26 -0000      1.1.6.3
***************
*** 315,319 ****
  
        // do we have a capture hook?
!       if((event->type != SDL_USEREVENT) && (event->type != SDL_VIDEORESIZE) 
/*&& (event->type != SDL_VIDEOEXPOSE)*/) {
                if(captureObject) {
                        return captureObject->ProcessEvent(event);
--- 315,319 ----
  
        // do we have a capture hook?
!       if((event->type != SDL_USEREVENT) && (event->type != SDL_VIDEORESIZE)) {
                if(captureObject) {
                        return captureObject->ProcessEvent(event);
***************
*** 357,365 ****
                        }
                        break;
-                       /*
-                                       case SDL_VIDEOEXPOSE:
-                                               PG_Widget::UpdateScreen();
-                                               return 0;
-                       */
        }
  
--- 357,360 ----