Difference for arch/ogl/gr.c from version 1.24 to 1.25


version 1.24 version 1.25
Line 31
 
Line 31
 #include "mono.h"  #include "mono.h"
 #include "args.h"  #include "args.h"
 #include "key.h"  #include "key.h"
   #include "u_mem.h"
   
 #include "gamefont.h"  #include "gamefont.h"
   
Line 183
 
Line 184
 int gr_set_mode(u_int32_t mode)  int gr_set_mode(u_int32_t mode)
 {  {
  unsigned int w,h;   unsigned int w,h;
    char *gr_bm_data;
   
 #ifdef NOGRAPH  #ifdef NOGRAPH
 return 0;  return 0;
Line 198
 
Line 200
   
 // ogl_init_state();  // ogl_init_state();
    
    gr_bm_data=grd_curscreen->sc_canvas.cv_bitmap.bm_data;//since we use realloc, we want to keep this pointer around.
  memset( grd_curscreen, 0, sizeof(grs_screen));   memset( grd_curscreen, 0, sizeof(grs_screen));
  grd_curscreen->sc_mode = mode;   grd_curscreen->sc_mode = mode;
  grd_curscreen->sc_w = w;   grd_curscreen->sc_w = w;
Line 211
 
Line 214
  grd_curscreen->sc_canvas.cv_bitmap.bm_rowsize = w;   grd_curscreen->sc_canvas.cv_bitmap.bm_rowsize = w;
  grd_curscreen->sc_canvas.cv_bitmap.bm_type = BM_OGL;   grd_curscreen->sc_canvas.cv_bitmap.bm_type = BM_OGL;
  //grd_curscreen->sc_canvas.cv_bitmap.bm_data = (unsigned char *)screen->pixels;   //grd_curscreen->sc_canvas.cv_bitmap.bm_data = (unsigned char *)screen->pixels;
  grd_curscreen->sc_canvas.cv_bitmap.bm_data = realloc(grd_curscreen->sc_canvas.cv_bitmap.bm_data,w*h);  // mprintf((0,"ogl/gr.c: reallocing %p to %i\n",grd_curscreen->sc_canvas.cv_bitmap.bm_data,w*h));
    grd_curscreen->sc_canvas.cv_bitmap.bm_data = realloc(gr_bm_data,w*h);
  gr_set_current_canvas(NULL);   gr_set_current_canvas(NULL);
  //gr_enable_default_palette_loading();   //gr_enable_default_palette_loading();
    

Legend:
line(s) removed in v.1.24 
line(s) changed
 line(s) added in v.1.25