Difference for main/game.c from version 1.19 to 1.20


version 1.19 version 1.20
Line 19
 
Line 19
  * Game loop for Inferno   * Game loop for Inferno
  *   *
  * $Log$   * $Log$
    * Revision 1.20  2000/01/17 05:43:13  donut
    * fixed nicefps bug and added other modifier combos for hotkey menu/fullscreen keys
    *
  * Revision 1.19  1999/12/15 06:12:58  donut   * Revision 1.19  1999/12/15 06:12:58  donut
  * fix inconsistent placing of fps readout with proportional fonts   * fix inconsistent placing of fps readout with proportional fonts
  *   *
Line 1497
 
Line 1500
  do {   do {
  timer_value = timer_get_fixed_seconds();   timer_value = timer_get_fixed_seconds();
  FrameTime = timer_value - last_timer_value;   FrameTime = timer_value - last_timer_value;
  if (use_nice_fps && FrameTime>=F1_0/maxfps)   if (use_nice_fps && FrameTime<F1_0/maxfps)
  d_delay(1);   d_delay(1);
  }while (FrameTime<F1_0/maxfps);   }while (FrameTime<F1_0/maxfps);
   
Line 3850
 
Line 3853
  case KEY_EQUAL: grow_window(); break;   case KEY_EQUAL: grow_window(); break;
    
  //added 8/23/99 by Matt Mueller for hot key res/fullscreen changing, and menu access   //added 8/23/99 by Matt Mueller for hot key res/fullscreen changing, and menu access
    case KEY_CTRLED+KEY_SHIFTED+KEY_PADDIVIDE:
    case KEY_ALTED+KEY_CTRLED+KEY_PADDIVIDE:
  case KEY_ALTED+KEY_SHIFTED+KEY_PADDIVIDE:   case KEY_ALTED+KEY_SHIFTED+KEY_PADDIVIDE:
  d1x_options_menu();   d1x_options_menu();
  break;   break;
    case KEY_CTRLED+KEY_SHIFTED+KEY_PADMULTIPLY:
    case KEY_ALTED+KEY_CTRLED+KEY_PADMULTIPLY:
  case KEY_ALTED+KEY_SHIFTED+KEY_PADMULTIPLY:   case KEY_ALTED+KEY_SHIFTED+KEY_PADMULTIPLY:
  change_res();   change_res();
  break;   break;
    case KEY_CTRLED+KEY_SHIFTED+KEY_PADMINUS:
    case KEY_ALTED+KEY_CTRLED+KEY_PADMINUS:
  case KEY_ALTED+KEY_SHIFTED+KEY_PADMINUS:   case KEY_ALTED+KEY_SHIFTED+KEY_PADMINUS:
  //lower res    //lower res
  //should we just cycle through the list that is displayed in the res change menu?   //should we just cycle through the list that is displayed in the res change menu?
  // what if their card/X/etc can't handle that mode? hrm.    // what if their card/X/etc can't handle that mode? hrm.
  //well, the quick access to the menu is good enough for now.   //well, the quick access to the menu is good enough for now.
  break;   break;
    case KEY_CTRLED+KEY_SHIFTED+KEY_PADPLUS:
    case KEY_ALTED+KEY_CTRLED+KEY_PADPLUS:
  case KEY_ALTED+KEY_SHIFTED+KEY_PADPLUS:   case KEY_ALTED+KEY_SHIFTED+KEY_PADPLUS:
  //increase res   //increase res
  break;   break;
    case KEY_CTRLED+KEY_SHIFTED+KEY_PADENTER:
    case KEY_ALTED+KEY_CTRLED+KEY_PADENTER:
  case KEY_ALTED+KEY_SHIFTED+KEY_PADENTER:   case KEY_ALTED+KEY_SHIFTED+KEY_PADENTER:
 #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE  #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE
  hud_message(MSGC_GAME_FEEDBACK, "toggling fullscreen mode %s",gr_toggle_fullscreen()?"on":"off" );   hud_message(MSGC_GAME_FEEDBACK, "toggling fullscreen mode %s",gr_toggle_fullscreen()?"on":"off" );

Legend:
line(s) removed in v.1.19 
line(s) changed
 line(s) added in v.1.20