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

Diff Legend

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