1.1 --- a/src/ibm.h	Tue Jul 08 22:06:48 2014 +0100
     1.2 +++ b/src/ibm.h	Wed Jul 09 19:21:16 2014 +0100
     1.3 @@ -318,7 +318,6 @@
     1.4  };
     1.5  
     1.6  extern int romspresent[ROM_MAX];
     1.7 -extern int gfx_present[19];
     1.8  
     1.9  //#define ROM_IBMPCJR 5 /*Not working! ROMs are corrupt*/
    1.10  #define is386 (romset>=ROM_IBMAT386)
    1.11 @@ -327,26 +326,31 @@
    1.12  int hasfpu;
    1.13  int romset;
    1.14  
    1.15 -#define GFX_CGA 0
    1.16 -#define GFX_MDA 1
    1.17 -#define GFX_HERCULES 2
    1.18 -#define GFX_EGA 3     /*Using IBM EGA BIOS*/
    1.19 -//#define GFX_OTI067 3    /*Using BIOS from Acer 386SX/25N - edit - only works with Acer BIOS! Stupid integrated systems*/
    1.20 -#define GFX_TVGA 4      /*Using Trident 8900D BIOS*/
    1.21 -#define GFX_ET4000 5    /*Tseng ET4000*/
    1.22 -#define GFX_ET4000W32  6 /*Tseng ET4000/W32p (Diamond Stealth 32)*/
    1.23 -#define GFX_BAHAMAS64  7 /*S3 Vision864 (Paradise Bahamas 64)*/
    1.24 -#define GFX_N9_9FX     8 /*S3 764/Trio64 (Number Nine 9FX)*/
    1.25 -#define GFX_STEALTH64  9 /*S3 Vision964 (Diamond Stealth 64 VRAM PCI)*/
    1.26 -#define GFX_VIRGE      10 /*S3 Virge*/
    1.27 -#define GFX_TGUI9440   11 /*Trident TGUI9440*/
    1.28 -#define GFX_VGA        12 /*IBM VGA*/
    1.29 -#define GFX_VGAEDGE16  13 /*ATI VGA Edge-16 (18800-1)*/
    1.30 -#define GFX_VGACHARGER 14 /*ATI VGA Charger (28800-5)*/
    1.31 -#define GFX_OTI067     15 /*Oak OTI-067*/
    1.32 -#define GFX_MACH64GX   16 /*ATI Graphics Pro Turbo (Mach64)*/
    1.33 -#define GFX_CL_GD5429  17 /*Cirrus Logic CL-GD5429*/
    1.34 -#define GFX_VIRGEDX    18 /*S3 Virge/DX*/
    1.35 +enum
    1.36 +{
    1.37 +        GFX_CGA = 0,
    1.38 +        GFX_MDA,
    1.39 +        GFX_HERCULES,
    1.40 +        GFX_EGA,        /*Using IBM EGA BIOS*/
    1.41 +        GFX_TVGA,       /*Using Trident TVGA8900D BIOS*/
    1.42 +        GFX_ET4000,     /*Tseng ET4000*/
    1.43 +        GFX_ET4000W32,  /*Tseng ET4000/W32p (Diamond Stealth 32)*/
    1.44 +        GFX_BAHAMAS64,  /*S3 Vision864 (Paradise Bahamas 64)*/
    1.45 +        GFX_N9_9FX,     /*S3 764/Trio64 (Number Nine 9FX)*/
    1.46 +        GFX_VIRGE,      /*S3 Virge*/
    1.47 +        GFX_TGUI9440,   /*Trident TGUI9440*/
    1.48 +        GFX_VGA,        /*IBM VGA*/        
    1.49 +        GFX_VGAEDGE16,  /*ATI VGA Edge-16 (18800-1)*/
    1.50 +        GFX_VGACHARGER, /*ATI VGA Charger (28800-5)*/
    1.51 +        GFX_OTI067,     /*Oak OTI-067*/
    1.52 +        GFX_MACH64GX,   /*ATI Graphics Pro Turbo (Mach64)*/
    1.53 +        GFX_CL_GD5429,  /*Cirrus Logic CL-GD5429*/
    1.54 +        GFX_VIRGEDX,    /*S3 Virge/DX*/
    1.55 +        
    1.56 +        GFX_MAX
    1.57 +};
    1.58 +
    1.59 +extern int gfx_present[GFX_MAX];
    1.60  
    1.61  int gfxcard;
    1.62  

     2.1 --- a/src/win.c	Tue Jul 08 22:06:48 2014 +0100
     2.2 +++ b/src/win.c	Wed Jul 09 19:21:16 2014 +0100
     2.3 @@ -53,7 +53,7 @@
     2.4  #define TIMER_1SEC 1
     2.5  
     2.6  int winsizex=640,winsizey=480;
     2.7 -int gfx_present[19];
     2.8 +int gfx_present[GFX_MAX];
     2.9  #undef cs
    2.10  CRITICAL_SECTION cs;
    2.11  
    2.12 @@ -339,13 +339,13 @@
    2.13          }
    2.14          
    2.15  
    2.16 -        for (c = 0; c < 19; c++)
    2.17 +        for (c = 0; c < GFX_MAX; c++)
    2.18                  gfx_present[c] = video_card_available(video_old_to_new(c));
    2.19  
    2.20          if (!video_card_available(video_old_to_new(gfxcard)))
    2.21          {
    2.22                  if (romset!=-1) MessageBox(hwnd,"Configured video BIOS not available.\nDefaulting to available romset.","PCem error",MB_OK);
    2.23 -                for (c = 18; c >= 0; c--)
    2.24 +                for (c = GFX_MAX-1; c >= 0; c--)
    2.25                  {
    2.26                          if (gfx_present[c])
    2.27                          {