[Adonthell-commits] CVS: adonthell/src screen.cc,1.18,1.19 surface.cc,1.13,1.14

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv20419

Modified Files:
        screen.cc surface.cc 
Log Message:
FIXED a few flaws that might be related to Windows fullscreen issue - no 
guarantee it will work, though.


Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/screen.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** screen.cc   29 Jul 2002 13:00:49 -0000      1.18
--- screen.cc   13 Sep 2002 21:39:39 -0000      1.19
***************
*** 39,43 ****
  {
      u_int8 bpp;
!     u_int32 SDL_flags = SDL_DOUBLEBUF;
      u_int8 emulated = depth; 
      
--- 39,43 ----
  {
      u_int8 bpp;
!     u_int32 SDL_flags = SDL_SWSURFACE;
      u_int8 emulated = depth; 
      
***************
*** 59,63 ****
      if (!depth) depth = 16; 
      
!     bpp = SDL_VideoModeOK (nl, nh, depth, SDL_flags);
  
      if ((emulated) && (bpp) && (bpp != depth)) bpp = depth; 
--- 59,66 ----
      if (!depth) depth = 16; 
      
!     if (dblmode)
!         bpp = SDL_VideoModeOK (nl << 1, nh << 1, depth, SDL_flags);
!     else
!         bpp = SDL_VideoModeOK (nl, nh, depth, SDL_flags);
  
      if ((emulated) && (bpp) && (bpp != depth)) bpp = depth; 

Index: surface.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/surface.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** surface.cc  29 Jul 2002 13:00:49 -0000      1.13
--- surface.cc  13 Sep 2002 21:39:39 -0000      1.14
***************
*** 53,56 ****
--- 53,59 ----
      u_int32 col;
  
+     lock ();
+     src.lock ();
+     
      resize(src.length(), src.height());
      for (u_int16 j = 0; j < height(); j++)
***************
*** 60,63 ****
--- 63,69 ----
              put_pix(i, j, col);
          }
+     
+     src.unlock ();
+     unlock ();
  }
  
***************
*** 66,69 ****
--- 72,78 ----
      u_int32 col;
  
+     lock ();
+     src.lock ();
+ 
      resize_aux(src.length(), src.height());
      for (u_int16 j = 0; j < src.height() - 1; j++)
***************
*** 73,76 ****
--- 82,88 ----
              put_pix_aux(i, j, col);
          }
+         
+     src.unlock ();
+     unlock ();
  }