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.43 by root, Sun Nov 11 05:53:12 2012 UTC vs.
Revision 1.47 by root, Sat Nov 17 23:40:01 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 8 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 10 * option) any later version.
22 23
23#ifndef FACE_H__ 24#ifndef FACE_H__
24#define FACE_H__ 25#define FACE_H__
25 26
26#include <util.h> 27#include <util.h>
27#include <tr1/unordered_map> 28
29#include "flat_hash_map.hpp"
28 30
29#define CHKSUM_MAXLEN 15 31#define CHKSUM_MAXLEN 15
30#define MAX_FACES 65535 // we reserve face #65535 32#define MAX_FACES 65535 // we reserve face #65535
31 33
32extern faceidx blank_face, empty_face, magicmouth_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
76 put (k, v->name); 78 put (k, v->name);
77 else 79 else
78 put (k); 80 put (k);
79} 81}
80 82
81typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 83typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> facehash_t;
82 84
83extern facehash_t facehash; 85extern facehash_t facehash;
84extern std::vector<faceinfo> faces; 86extern std::vector<faceinfo> faces;
85 87
86/* This returns an the face number of face 'name'. Number is constant 88/* This returns an the face number of face 'name'. Number is constant
118 static animation &find (const char *name); 120 static animation &find (const char *name);
119 121
120 void resize (int new_size); 122 void resize (int new_size);
121}; 123};
122 124
123typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 125typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> animhash_t;
124 126
125extern std::vector<animation> animations; 127extern std::vector<animation> animations;
126 128
127#endif 129#endif
128 130

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines