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.29 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.32 by root, Sat Jan 16 00:08:33 2010 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;
41
42 facedata ()
43 : chksum_len (0)
44 { }
40}; 45};
41 46
42/* New face structure - this enforces the notion that data is face by 47/* 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 48 * face only - you can not change the color of an item - you need to instead
44 * create a new face with that color. 49 * create a new face with that color.
… …
63 68
64 facedata *data (int faceset) const; 69 facedata *data (int faceset) const;
65}; 70};
66 71
67inline void 72inline void
68object_freezer::put (keyword k, faceinfo *v) 73object_freezer::put (const keyword_string k, faceinfo *v)
69{ 74{
70 put (k, v ? &v->name : (const char *)0); 75 if (expect_true (v))
76 put (k, v->name);
77 else
78 put (k);
71} 79}
72 80
73typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 81typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
74 82
75extern facehash_t facehash; 83extern facehash_t facehash;

Diff Legend

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