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.13 by root, Tue Apr 10 09:35:23 2007 UTC

… …
25#define FACE_H__ 25#define FACE_H__
26 26
27#include <string> 27#include <string>
28#include <tr1/unordered_map> 28#include <tr1/unordered_map>
29 29
30#define CHKSUM_SIZE (128 / 8) 30#define CHKSUM_SIZE 6
31#define MAX_FACES 10000 // stupid gcfclient artificially limits 31#define MAX_FACES 10000 // stupid gcfclient artificially limits
32 32
33typedef uint16 faceidx; 33typedef uint16 faceidx;
34 34
35extern faceidx blank_face, empty_face; 35extern faceidx blank_face, empty_face;
36
37struct facedata
38{
39 std::string data;
40 uint8 chksum[CHKSUM_SIZE];
41};
36 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 */
54 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
46 uint8 visibility; 55 uint8 visibility;
47 uint8 magicmap; /* Color to show this in magic map */ 56 uint8 magicmap; /* Color to show this in magic map */
48};
49 57
50struct facedata 58 faceinfo ()
51{ 59 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
52 std::string data; 60 { }
53 uint8 chksum[CHKSUM_SIZE];
54}; 61};
55 62
56typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 63typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
57 64
58extern facehash_t facehash; 65extern facehash_t facehash;
59extern std::vector<faceinfo> faces; 66extern std::vector<faceinfo> faces;
60extern std::vector<facedata> face32, face64;
61 67
62/* This returns an the face number of face 'name'. Number is constant 68/* This returns an the face number of face 'name'. Number is constant
63 * during an invocation, but not necessarily between versions (this 69 * during an invocation, but not necessarily between versions (this
64 * is because the faces are arranged in alphabetical order, so 70 * is because the faces are arranged in alphabetical order, so
65 * if a face is removed or added, all faces after that will now 71 * if a face is removed or added, all faces after that will now
… …
67 * 73 *
68 * If a face is not found, then defidx is returned. This can be useful 74 * 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 75 * 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. 76 * it will be known that the face could not be found.
71 */ 77 */
72int face_find (const char *name, int defidx = 0); 78faceidx face_find (const char *name, faceidx defidx = 0);
79faceinfo *face_info (faceidx idx);
73facedata *face_data (int idx, int faceset); 80facedata *face_data (faceidx idx, int faceset);
74 81
75struct MapLook 82struct MapLook
76{ 83{
77 faceinfo *face; 84 faceinfo *face;
78 uint8 flags; 85 uint8 flags;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines