ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/face.h
(Generate patch)

Comparing deliantra/server/include/face.h (file contents):
Revision 1.9 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.11 by root, Wed Mar 14 04:12:28 2007 UTC

32 32
33typedef uint16 faceidx; 33typedef uint16 faceidx;
34 34
35extern faceidx blank_face, empty_face; 35extern faceidx blank_face, empty_face;
36 36
37struct facedata
38{
39 std::string data;
40 uint8 chksum[CHKSUM_SIZE];
41};
42
37/* New face structure - this enforces the notion that data is face by 43/* New face structure - this enforces the notion that data is face by
38 * face only - you can not change the color of an item - you need to instead 44 * face only - you can not change the color of an item - you need to instead
39 * create a new face with that color. 45 * create a new face with that color.
40 */ 46 */
41struct faceinfo 47struct faceinfo
42{ 48{
43 shstr name; 49 shstr name;
50 facedata data32, data64;
44 faceidx number; /* This is the image id. It should be the */ 51 faceidx number; /* This is the image id. It should be the */
45 /* same value as its position in the array */ 52 /* same value as its position in the array */
53 faceidx smooth; /* the smooth face for this face, or 0 */
46 uint8 visibility; 54 uint8 visibility;
47 uint8 magicmap; /* Color to show this in magic map */ 55 uint8 magicmap; /* Color to show this in magic map */
48};
49 56
50struct facedata 57 faceinfo ()
51{ 58 : number (0), smooth (0), visibility (0), magicmap (0)
52 std::string data; 59 { }
53 uint8 chksum[CHKSUM_SIZE];
54}; 60};
55 61
56typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 62typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
57 63
58extern facehash_t facehash; 64extern facehash_t facehash;
59extern std::vector<faceinfo> faces; 65extern std::vector<faceinfo> faces;
60extern std::vector<facedata> face32, face64;
61 66
62/* This returns an the face number of face 'name'. Number is constant 67/* This returns an the face number of face 'name'. Number is constant
63 * during an invocation, but not necessarily between versions (this 68 * during an invocation, but not necessarily between versions (this
64 * is because the faces are arranged in alphabetical order, so 69 * is because the faces are arranged in alphabetical order, so
65 * if a face is removed or added, all faces after that will now 70 * if a face is removed or added, all faces after that will now
67 * 72 *
68 * If a face is not found, then defidx is returned. This can be useful 73 * If a face is not found, then defidx is returned. This can be useful
69 * if you want some default face used, or can be set to negative so that 74 * if you want some default face used, or can be set to negative so that
70 * it will be known that the face could not be found. 75 * it will be known that the face could not be found.
71 */ 76 */
72int face_find (const char *name, int defidx = 0); 77faceidx face_find (const char *name, faceidx defidx = 0);
78faceinfo *face_info (faceidx idx);
73facedata *face_data (int idx, int faceset); 79facedata *face_data (faceidx idx, int faceset);
74 80
75struct MapLook 81struct MapLook
76{ 82{
77 faceinfo *face; 83 faceinfo *face;
78 uint8 flags; 84 uint8 flags;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines