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.35 by root, Tue Oct 5 21:40:05 2010 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 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.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 15 * GNU General Public License for more details.
15 * 16 *
16 * You should have received a copy of the Affero GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 18 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22 23
23#ifndef FACE_H__ 24#ifndef FACE_H__
24#define FACE_H__ 25#define FACE_H__
25 26
26#include <string> 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 10000 // stupid gcfclient artificially limits 32#define MAX_FACES 65535 // we reserve face #65535
31
32typedef uint16 faceidx;
33 33
34extern faceidx blank_face, empty_face, magicmouth_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
35 35
36struct facedata 36struct facedata
37{ 37{
38 std::string data;
39 uint8 chksum[CHKSUM_MAXLEN]; 38 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len; 39 uint8 chksum_len;
41 40
42 facedata () 41 facedata ()
43 : chksum_len (0) 42 : chksum_len (0)
… …
49 * create a new face with that color. 48 * create a new face with that color.
50 */ 49 */
51struct faceinfo 50struct faceinfo
52{ 51{
53 faceinfo () 52 faceinfo ()
54 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0) 53 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1)
55 { 54 {
56 } 55 }
57 56
58 shstr name; 57 shstr name;
59 std::string meta;
60 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text 58 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
61 faceidx number; /* This is the image id. It should be the */ 59 faceidx number; /* This is the image id. It should be the */
62 /* same value as its position in the array */ 60 /* same value as its position in the array */
63 faceidx smooth; /* the smooth face for this face, or 0 */ 61 faceidx smooth; /* the smooth face for this face, or 0 */
64 uint8 type; // 0 normal face, otherwise other resource 62 uint8 type; // 0 normal face, otherwise other resource
65 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 63 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
66 uint8 visibility; 64 uint8 visibility;
67 uint8 magicmap; /* Color to show this in magic map */ 65 uint8 magicmap; /* Color to show this in magic map */
68 66
69 facedata *data (int faceset) const; 67 facedata *data (int faceset) const;
68
69 int refcnt; // reference count - 1
70 void ref () { ++refcnt; }
71 void unref ();
70}; 72};
71 73
72inline void 74inline void
73object_freezer::put (const keyword_string k, faceinfo *v) 75object_freezer::put (const keyword_string k, faceinfo *v)
74{ 76{
… …
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
… …
92 * If a face is not found, then defidx is returned. This can be useful 94 * If a face is not found, then defidx is returned. This can be useful
93 * if you want some default face used, or can be set to negative so that 95 * if you want some default face used, or can be set to negative so that
94 * it will be known that the face could not be found. 96 * it will be known that the face could not be found.
95 */ 97 */
96faceidx face_find (const char *name, faceidx defidx = 0); 98faceidx face_find (const char *name, faceidx defidx = 0);
99faceidx face_alloc ();
97faceinfo *face_info (faceidx idx); 100faceinfo *face_info (faceidx idx);
98facedata *face_data (faceidx idx, int faceset); 101facedata *face_data (faceidx idx, int faceset);
99 102
100struct MapLook 103struct MapLook
101{ 104{
… …
117 static animation &find (const char *name); 120 static animation &find (const char *name);
118 121
119 void resize (int new_size); 122 void resize (int new_size);
120}; 123};
121 124
122typedef 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;
123 126
124extern std::vector<animation> animations; 127extern std::vector<animation> animations;
125 128
126#endif 129#endif
127 130

Diff Legend

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