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.19 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.31 by root, Sun Nov 15 18:03:59 2009 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 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 <string>
28#include <tr1/unordered_map> 27#include <tr1/unordered_map>
29 28
30#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
31#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
32 31
33typedef uint16 faceidx; 32typedef uint16 faceidx;
34 33
35extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face;
36 35
37struct facedata 36struct facedata
38{ 37{
39 std::string data; 38 std::string data;
40 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
41}; 41};
42 42
43/* New face structure - this enforces the notion that data is face by 43/* 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 44 * face only - you can not change the color of an item - you need to instead
45 * create a new face with that color. 45 * create a new face with that color.
46 */ 46 */
47struct faceinfo 47struct faceinfo
48{ 48{
49 faceinfo ()
50 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
51 {
52 }
53
49 shstr name; 54 shstr name;
50 std::string meta; 55 std::string meta;
51 facedata data32, data64; // either 32/64 face or data32 == generic resource 56 facedata data32, data64; // either 32/64 face or data32 == generic resource
52 faceidx number; /* This is the image id. It should be the */ 57 faceidx number; /* This is the image id. It should be the */
53 /* same value as its position in the array */ 58 /* same value as its position in the array */
… …
55 uint8 type; // 0 normal face, otherwise other resource 60 uint8 type; // 0 normal face, otherwise other resource
56 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 61 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
57 uint8 visibility; 62 uint8 visibility;
58 uint8 magicmap; /* Color to show this in magic map */ 63 uint8 magicmap; /* Color to show this in magic map */
59 64
60 faceinfo () 65 facedata *data (int faceset) const;
61 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
62 { }
63}; 66};
64 67
65inline void 68inline void
66object_freezer::put (keyword k, faceinfo *v) 69object_freezer::put (const keyword_string k, faceinfo *v)
67{ 70{
68 put (k, v ? &v->name : (const char *)0); 71 if (expect_true (v))
72 put (k, v->name);
73 else
74 put (k);
69} 75}
70 76
71typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 77typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
72 78
73extern facehash_t facehash; 79extern facehash_t facehash;
74extern std::vector<faceinfo> faces; 80extern std::vector<faceinfo> faces;
75 81
76/* This returns an the face number of face 'name'. Number is constant 82/* This returns an the face number of face 'name'. Number is constant
… …
95 101
96typedef uint16 animidx; 102typedef uint16 animidx;
97 103
98struct animation 104struct animation
99{ 105{
106 faceidx *faces; /* The different animations */
107 int num_animations; /* How many different faces to animate */
108 sint8 facings; /* How many facings (1,2,4,8) */
109 animidx number;
100 shstr name; /* Name of the animation sequence */ 110 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 111
106 static animation &create (const char *name, uint8 frames, uint8 facings = 1); 112 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
107 static animation &find (const char *name); 113 static animation &find (const char *name);
108 114
109 void resize (int new_size); 115 void resize (int new_size);
110}; 116};
111 117
112typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 118typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
113 119
114extern animhash_t animhash;
115extern std::vector<animation> animations; 120extern std::vector<animation> animations;
116 121
117#endif 122#endif
118 123

Diff Legend

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