[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.30,1.31

James Brown ender at users.sourceforge.net
Fri Feb 15 08:04:13 CET 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv14488

Modified Files:
	gfx.cpp 
Log Message:
Fixed some really silly typos in the 9th decoder.



Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** gfx.cpp	14 Feb 2002 20:09:05 -0000	1.30
--- gfx.cpp	15 Feb 2002 16:02:24 -0000	1.31
***************
*** 1277,1281 ****
  }
  
! void Gdi::unkDecode9() { /* FIXME: This one doesn't work.. */
         byte *src = _smap_ptr;
         byte *dst = _bgbak_ptr;
--- 1277,1281 ----
  }
  
! void Gdi::unkDecode9() {
         byte *src = _smap_ptr;
         byte *dst = _bgbak_ptr;
***************
*** 1285,1300 ****
         int h = _numLinesToProcess;
         x = y = i = z = run = 0;
!   
!        while (x < 8) {
              c = 0;
              for (i = 0; i < 4; i++) {READ_256BIT;  c+=(bits<<i);}
!             /* printf("%d,", c>>2); */
              switch ((c>>2)) {
                  case 0:
!                         color= 0;
!                         for (i=0; i<4; i++) {READ_256BIT; color+=bits<<i;}// color+=getbit(-1)<<i;
                          for (i=0; i<((c&3)+2); i++) {
                                  *dst = (run * 16 + color);
!                                 NEXT_ROW
                          }
                 break;
--- 1285,1301 ----
         int h = _numLinesToProcess;
         x = y = i = z = run = 0;
! 	   
! 	   _currentX = 8;       
! 	   for(;;) {
              c = 0;
              for (i = 0; i < 4; i++) {READ_256BIT;  c+=(bits<<i);}
!             
              switch ((c>>2)) {
                  case 0:
!                         color=0;
!                         for (i=0; i<4; i++) {READ_256BIT; color+=bits<<i;}
                          for (i=0; i<((c&3)+2); i++) {
                                  *dst = (run * 16 + color);
!                                 NEXT_ROW								
                          }
                 break;
***************
*** 1303,1309 ****
                          for (i=0; i<((c&3)+1); i++) {
                                 color = 0;
!                                for (z=0; z < 4; z++) {READ_256BIT; color+=bits<<i;}
                                 *dst = (run *16 + color);
!                                NEXT_ROW // y++; if (y>=height) {y=0; x++;}}
                          }
                break;
--- 1304,1310 ----
                          for (i=0; i<((c&3)+1); i++) {
                                 color = 0;
!                                for (z=0; z < 4; z++) {READ_256BIT; color+=bits<<z;}
                                 *dst = (run *16 + color);
!                                NEXT_ROW 							   
                          }
                break;
***************
*** 1311,1319 ****
                case 2:
                        run = 0;
!                       for (i = 0; i < 4; i++) {READ_256BIT; c+=run<<i;}
                        break;
              }
!   }
!   /* printf("\n"); */
  }
  
--- 1312,1319 ----
                case 2:
                        run = 0;
!                       for (i = 0; i < 4; i++) {READ_256BIT; run+=bits<<i;}
                        break;
              }
!   }  
  }
  
***************
*** 1353,1357 ****
         uint buffer, mask = 128;
         unsigned char inc = 1, color = *src++;
!  
         _currentX = 8;
         do {
--- 1353,1357 ----
         uint buffer, mask = 128;
         unsigned char inc = 1, color = *src++;
! 	
         _currentX = 8;
         do {





More information about the Scummvm-git-logs mailing list