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.23 by elmex, Thu Nov 8 14:15:56 2007 UTC vs.
Revision 1.46 by root, Sat Nov 17 23:33:18 2018 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1994,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#ifndef FACE_H__ 23#ifndef FACE_H__
25#define FACE_H__ 24#define FACE_H__
26 25
27#include <string> 26#include <util.h>
28#include <tr1/unordered_map>
29 27
30#define CHKSUM_SIZE 6 28#include "flat_hash_map.hpp"
31#define MAX_FACES 10000 // stupid gcfclient artificially limits
32 29
33typedef uint16 faceidx; 30#define CHKSUM_MAXLEN 15
31#define MAX_FACES 65535 // we reserve face #65535
34 32
35extern faceidx blank_face, empty_face; 33extern faceidx blank_face, empty_face, magicmouth_face;
36 34
37struct facedata 35struct facedata
38{ 36{
39 std::string data;
40 uint8 chksum[CHKSUM_SIZE]; 37 uint8 chksum[CHKSUM_MAXLEN];
38 uint8 chksum_len;
39
40 facedata ()
41 : chksum_len (0)
42 { }
41}; 43};
42 44
43/* New face structure - this enforces the notion that data is face by 45/* New face structure - this enforces the notion that data is face by
44 * face only - you can not change the color of an item - you need to instead 46 * face only - you can not change the color of an item - you need to instead
45 * create a new face with that color. 47 * create a new face with that color.
46 */ 48 */
47struct faceinfo 49struct faceinfo
48{ 50{
49 faceinfo () 51 faceinfo ()
50 : 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)
51 { 53 {
52 } 54 }
53 55
54 shstr name; 56 shstr name;
55 std::string meta; 57 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
56 facedata data32, data64; // either 32/64 face or data32 == generic resource
57 faceidx number; /* This is the image id. It should be the */ 58 faceidx number; /* This is the image id. It should be the */
58 /* same value as its position in the array */ 59 /* same value as its position in the array */
59 faceidx smooth; /* the smooth face for this face, or 0 */ 60 faceidx smooth; /* the smooth face for this face, or 0 */
60 uint8 type; // 0 normal face, otherwise other resource 61 uint8 type; // 0 normal face, otherwise other resource
61 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 62 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
62 uint8 visibility; 63 uint8 visibility;
63 uint8 magicmap; /* Color to show this in magic map */ 64 uint8 magicmap; /* Color to show this in magic map */
64 65
65 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 ();
66}; 71};
67 72
68inline void 73inline void
69object_freezer::put (keyword k, faceinfo *v) 74object_freezer::put (const keyword_string k, faceinfo *v)
70{ 75{
71 put (k, v ? &v->name : (const char *)0); 76 if (expect_true (v))
77 put (k, v->name);
78 else
79 put (k);
72} 80}
73 81
74typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 82typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> facehash_t;
75 83
76extern facehash_t facehash; 84extern facehash_t facehash;
77extern std::vector<faceinfo> faces; 85extern std::vector<faceinfo> faces;
78 86
79/* 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
… …
85 * 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
86 * 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
87 * it will be known that the face could not be found. 95 * it will be known that the face could not be found.
88 */ 96 */
89faceidx face_find (const char *name, faceidx defidx = 0); 97faceidx face_find (const char *name, faceidx defidx = 0);
98faceidx face_alloc ();
90faceinfo *face_info (faceidx idx); 99faceinfo *face_info (faceidx idx);
91facedata *face_data (faceidx idx, int faceset); 100facedata *face_data (faceidx idx, int faceset);
92 101
93struct MapLook 102struct MapLook
94{ 103{
… …
110 static animation &find (const char *name); 119 static animation &find (const char *name);
111 120
112 void resize (int new_size); 121 void resize (int new_size);
113}; 122};
114 123
115typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 124typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> animhash_t;
116 125
117extern animhash_t animhash;
118extern std::vector<animation> animations; 126extern std::vector<animation> animations;
119 127
120#endif 128#endif
121 129

Diff Legend

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