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

Diff Legend

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