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.26 by root, Tue Jul 29 02:00:55 2008 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 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 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <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
… …
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 */
54 faceidx smooth; /* the smooth face for this face, or 0 */ 59 faceidx smooth; /* the smooth face for this face, or 0 */
55 uint8 type; // 0 normal face, 1 generic 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 (keyword k, faceinfo *v)
67{ 70{
68 put (k, v ? &v->name : (const char *)0); 71 put (k, v ? &v->name : (const char *)0);
69} 72}
70 73
71typedef 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> > > facehash_t;
72 75
73extern facehash_t facehash; 76extern facehash_t facehash;
74extern std::vector<faceinfo> faces; 77extern std::vector<faceinfo> faces;
75 78
76/* This returns an the face number of face 'name'. Number is constant 79/* This returns an the face number of face 'name'. Number is constant
… …
95 98
96typedef uint16 animidx; 99typedef uint16 animidx;
97 100
98struct animation 101struct animation
99{ 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;
100 shstr name; /* Name of the animation sequence */ 107 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 108
106 static animation &create (const char *name, uint8 frames, uint8 facings = 1); 109 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
107 static animation &find (const char *name); 110 static animation &find (const char *name);
108 111
109 void resize (int new_size); 112 void resize (int new_size);
110}; 113};
111 114
112typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 115typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
113 116
114extern animhash_t animhash; 117extern animhash_t animhash;
115extern std::vector<animation> animations; 118extern std::vector<animation> animations;
116 119
117#endif 120#endif

Diff Legend

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