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.44 by root, Wed Nov 16 23:42:00 2016 UTC vs.
Revision 1.45 by root, Fri Nov 18 04:44:13 2016 UTC

22 22
23#ifndef FACE_H__ 23#ifndef FACE_H__
24#define FACE_H__ 24#define FACE_H__
25 25
26#include <util.h> 26#include <util.h>
27#include <tr1/unordered_map> 27#include <unordered_map>
28 28
29#define CHKSUM_MAXLEN 15 29#define CHKSUM_MAXLEN 15
30#define MAX_FACES 65535 // we reserve face #65535 30#define MAX_FACES 65535 // we reserve face #65535
31 31
32extern faceidx blank_face, empty_face, magicmouth_face; 32extern faceidx blank_face, empty_face, magicmouth_face;
76 put (k, v->name); 76 put (k, v->name);
77 else 77 else
78 put (k); 78 put (k);
79} 79}
80 80
81typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 81typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
82 82
83extern facehash_t facehash; 83extern facehash_t facehash;
84extern std::vector<faceinfo> faces; 84extern std::vector<faceinfo> faces;
85 85
86/* This returns an the face number of face 'name'. Number is constant 86/* This returns an the face number of face 'name'. Number is constant
118 static animation &find (const char *name); 118 static animation &find (const char *name);
119 119
120 void resize (int new_size); 120 void resize (int new_size);
121}; 121};
122 122
123typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 123typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
124 124
125extern std::vector<animation> animations; 125extern std::vector<animation> animations;
126 126
127#endif 127#endif
128 128

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines