[Adonthell-commits] CVS: adonthell/src/gfx/sdl surface_sdl.cc, 1.3, 1.4

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/gfx/sdl
In directory subversions:/tmp/cvs-serv6922/gfx/sdl

Modified Files:
        surface_sdl.cc 
Log Message:
FIXED a bug in draw_line that prevented the correct use of recursive 
drawing_areas


Index: surface_sdl.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/sdl/surface_sdl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** surface_sdl.cc      27 Jul 2003 14:08:20 -0000      1.3
--- surface_sdl.cc      28 Jul 2003 12:55:34 -0000      1.4
***************
*** 114,117 ****
--- 114,123 ----
          int offset;
  
+         std::cout << "ok\n";
+ 
+         drawing_area da;
+ 
+         if (da_opt) da = da_opt->setup_rects();
+ 
          x=x1;
          y=y1;
***************
*** 139,143 ****
          }
     
-         lock ();
          if(Dy<Dx)
          {
--- 145,148 ----
***************
*** 148,153 ****
              for(i=0;i<Dx;i++)
              {
!                 if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                                 y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
                      put_pix (x, y, color);
             
--- 153,158 ----
              for(i=0;i<Dx;i++)
              {
!                 if (!da_opt || (x >= da.x() && x < da.x() + da.length() &&
!                                 y >= da.y() && y < da.y() + da.height()))
                      put_pix (x, y, color);
             
***************
*** 172,177 ****
              for(i=0;i<Dy;i++)
              {
!                 if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                                 y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
                      put_pix(x, y, color);
             
--- 177,182 ----
              for(i=0;i<Dy;i++)
              {
!                 if (!da_opt || (x >= da.x() && x < da.x() + da.length() &&
!                                 y >= da.y() && y < da.y() + da.height()))
                      put_pix(x, y, color);
             
***************
*** 187,191 ****
              }
          }
!         unlock();
      }
  
--- 192,196 ----
              }
          }
!         std::cout << "fini\n";
      }