Difference for main/automap.c from version 1.5 to 1.6


version 1.5 version 1.6
Line 60
 
Line 60
 //#include "intrface.h"  //#include "intrface.h"
   
 #include "d_delay.h"  #include "d_delay.h"
   #include "automap.h"
   
 #ifdef OGL  #ifdef OGL
 #define AUTOMAP_DIRECT_RENDER  #define AUTOMAP_DIRECT_RENDER
Line 386
 
Line 387
 extern void GameLoop(int, int );  extern void GameLoop(int, int );
 extern int set_segment_depths(int start_seg, ubyte *segbuf);  extern int set_segment_depths(int start_seg, ubyte *segbuf);
   
 int automap_mode = SM_640x480V;  u_int32_t automap_mode = SM(640,480);
 int automap_width = 640;  int automap_width = 640;
 int automap_height = 480;  int automap_height = 480;
 int automap_use_game_res=0;  int automap_use_game_res=0;
Line 439
 
Line 440
  mprintf( (0, "Allocated %d K for automap edge list\n", (sizeof(Edge_info)+sizeof(short))*Max_edges/1024 ));   mprintf( (0, "Allocated %d K for automap edge list\n", (sizeof(Edge_info)+sizeof(short))*Max_edges/1024 ));
    
   
  if(automap_use_game_res){  
  automap_width=grd_curscreen->sc_canvas.cv_bitmap.bm_w;  
  automap_height=grd_curscreen->sc_canvas.cv_bitmap.bm_h;  
  }else{  
         //edit 4/23/99 Matt Mueller - don't switch res unless we need to          //edit 4/23/99 Matt Mueller - don't switch res unless we need to
                if (grd_curscreen->sc_mode != automap_mode)   if (grd_curscreen->sc_mode != AUTOMAP_MODE)
                        gr_set_mode( automap_mode );   gr_set_mode( AUTOMAP_MODE );
                else                 else
                        gr_set_current_canvas(NULL);                         gr_set_current_canvas(NULL);
         //end edit -MM          //end edit -MM
  }   automap_width=grd_curscreen->sc_canvas.cv_bitmap.bm_w;
    automap_height=grd_curscreen->sc_canvas.cv_bitmap.bm_h;
   
  gr_palette_clear();   gr_palette_clear();
   

Legend:
line(s) removed in v.1.5 
line(s) changed
 line(s) added in v.1.6