[vba-commit] VisualBoyAdvance/src/win32 Direct3D.cpp,1.6,1.7 GDIDisplay.cpp,1.7,1.8 MainWndFile.cpp,1.7,1.8 OpenGL.cpp,1.7,1.8

[Sébastien G. <kx...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27930/win32

Modified Files:
	Direct3D.cpp GDIDisplay.cpp MainWndFile.cpp OpenGL.cpp 
Log Message:
moved common system palette initialization to Util.cpp and cleaned up DirectDrawDisplay, GDIDisplay, Direct3D and OpenGLDisplay (+plus the SDL version)

Index: MainWndFile.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MainWndFile.cpp	13 May 2004 15:06:50 -0000	1.7
--- MainWndFile.cpp	15 Sep 2004 22:11:20 -0000	1.8
***************
*** 729,733 ****
    CFileStatus status;
    CString str;
!   time_t time = -1;
    int found = 0;
      
--- 729,733 ----
    CFileStatus status;
    CString str;
!   unsigned long time = -1;
    int found = 0;
      
***************
*** 736,740 ****
  
      if(emulating && CFile::GetStatus(name, status)) {
!       if(status.m_mtime.GetTime() < time) {
          time = status.m_mtime.GetTime();
          found = i;
--- 736,740 ----
  
      if(emulating && CFile::GetStatus(name, status)) {
!       if((unsigned long)status.m_mtime.GetTime() < time) {
          time = status.m_mtime.GetTime();
          found = i;
***************
*** 815,819 ****
    CFileStatus status;
    CString str;
!   time_t time = 0;
    int found = -1;
      
--- 815,819 ----
    CFileStatus status;
    CString str;
!   unsigned long time = 0;
    int found = -1;
      
***************
*** 822,826 ****
  
      if(emulating && CFile::GetStatus(name, status)) {
!       if(status.m_mtime.GetTime() > time) {
          time = status.m_mtime.GetTime();
          found = i;
--- 822,826 ----
  
      if(emulating && CFile::GetStatus(name, status)) {
!       if((unsigned long)status.m_mtime.GetTime() > time) {
          time = status.m_mtime.GetTime();
          found = i;

Index: GDIDisplay.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GDIDisplay.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GDIDisplay.cpp	13 May 2004 15:06:50 -0000	1.7
--- GDIDisplay.cpp	15 Sep 2004 22:11:20 -0000	1.8
***************
*** 24,27 ****
--- 24,28 ----
  #include "../Globals.h"
  #include "../Text.h"
+ #include "../Util.h"
  
  #include "VBA.h"
***************
*** 37,41 ****
  
  extern void winlog(const char *,...);
- extern int RGB_LOW_BITS_MASK;
  extern int Init_2xSaI(u32);
  extern int systemSpeed;
--- 38,41 ----
***************
*** 217,224 ****
        if(systemGreenShift == 6) {
          Init_2xSaI(565);
-         RGB_LOW_BITS_MASK=0x821;
        } else {
          Init_2xSaI(555);
-         RGB_LOW_BITS_MASK=0x421;        
        }
      } else if(systemColorDepth == 32)
--- 217,222 ----
***************
*** 242,266 ****
  #endif
    
!   switch(systemColorDepth) {
!   case 16:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }
!     }
!     break;
!   case 24:
!   case 32:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }      
!     }
!     break;
!   }
    theApp.updateFilter();
    theApp.updateIFB();
--- 240,244 ----
  #endif
    
!   utilUpdateSystemColorMaps();
    theApp.updateFilter();
    theApp.updateIFB();

Index: OpenGL.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/OpenGL.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OpenGL.cpp	13 May 2004 15:06:55 -0000	1.7
--- OpenGL.cpp	15 Sep 2004 22:11:20 -0000	1.8
***************
*** 25,28 ****
--- 25,29 ----
  #include "../Globals.h"
  #include "../Text.h"
+ #include "../Util.h"
  
  #include "Reg.h"
***************
*** 318,342 ****
    }
           
!   switch(systemColorDepth) {
!   case 16:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }
!     }
!     break;
!   case 24:
!   case 32:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }      
!     }
!     break;
!   }
    theApp.updateFilter();
    theApp.updateIFB();
--- 319,323 ----
    }
           
!   utilUpdateSystemColorMaps();
    theApp.updateFilter();
    theApp.updateIFB();

Index: Direct3D.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Direct3D.cpp	13 May 2004 15:06:49 -0000	1.6
--- Direct3D.cpp	15 Sep 2004 22:11:19 -0000	1.7
***************
*** 30,33 ****
--- 30,34 ----
  #include "../Globals.h"
  #include "../Text.h"
+ #include "../Util.h"
  #include "../gb/gbGlobals.h"
  
***************
*** 356,380 ****
    restoreDeviceObjects();
  
!   switch(systemColorDepth) {
!   case 16:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }
!     }
!     break;
!   case 24:
!   case 32:
!     {
!       for(int i = 0; i < 0x10000; i++) {
!         systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
!           (((i & 0x3e0) >> 5) << systemGreenShift) |
!           (((i & 0x7c00) >> 10) << systemBlueShift);
!       }      
!     }
!     break;
!   }
    
    theApp.updateFilter();
--- 357,361 ----
    restoreDeviceObjects();
  
!   utilUpdateSystemColorMaps();
    
    theApp.updateFilter();