Difference for 2d/bitmap.c from version 1.6 to 1.7


version 1.6 version 1.7
Line 19
 
Line 19
  * Graphical routines for manipulating grs_bitmaps.   * Graphical routines for manipulating grs_bitmaps.
  *   *
  * $Log$   * $Log$
    * Revision 1.7  1999/10/08 08:50:54  donut
    * fixed ogl sub bitmap support
    *
  * Revision 1.6  1999/10/07 20:48:17  donut   * Revision 1.6  1999/10/07 20:48:17  donut
  * ogl fix for sub bitmaps and segv   * ogl fix for sub bitmaps and segv
  *   *
Line 149
 
Line 152
  Win32_CreateTexture (bm);   Win32_CreateTexture (bm);
 #endif  #endif
 #ifdef OGL  #ifdef OGL
  bm->gltexture=NULL;   bm->bm_parent=NULL;bm->gltexture=NULL;
 #endif  #endif
   
 // if (data != 0)  // if (data != 0)
Line 180
 
Line 183
 #endif  #endif
 #ifdef OGL  #ifdef OGL
 // ogl_freebmtexture(bm);//not what we want here.  // ogl_freebmtexture(bm);//not what we want here.
  bm->gltexture=NULL;   bm->bm_parent=NULL;bm->gltexture=NULL;
 #endif  #endif
 }  }
   
Line 221
 
Line 224
   
 #ifdef OGL  #ifdef OGL
  bm->gltexture=bmParent->gltexture;   bm->gltexture=bmParent->gltexture;
    bm->bm_parent=bmParent;
 #endif  #endif
 #ifdef D1XD3D  #ifdef D1XD3D
  Assert (bmParent->iMagic == BM_MAGIC_NUMBER);   Assert (bmParent->iMagic == BM_MAGIC_NUMBER);

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