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.16 by root, Wed Jun 6 05:41:26 2007 UTC vs.
Revision 1.35 by root, Tue Oct 5 21:40:05 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 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 it 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 7 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 16 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * <http://www.gnu.org/licenses/>.
21 * 19 *
22 * 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>
23 */ 21 */
24 22
25#ifndef FACE_H__ 23#ifndef FACE_H__
26#define FACE_H__ 24#define FACE_H__
27 25
28#include <string> 26#include <string>
29#include <tr1/unordered_map> 27#include <tr1/unordered_map>
30 28
31#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
32#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
33 31
34typedef uint16 faceidx; 32typedef uint16 faceidx;
35 33
36extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
37 35
38struct facedata 36struct facedata
39{ 37{
40 std::string data; 38 std::string data;
41 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
41
42 facedata ()
43 : chksum_len (0)
44 { }
42}; 45};
43 46
44/* New face structure - this enforces the notion that data is face by 47/* New face structure - this enforces the notion that data is face by
45 * face only - you can not change the color of an item - you need to instead 48 * face only - you can not change the color of an item - you need to instead
46 * create a new face with that color. 49 * create a new face with that color.
47 */ 50 */
48struct faceinfo 51struct faceinfo
49{ 52{
53 faceinfo ()
54 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
55 {
56 }
57
50 shstr name; 58 shstr name;
51 facedata data32, data64; 59 std::string meta;
60 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
52 faceidx number; /* This is the image id. It should be the */ 61 faceidx number; /* This is the image id. It should be the */
53 /* same value as its position in the array */ 62 /* same value as its position in the array */
54 faceidx smooth; /* the smooth face for this face, or 0 */ 63 faceidx smooth; /* the smooth face for this face, or 0 */
64 uint8 type; // 0 normal face, otherwise other resource
55 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 65 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
56 uint8 visibility; 66 uint8 visibility;
57 uint8 magicmap; /* Color to show this in magic map */ 67 uint8 magicmap; /* Color to show this in magic map */
58 68
59 faceinfo () 69 facedata *data (int faceset) const;
60 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
61 { }
62}; 70};
63 71
64inline void 72inline void
65object_freezer::put (keyword k, faceinfo *v) 73object_freezer::put (const keyword_string k, faceinfo *v)
66{ 74{
67 put (k, v ? &v->name : (const char *)0); 75 if (expect_true (v))
76 put (k, v->name);
77 else
78 put (k);
68} 79}
69 80
70typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 81typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
71 82
72extern facehash_t facehash; 83extern facehash_t facehash;
73extern std::vector<faceinfo> faces; 84extern std::vector<faceinfo> faces;
74 85
75/* This returns an the face number of face 'name'. Number is constant 86/* This returns an the face number of face 'name'. Number is constant
… …
94 105
95typedef uint16 animidx; 106typedef uint16 animidx;
96 107
97struct animation 108struct animation
98{ 109{
110 faceidx *faces; /* The different animations */
111 int num_animations; /* How many different faces to animate */
112 sint8 facings; /* How many facings (1,2,4,8) */
113 animidx number;
99 shstr name; /* Name of the animation sequence */ 114 shstr name; /* Name of the animation sequence */
100 animidx number;
101 uint8 num_animations; /* How many different faces to animate */
102 uint8 facings; /* How many facings (1,2,4,8) */
103 faceidx *faces; /* The different animations */
104 115
105 static animation &create (const char *name, uint8 frames, uint8 facings = 1); 116 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
106 static animation &find (const char *name); 117 static animation &find (const char *name);
107 118
108 void resize (int new_size); 119 void resize (int new_size);
109}; 120};
110 121
111typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 122typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
112 123
113extern animhash_t animhash;
114extern std::vector<animation> animations; 124extern std::vector<animation> animations;
115 125
116#endif 126#endif
117 127

Diff Legend

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