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.22 by root, Mon Oct 1 00:44:44 2007 UTC vs.
Revision 1.30 by root, Wed Nov 11 23:27:57 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,2009 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 6 * 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 7 * 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 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 16 * 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/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * 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>
22 */ 21 */
23 22
24#ifndef FACE_H__ 23#ifndef FACE_H__
25#define FACE_H__ 24#define FACE_H__
26 25
… …
42 41
43/* New face structure - this enforces the notion that data is face by 42/* New face structure - this enforces the notion that data is face by
44 * face only - you can not change the color of an item - you need to instead 43 * face only - you can not change the color of an item - you need to instead
45 * create a new face with that color. 44 * create a new face with that color.
46 */ 45 */
47struct faceinfo : zero_initialised 46struct faceinfo
48{ 47{
48 faceinfo ()
49 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
50 {
51 }
52
49 shstr name; 53 shstr name;
50 std::string meta; 54 std::string meta;
51 facedata data32, data64; // either 32/64 face or data32 == generic resource 55 facedata data32, data64; // either 32/64 face or data32 == generic resource
52 faceidx number; /* This is the image id. It should be the */ 56 faceidx number; /* This is the image id. It should be the */
53 /* same value as its position in the array */ 57 /* same value as its position in the array */
… …
59 63
60 facedata *data (int faceset) const; 64 facedata *data (int faceset) const;
61}; 65};
62 66
63inline void 67inline void
64object_freezer::put (keyword k, faceinfo *v) 68object_freezer::put (const keyword_string k, faceinfo *v)
65{ 69{
66 put (k, v ? &v->name : (const char *)0); 70 if (expect_true (v))
71 put (k, v->name);
72 else
73 put (k);
67} 74}
68 75
69typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 76typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
70 77
71extern facehash_t facehash; 78extern facehash_t facehash;
72extern std::vector<faceinfo> faces; 79extern std::vector<faceinfo> faces;
73 80
74/* This returns an the face number of face 'name'. Number is constant 81/* This returns an the face number of face 'name'. Number is constant
… …
105 static animation &find (const char *name); 112 static animation &find (const char *name);
106 113
107 void resize (int new_size); 114 void resize (int new_size);
108}; 115};
109 116
110typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 117typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
111 118
112extern animhash_t animhash;
113extern std::vector<animation> animations; 119extern std::vector<animation> animations;
114 120
115#endif 121#endif
116 122

Diff Legend

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