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.21 by root, Sat Sep 15 15:58:06 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 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
23 24
24#ifndef FACE_H__ 25#ifndef FACE_H__
25#define FACE_H__ 26#define FACE_H__
26 27
… …
44 * 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
45 * create a new face with that color. 46 * create a new face with that color.
46 */ 47 */
47struct faceinfo 48struct faceinfo
48{ 49{
50 faceinfo ()
51 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
52 {
53 }
54
49 shstr name; 55 shstr name;
50 std::string meta; 56 std::string meta;
51 facedata data32, data64; // either 32/64 face or data32 == generic resource 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 */
… …
55 uint8 type; // 0 normal face, otherwise other resource 61 uint8 type; // 0 normal face, otherwise other resource
56 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 62 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
57 uint8 visibility; 63 uint8 visibility;
58 uint8 magicmap; /* Color to show this in magic map */ 64 uint8 magicmap; /* Color to show this in magic map */
59 65
60 faceinfo ()
61 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
62 { }
63
64 facedata *data (int faceset) const; 66 facedata *data (int faceset) const;
65}; 67};
66 68
67inline void 69inline void
68object_freezer::put (keyword k, faceinfo *v) 70object_freezer::put (keyword k, faceinfo *v)
69{ 71{
70 put (k, v ? &v->name : (const char *)0); 72 put (k, v ? &v->name : (const char *)0);
71} 73}
72 74
73typedef 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;
74 76
75extern facehash_t facehash; 77extern facehash_t facehash;
76extern std::vector<faceinfo> faces; 78extern std::vector<faceinfo> faces;
77 79
78/* 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
… …
109 static animation &find (const char *name); 111 static animation &find (const char *name);
110 112
111 void resize (int new_size); 113 void resize (int new_size);
112}; 114};
113 115
114typedef 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;
115 117
116extern animhash_t animhash; 118extern animhash_t animhash;
117extern std::vector<animation> animations; 119extern std::vector<animation> animations;
118 120
119#endif 121#endif

Diff Legend

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