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.45 by root, Fri Nov 18 04:44:13 2016 UTC vs.
Revision 1.46 by root, Sat Nov 17 23:33:18 2018 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 <unordered_map> 27
28#include "flat_hash_map.hpp"
28 29
29#define CHKSUM_MAXLEN 15 30#define CHKSUM_MAXLEN 15
30#define MAX_FACES 65535 // we reserve face #65535 31#define MAX_FACES 65535 // we reserve face #65535
31 32
32extern faceidx blank_face, empty_face, magicmouth_face; 33extern faceidx blank_face, empty_face, magicmouth_face;
76 put (k, v->name); 77 put (k, v->name);
77 else 78 else
78 put (k); 79 put (k);
79} 80}
80 81
81typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 82typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> facehash_t;
82 83
83extern facehash_t facehash; 84extern facehash_t facehash;
84extern std::vector<faceinfo> faces; 85extern std::vector<faceinfo> faces;
85 86
86/* This returns an the face number of face 'name'. Number is constant 87/* This returns an the face number of face 'name'. Number is constant
118 static animation &find (const char *name); 119 static animation &find (const char *name);
119 120
120 void resize (int new_size); 121 void resize (int new_size);
121}; 122};
122 123
123typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 124typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> animhash_t;
124 125
125extern std::vector<animation> animations; 126extern std::vector<animation> animations;
126 127
127#endif 128#endif
128 129

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines