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.30 by root, Wed Nov 11 23:27:57 2009 UTC

63 63
64 facedata *data (int faceset) const; 64 facedata *data (int faceset) const;
65}; 65};
66 66
67inline void 67inline void
68object_freezer::put (keyword k, faceinfo *v) 68object_freezer::put (const keyword_string k, faceinfo *v)
69{ 69{
70 put (k, v ? &v->name : (const char *)0); 70 if (expect_true (v))
71 put (k, v->name);
72 else
73 put (k);
71} 74}
72 75
73typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 76typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
74 77
75extern facehash_t facehash; 78extern facehash_t facehash;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines