Difference for main/game.c from version 1.14 to 1.15


version 1.14 version 1.15
Line 19
 
Line 19
  * Game loop for Inferno   * Game loop for Inferno
  *   *
  * $Log$   * $Log$
    * Revision 1.15  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.14  1999/10/18 06:36:46  donut   * Revision 1.14  1999/10/18 06:36:46  donut
  * fixed menus not working in 320x200   * fixed menus not working in 320x200
  *   *
Line 1198
 
Line 1201
   
  switch( Screen_mode ) {   switch( Screen_mode ) {
  case SCREEN_MENU:   case SCREEN_MENU:
  if (grd_curscreen->sc_mode != MENU_SCREEN_MODE) {   if (grd_curscreen->sc_mode != menu_screen_mode) {
  if (gr_set_mode(MENU_SCREEN_MODE)) Error("Cannot set screen mode for game!");   if (gr_set_mode(menu_screen_mode)) Error("Cannot set screen mode for game!");
  gr_palette_load( gr_palette );   gr_palette_load( gr_palette );
  }   }
                 gr_init_sub_canvas( &VR_screen_pages[0], &grd_curscreen->sc_canvas, 0, 0, grd_curscreen->sc_w, grd_curscreen->sc_h );                  gr_init_sub_canvas( &VR_screen_pages[0], &grd_curscreen->sc_canvas, 0, 0, grd_curscreen->sc_w, grd_curscreen->sc_h );
Line 1614
 
Line 1617
 {  {
  if (!Endlevel_sequence && Fuelcen_control_center_destroyed  && (Fuelcen_seconds_left>-1) && (Fuelcen_seconds_left<127)) {   if (!Endlevel_sequence && Fuelcen_control_center_destroyed  && (Fuelcen_seconds_left>-1) && (Fuelcen_seconds_left<127)) {
  int y;   int y;
  gr_set_curfont( Gamefonts[4] );    //GAME_FONT );  // gr_set_curfont( Gamefonts[4] );    //GAME_FONT );
    gr_set_curfont( GAME_FONT );
  gr_set_fontcolor(gr_getcolor(0,63,0), -1 );   gr_set_fontcolor(gr_getcolor(0,63,0), -1 );
  y = 20;   y = 15 + GAME_FONT->ft_h;//was 20
  if (!((Cockpit_mode == CM_STATUS_BAR) && (Game_window_w >= 19)))   if (!((Cockpit_mode == CM_STATUS_BAR) && (Game_window_w >= 19)))
  y += 5;   y += 5;
   
Line 1901
 
Line 1905
  Game_mode = GM_NORMAL;   Game_mode = GM_NORMAL;
 #endif  #endif
  }   }
   
   //added/moved on 9/29/98 by Victor Rachels - moved again on 10/19/99 by Matt Mueller so that it'll work in ogl too
    if(show_radar && !Endlevel_sequence)
    radar_render_frame();
   //end this section - Victor Rachels
   
 #ifdef OGL  #ifdef OGL
  ogl_swap_buffers();   ogl_swap_buffers();
 #endif  #endif
Line 3787
 
Line 3797
  break; // redefine taunt macros   break; // redefine taunt macros
   
  case KEY_PAUSE: do_game_pause(1); break;   case KEY_PAUSE: do_game_pause(1); break;
    case KEY_CTRLED + KEY_F12:
    case KEY_PRINT_SCREEN: save_screen_shot(0); break;     case KEY_PRINT_SCREEN: save_screen_shot(0); break;
   
                                 case KEY_SHIFTED+KEY_MINUS:                                  case KEY_SHIFTED+KEY_MINUS:
Line 4193
 
Line 4204
  }   }
  game_render_frame();   game_render_frame();
   
 //added/moved on 9/29/98 by Victor Rachels  
         if(show_radar && !Endlevel_sequence)  
                 radar_render_frame();  
 //end this section - Victor Rachels  
   
  #ifndef D1XD3D   #ifndef D1XD3D
                         gr_update();                          gr_update();
Line 4632
 
Line 4639
 }  }
 #endif  #endif
 #endif  #endif
   

Legend:
line(s) removed in v.1.14 
line(s) changed
 line(s) added in v.1.15