Difference for common/image.c from version 1.2 to 1.3


version 1.2 version 1.3
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_image_c =   * static char *rcsid_image_c =
  *   "$Id: image.c,v 1.2 1999/07/13 06:02:41 cvs Exp $";   *   "$Id: image.c,v 1.3 2000/05/27 05:42:14 cvs Exp $";
  */   */
   
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
   
     Copyright (C) 1994 Mark Wedel      Copyright (C) 2000 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen      Copyright (C) 1992 Frank Tore Johansen
   
     This program is free software; you can redistribute it and/or modify      This program is free software; you can redistribute it and/or modify
Line 23
 
Line 23
     along with this program; if not, write to the Free Software      along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
     The maintainer of this code can be reached at master@rahul.net      The maintainer of this code can be reached at mwedel@scruz.net
 */  */
   
   
Line 54
 
Line 54
 /* Following can just as easily be pointers, but   /* Following can just as easily be pointers, but
  * it is easier to keep them like this.   * it is easier to keep them like this.
  */   */
 New_Face *blank_face, *blocked_face, *stipple1_face, *stipple2_face;  New_Face *blank_face, *dark_faces[3], *potion_face;
 New_Face *dark_faces[3];  
 New_Face *potion_face;  
   
   
 New_Face *inv_curse_face, *inv_damn_face, *inv_equip_face, *inv_lock_face,  
  *inv_magic_face, *inv_unpaid_face;  
   
 /* nroffiles is the actual number of bitmaps defined.  /* nroffiles is the actual number of bitmaps defined.
  * nrofpixmaps is the higest numbers bitmap that is loaded.  With   * nrofpixmaps is the higest numbers bitmap that is loaded.  With
  * the automatic generation of the bmaps file, this is now equal   * the automatic generation of the bmaps file, this is now equal
Line 279
 
Line 274
  dark_faces[1] = &new_faces[FindFace (DARK_FACE2_NAME,0)];   dark_faces[1] = &new_faces[FindFace (DARK_FACE2_NAME,0)];
  dark_faces[2] = &new_faces[FindFace (DARK_FACE3_NAME,0)];   dark_faces[2] = &new_faces[FindFace (DARK_FACE3_NAME,0)];
   
     blocked_face = &new_faces[FindFace (BLOCKED_FACE_NAME,0)];  
     blocked_face->fg = find_color ("black");  
     blocked_face->bg = find_color ("black");  
     stipple1_face = &new_faces[FindFace (STIPPLE1_FACE_NAME,0)];  
     stipple1_face->fg = find_color ("white");  
     stipple1_face->bg = find_color ("black");  
     stipple2_face = &new_faces[FindFace (STIPPLE2_FACE_NAME,0)];  
     stipple2_face->fg = find_color ("white");  
     stipple2_face->bg = find_color ("black");  
     potion_face  = &new_faces[FindFace(POTION_FACE_NAME,0)];      potion_face  = &new_faces[FindFace(POTION_FACE_NAME,0)];
     potion_face->fg = find_color("light_blue");      potion_face->fg = find_color("light_blue");
     potion_face->bg = find_color("khaki");      potion_face->bg = find_color("khaki");
     inv_curse_face = &new_faces[FindFace(INV_CURSE_FACE_NAME,0)];  
     inv_damn_face = &new_faces[FindFace(INV_DAMN_FACE_NAME,0)];  
     inv_equip_face = &new_faces[FindFace(INV_EQUIP_FACE_NAME,0)];  
     inv_lock_face = &new_faces[FindFace(INV_LOCK_FACE_NAME,0)];  
     inv_magic_face = &new_faces[FindFace(INV_MAGIC_FACE_NAME,0)];  
     inv_unpaid_face = &new_faces[FindFace(INV_UNPAID_FACE_NAME,0)];  
   
     return nrofpixmaps;      return nrofpixmaps;
 }  }


Legend:
line(s) removed in v.1.2 
line(s) changed
 line(s) added in v.1.3

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:06