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.15 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.24 by root, Thu Nov 8 19:43:24 2007 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 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
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your 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 GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#ifndef FACE_H__ 24#ifndef FACE_H__
26#define FACE_H__ 25#define FACE_H__
27 26
… …
45 * 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
46 * create a new face with that color. 45 * create a new face with that color.
47 */ 46 */
48struct faceinfo 47struct faceinfo
49{ 48{
49 faceinfo ()
50 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
51 {
52 }
53
50 shstr name; 54 shstr name;
51 facedata data32, data64; 55 std::string meta;
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 */
54 faceidx smooth; /* the smooth face for this face, or 0 */ 59 faceidx smooth; /* the smooth face for this face, or 0 */
60 uint8 type; // 0 normal face, otherwise other resource
55 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 61 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
56 uint8 visibility; 62 uint8 visibility;
57 uint8 magicmap; /* Color to show this in magic map */ 63 uint8 magicmap; /* Color to show this in magic map */
58 64
59 faceinfo () 65 facedata *data (int faceset) const;
60 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
61 { }
62}; 66};
67
68inline void
69object_freezer::put (keyword k, faceinfo *v)
70{
71 put (k, v ? &v->name : (const char *)0);
72}
63 73
64typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 74typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
65 75
66extern facehash_t facehash; 76extern facehash_t facehash;
67extern std::vector<faceinfo> faces; 77extern std::vector<faceinfo> faces;
… …
88 98
89typedef uint16 animidx; 99typedef uint16 animidx;
90 100
91struct animation 101struct animation
92{ 102{
103 faceidx *faces; /* The different animations */
104 int num_animations; /* How many different faces to animate */
105 sint8 facings; /* How many facings (1,2,4,8) */
106 animidx number;
93 shstr name; /* Name of the animation sequence */ 107 shstr name; /* Name of the animation sequence */
94 animidx number;
95 uint8 num_animations; /* How many different faces to animate */
96 uint8 facings; /* How many facings (1,2,4,8) */
97 faceidx *faces; /* The different animations */
98 108
99 static animation &create (const char *name, uint8 frames, uint8 facings = 1); 109 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
100 static animation &find (const char *name); 110 static animation &find (const char *name);
101 111
102 void resize (int new_size); 112 void resize (int new_size);

Diff Legend

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