Difference for main/inferno.c from version 1.16 to 1.17


version 1.16 version 1.17
Line 18
 
Line 18
  * main() for Inferno     * main() for Inferno 
  *   *
  * $Log$   * $Log$
    * Revision 1.17  1999/11/20 10:05:17  donut
    * variable size menu patch from Jan Bobrowski.  Variable menu font size support and a bunch of fixes for menus that didn't work quite right, by me (MPM).
    *
  * Revision 1.16  1999/11/15 10:43:37  sekmu   * Revision 1.16  1999/11/15 10:43:37  sekmu
  * added -altsounds   * added -altsounds
  *   *
Line 825
 
Line 828
 unsigned int descent_critical_deverror = 0;  unsigned int descent_critical_deverror = 0;
 unsigned int descent_critical_errcode = 0;  unsigned int descent_critical_errcode = 0;
   
   int menu_screen_mode; // mode used for menus -- jb
   
 #ifdef EDITOR  #ifdef EDITOR
 int Inferno_is_800x600_available = 0;  int Inferno_is_800x600_available = 0;
Line 890
 
Line 894
 void show_cmdline_help() {  void show_cmdline_help() {
  printf( "%s\n", TXT_COMMAND_LINE_0 );   printf( "%s\n", TXT_COMMAND_LINE_0 );
         printf( "  -<X>x<Y>       %s\n", "Change screen resolution. Options:");          printf( "  -<X>x<Y>       %s\n", "Change screen resolution. Options:");
         printf( "                 %s\n", "   320x100;320x200;320x400;640x400;640x480");          printf( "                    320x100;320x200;320x240;320x400;640x400;640x480;800x600;1024x768\n");
  printf( "%s\n", TXT_COMMAND_LINE_5 );   printf( "%s\n", TXT_COMMAND_LINE_5 );
  printf( "%s\n", TXT_COMMAND_LINE_6 );   printf( "%s\n", TXT_COMMAND_LINE_6 );
  printf( "%s\n", TXT_COMMAND_LINE_7 );   printf( "%s\n", TXT_COMMAND_LINE_7 );
Line 1036
 
Line 1040
 {  {
  int i,t;   int i,t;
  char start_demo[13];   char start_demo[13];
    int screen_width = 640;
    int screen_height = 480;
    int screen_mode = SM_640x480V;
   
  error_init(NULL);   error_init(NULL);
   
Line 1236
 
Line 1243
  #else   #else
  printf( "\nFailure initializing sound.\n");   printf( "\nFailure initializing sound.\n");
  #endif   #endif
   #ifndef __linux__
                         key_getch();                          key_getch();
   #endif
  }   }
  } else {   } else {
  if (Inferno_verbose) printf( "\n%s",TXT_SOUND_DISABLED );   if (Inferno_verbose) printf( "\n%s",TXT_SOUND_DISABLED );
Line 1296
 
Line 1305
 //added on 12/14/98 by Matt Mueller - override res in d1x.ini with command line args  //added on 12/14/98 by Matt Mueller - override res in d1x.ini with command line args
  int i, argnum=INT_MAX;   int i, argnum=INT_MAX;
 //end addition -MM  //end addition -MM
  int screen_mode = SM_320x200C;  
  int screen_width = 320;  
  int screen_height = 200;  
                 int vr_mode = VR_NONE;                  int vr_mode = VR_NONE;
  int screen_compatible = 1;   int screen_compatible = 1;
  int use_double_buffer = 0;   int use_double_buffer = 0;
Line 1394
 
Line 1400
  Error(TXT_CANT_INIT_GFX,t);   Error(TXT_CANT_INIT_GFX,t);
  // Load the palette stuff. Returns non-zero if error.   // Load the palette stuff. Returns non-zero if error.
  mprintf( (0, "Going into graphics mode..." ));   mprintf( (0, "Going into graphics mode..." ));
  gr_set_mode(MENU_SCREEN_MODE);   menu_screen_mode = SM_320x200C;
    if(screen_width >= 640 && screen_height >= 480)
    menu_screen_mode = SM_640x480V;
    gr_set_mode(menu_screen_mode);
  mprintf( (0, "\nInitializing palette system..." ));   mprintf( (0, "\nInitializing palette system..." ));
  gr_use_palette_table( "PALETTE.256" );   gr_use_palette_table( "PALETTE.256" );
  mprintf( (0, "\nInitializing font system..." ));   mprintf( (0, "\nInitializing font system..." ));
Line 1618
 
Line 1627
   
 void show_order_form()  void show_order_form()
 {  {
  char exit_screen[13];   show_title_screen(
   
 #ifdef SHAREWARE  #ifdef SHAREWARE
  strcpy(exit_screen, "order01.pcx");   "order01.pcx",
 #else  #else
  strcpy(exit_screen, "warning.pcx");   "warning.pcx",
 #endif  #endif
  show_title_screen(exit_screen, 1);   1);
 }  }
   
   void quit_request()
   {
    void network_abort_game();
    if(Network_status)
    network_abort_game();
    exit(0);
   }

Legend:
line(s) removed in v.1.16 
line(s) changed
 line(s) added in v.1.17