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


version 1.13 version 1.14
Line 19
 
Line 19
  * Game loop for Inferno   * Game loop for Inferno
  *   *
  * $Log$   * $Log$
    * Revision 1.14  1999/10/18 06:36:46  donut
    * fixed menus not working in 320x200
    *
  * Revision 1.13  1999/10/12 06:33:11  donut   * Revision 1.13  1999/10/12 06:33:11  donut
  * new maxfps code, doesn't delay unless you are really faster than allowed   * new maxfps code, doesn't delay unless you are really faster than allowed
  *   *
Line 1165
 
Line 1168
 //mode if cannot init requested mode)  //mode if cannot init requested mode)
 int set_screen_mode(int sm)  int set_screen_mode(int sm)
 {  {
   #ifndef OGL //ogl needs Screen_mode set correctly, or menus do not work.
  if ( (sm==SCREEN_MENU) && (Screen_mode==SCREEN_GAME) && VR_compatible_menus ) {   if ( (sm==SCREEN_MENU) && (Screen_mode==SCREEN_GAME) && VR_compatible_menus ) {
  sm = SCREEN_GAME;   sm = SCREEN_GAME;
  }   }
   #endif
   
 #ifdef EDITOR  #ifdef EDITOR
  if ( (sm==SCREEN_MENU) && (Screen_mode==SCREEN_EDITOR) ) {   if ( (sm==SCREEN_MENU) && (Screen_mode==SCREEN_EDITOR) ) {
Line 1179
 
Line 1184
         if ( (Screen_mode == sm) && !((sm==SCREEN_GAME) && (grd_curscreen->sc_mode != Game_screen_mode) && (Screen_mode == SCREEN_GAME))) {          if ( (Screen_mode == sm) && !((sm==SCREEN_GAME) && (grd_curscreen->sc_mode != Game_screen_mode) && (Screen_mode == SCREEN_GAME))) {
  gr_set_current_canvas( &VR_screen_pages[VR_current_page] );   gr_set_current_canvas( &VR_screen_pages[VR_current_page] );
 // if ( VR_use_paging ) gr_show_canvas( &VR_screen_pages[VR_current_page] );  // if ( VR_use_paging ) gr_show_canvas( &VR_screen_pages[VR_current_page] );
   #ifdef OGL
    ogl_set_screen_mode();
   #endif
  return 1;   return 1;
  }   }
   

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