Difference for crossedit/App.c from version 1.6 to 1.7


version 1.6 version 1.7
Line 42
 
Line 42
   
 Pixmap *pixmaps; /* list of pixmaps */  Pixmap *pixmaps; /* list of pixmaps */
 Pixmap *masks; /* list of masks */  Pixmap *masks; /* list of masks */
   int FontSize; /* Size of font (really images) */
 #define E_EDITABLE   (E_MONSTER | E_EXIT | E_TREASURE | E_BACKGROUND | \  #define E_EDITABLE   (E_MONSTER | E_EXIT | E_TREASURE | E_BACKGROUND | \
                      E_DOOR | E_SPECIAL | E_SHOP | E_NORMAL | E_FALSE_WALL)                       E_DOOR | E_SPECIAL | E_SHOP | E_NORMAL | E_FALSE_WALL)
   
Line 822
 
Line 823
     /*** images & colors ***/      /*** images & colors ***/
     InitializeColors(XtDisplay(self->shell));      InitializeColors(XtDisplay(self->shell));
   
       /* Default */
       displaymode=Dm_Bitmap;
 #ifdef HAVE_LIBXPM  #ifdef HAVE_LIBXPM
     if (self->res.usePixmaps) displaymode=Dm_Bitmap;      if (self->res.useColorPixmaps) displaymode=Dm_Pixmap;
     else if (self->res.useColorPixmaps) displaymode=Dm_Pixmap;  #endif
 #else  #ifdef HAVE_LIBPNG
     displaymode=Dm_Font;      if (self->res.usePng) displaymode=Dm_Png;
     if (self->res.usePixmaps||self->res.useColorPixmaps) {  
  fprintf(stderr,"Crossedit not compiled with Xpm Support.\n");  
     }  
     if(!strcmp(FONTNAME,"")) {  
  fprintf(stderr,"No font defined for Crossedit.\n");  
         exit(0);  
     }  
 #endif  #endif
   
       if (displaymode==Dm_Png)
    FontSize=32;
       else
    FontSize=24;
     CnvInitialize(self->shell);      CnvInitialize(self->shell);
   
     if (ReadImages(self->display, &pixmaps, &masks, &colormap, displaymode)) {      if (ReadImages(self->display, &pixmaps, &masks, &colormap, displaymode)) {


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

File made using version 1.98 of cvs2html by leaf at 2011-07-21 19:48