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.27 by root, Mon Oct 12 14:00:58 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1994,2007 Mark Wedel 5 * Copyright (©) 1994,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * 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 9 * 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) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * 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 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#ifndef FACE_H__ 25#ifndef FACE_H__
26#define FACE_H__ 26#define FACE_H__
27 27
… …
45 * face only - you can not change the color of an item - you need to instead 45 * face only - you can not change the color of an item - you need to instead
46 * create a new face with that color. 46 * create a new face with that color.
47 */ 47 */
48struct faceinfo 48struct faceinfo
49{ 49{
50 faceinfo ()
51 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
52 {
53 }
54
50 shstr name; 55 shstr name;
51 facedata data32, data64; 56 std::string meta;
57 facedata data32, data64; // either 32/64 face or data32 == generic resource
52 faceidx number; /* This is the image id. It should be the */ 58 faceidx number; /* This is the image id. It should be the */
53 /* same value as its position in the array */ 59 /* same value as its position in the array */
54 faceidx smooth; /* the smooth face for this face, or 0 */ 60 faceidx smooth; /* the smooth face for this face, or 0 */
61 uint8 type; // 0 normal face, otherwise other resource
55 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 62 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
56 uint8 visibility; 63 uint8 visibility;
57 uint8 magicmap; /* Color to show this in magic map */ 64 uint8 magicmap; /* Color to show this in magic map */
58 65
59 faceinfo () 66 facedata *data (int faceset) const;
60 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
61 { }
62}; 67};
63 68
64inline void 69inline void
65object_freezer::put (keyword k, faceinfo *v) 70object_freezer::put (keyword k, faceinfo *v)
66{ 71{
67 put (k, v ? &v->name : (const char *)0); 72 put (k, v ? &v->name : (const char *)0);
68} 73}
69 74
70typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 75typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
71 76
72extern facehash_t facehash; 77extern facehash_t facehash;
73extern std::vector<faceinfo> faces; 78extern std::vector<faceinfo> faces;
74 79
75/* This returns an the face number of face 'name'. Number is constant 80/* This returns an the face number of face 'name'. Number is constant
… …
94 99
95typedef uint16 animidx; 100typedef uint16 animidx;
96 101
97struct animation 102struct animation
98{ 103{
104 faceidx *faces; /* The different animations */
105 int num_animations; /* How many different faces to animate */
106 sint8 facings; /* How many facings (1,2,4,8) */
107 animidx number;
99 shstr name; /* Name of the animation sequence */ 108 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 109
105 static animation &create (const char *name, uint8 frames, uint8 facings = 1); 110 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
106 static animation &find (const char *name); 111 static animation &find (const char *name);
107 112
108 void resize (int new_size); 113 void resize (int new_size);
109}; 114};
110 115
111typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 116typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
112 117
113extern animhash_t animhash; 118extern animhash_t animhash;
114extern std::vector<animation> animations; 119extern std::vector<animation> animations;
115 120
116#endif 121#endif

Diff Legend

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