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.28 by root, Tue Nov 3 23:44:21 2009 UTC vs.
Revision 1.31 by root, Sun Nov 15 18:03:59 2009 UTC

… …
24#define FACE_H__ 24#define FACE_H__
25 25
26#include <string> 26#include <string>
27#include <tr1/unordered_map> 27#include <tr1/unordered_map>
28 28
29#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
30#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
31 31
32typedef uint16 faceidx; 32typedef uint16 faceidx;
33 33
34extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face;
35 35
36struct facedata 36struct facedata
37{ 37{
38 std::string data; 38 std::string data;
39 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
40}; 41};
41 42
42/* 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
43 * 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
44 * create a new face with that color. 45 * create a new face with that color.
… …
63 64
64 facedata *data (int faceset) const; 65 facedata *data (int faceset) const;
65}; 66};
66 67
67inline void 68inline void
68object_freezer::put (keyword k, faceinfo *v) 69object_freezer::put (const keyword_string k, faceinfo *v)
69{ 70{
70 put (k, v ? &v->name : (const char *)0); 71 if (expect_true (v))
72 put (k, v->name);
73 else
74 put (k);
71} 75}
72 76
73typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 77typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
74 78
75extern facehash_t facehash; 79extern facehash_t facehash;
… …
111 void resize (int new_size); 115 void resize (int new_size);
112}; 116};
113 117
114typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 118typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
115 119
116extern animhash_t animhash;
117extern std::vector<animation> animations; 120extern std::vector<animation> animations;
118 121
119#endif 122#endif
120 123

Diff Legend

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