Difference for main/menu.c from version 1.9 to 1.10


version 1.9 version 1.10
Line 862
 
Line 862
 {  {
  //edited 05/27/99 Matt Mueller - ingame fullscreen changing   //edited 05/27/99 Matt Mueller - ingame fullscreen changing
  newmenu_item m[8];   newmenu_item m[8];
  int modes[8];   u_int32_t modes[8];
  int i=0, mc=0;   int i=0, mc=0;
 #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE  #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE
  int fullscreenc;   int fullscreenc;
 #endif  #endif
  //end edit -MM   //end edit -MM
  int screen_mode = 0;   u_int32_t screen_mode = 0;
  int screen_width = 0;   int screen_width = 0;
  int screen_height = 0;   int screen_height = 0;
  int vr_mode = VR_NONE;   int vr_mode = VR_NONE;
Line 877
 
Line 877
    
 //changed 6/15/1999 by Owen Evans to fix some platform-related problems  //changed 6/15/1999 by Owen Evans to fix some platform-related problems
 #ifdef __MSDOS__  #ifdef __MSDOS__
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x100"; m[mc].value=(Game_screen_mode==19); m[mc].group=0; modes[mc] = 19; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x100"; m[mc].value=(Game_screen_mode==SM(320,100)); m[mc].group=0; modes[mc] = SM(320,100); mc++;
 #endif  #endif
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x200"; m[mc].value=(Game_screen_mode==SM_320x200C); m[mc].group=0; modes[mc] = SM_320x200C; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x200"; m[mc].value=(Game_screen_mode==SM(320,200)); m[mc].group=0; modes[mc] = SM(320,200); mc++;
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x240"; m[mc].value=(Game_screen_mode==SM_320x240U); m[mc].group=0; modes[mc] = SM_320x240U; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x240"; m[mc].value=(Game_screen_mode==SM(320,240)); m[mc].group=0; modes[mc] = SM(320,240); mc++;
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x400"; m[mc].value=(Game_screen_mode==SM_320x400U); m[mc].group=0; modes[mc] = SM_320x400U; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "320x400"; m[mc].value=(Game_screen_mode==SM(320,400)); m[mc].group=0; modes[mc] = SM(320,400); mc++;
 #ifndef __LINUX__  //#ifndef __LINUX__ - heh?  640x400 is perfectly fine on linux
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "640x400"; m[mc].value=(Game_screen_mode==SM_640x400V); m[mc].group=0; modes[mc] = SM_640x400V; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "640x400"; m[mc].value=(Game_screen_mode==SM(640,400)); m[mc].group=0; modes[mc] = SM(640,400); mc++;
 #endif  //#endif
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "640x480"; m[mc].value=(Game_screen_mode==SM_640x480V); m[mc].group=0; modes[mc] = SM_640x480V; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "640x480"; m[mc].value=(Game_screen_mode==SM(640,480)); m[mc].group=0; modes[mc] = SM(640,480); mc++;
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "800x600"; m[mc].value=(Game_screen_mode==SM_800x600V); m[mc].group=0; modes[mc] = SM_800x600V; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "800x600"; m[mc].value=(Game_screen_mode==SM(800,600)); m[mc].group=0; modes[mc] = SM(800,600); mc++;
  m[mc].type = NM_TYPE_RADIO; m[mc].text = "1024x768"; m[mc].value=(Game_screen_mode==SM_1024x768V); m[mc].group=0; modes[mc] = SM_1024x768V; mc++;   m[mc].type = NM_TYPE_RADIO; m[mc].text = "1024x768"; m[mc].value=(Game_screen_mode==SM(1024,768)); m[mc].group=0; modes[mc] = SM(1024,768); mc++;
 //end section - OE  //end section - OE
   
 // m[mc].type = NM_TYPE_CHECK; m[mc].text = "No Doublebuffer"; m[mc].value = use_double_buffer;  // m[mc].type = NM_TYPE_CHECK; m[mc].text = "No Doublebuffer"; m[mc].value = use_double_buffer;
Line 914
 
Line 914
   
   switch(screen_mode = modes[i])    switch(screen_mode = modes[i])
    {     {
     case 19:      case SM(320,100)://19:
            screen_width = 320;             screen_width = 320;
            screen_height = 100;             screen_height = 100;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 0;             use_double_buffer = 0;
            break;             break;
     case SM_320x200C:   case SM(320,200)://SM_320x200C:
            screen_width = 320;             screen_width = 320;
            screen_height = 200;             screen_height = 200;
            screen_compatible = 1;             screen_compatible = 1;
            use_double_buffer = 0;             use_double_buffer = 0;
            break;             break;
     case SM_320x240U:   case SM(320,240)://SM_320x240U:
            screen_width = 320;             screen_width = 320;
            screen_height = 240;             screen_height = 240;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 1;             use_double_buffer = 1;
            break;             break;
     case SM_320x400U:   case SM(320,400)://SM_320x400U:
            screen_width = 320;             screen_width = 320;
            screen_height = 400;             screen_height = 400;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 1;             use_double_buffer = 1;
            break;             break;
     case SM_640x400V:   case SM(640,400)://SM_640x400V:
            screen_width = 640;             screen_width = 640;
            screen_height = 400;             screen_height = 400;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 1;             use_double_buffer = 1;
            break;             break;
     case SM_640x480V:   case SM(640,480)://SM_640x480V:
            screen_width = 640;             screen_width = 640;
            screen_height = 480;             screen_height = 480;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 1;             use_double_buffer = 1;
            break;             break;
     case SM_800x600V:   case SM(800,600)://SM_800x600V:
            screen_width = 800;             screen_width = 800;
            screen_height = 600;             screen_height = 600;
            screen_compatible = 0;             screen_compatible = 0;
            use_double_buffer = 1;             use_double_buffer = 1;
            break;             break;
     case SM_1024x768V:   case SM(1024,768)://SM_1024x768V:
            screen_width = 1024;             screen_width = 1024;
            screen_height = 768;             screen_height = 768;
            screen_compatible = 0;             screen_compatible = 0;

Legend:
line(s) removed in v.1.9 
line(s) changed
 line(s) added in v.1.10