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.12 by root, Tue Apr 3 00:21:37 2007 UTC vs.
Revision 1.30 by root, Wed Nov 11 23:27:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 1994 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen
7 * 5 *
8 * This program 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 2 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, write to the Free Software 17 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 * <http://www.gnu.org/licenses/>.
21 * 19 *
22 * The author can be reached via e-mail to mark@pyramid.com 20 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 21 */
22
24#ifndef FACE_H__ 23#ifndef FACE_H__
25#define FACE_H__ 24#define FACE_H__
26 25
27#include <string> 26#include <string>
28#include <tr1/unordered_map> 27#include <tr1/unordered_map>
… …
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 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 facedata data32, data64; 54 std::string meta;
55 facedata data32, data64; // either 32/64 face or data32 == generic resource
51 faceidx number; /* This is the image id. It should be the */ 56 faceidx number; /* This is the image id. It should be the */
52 /* same value as its position in the array */ 57 /* same value as its position in the array */
53 faceidx smooth; /* the smooth face for this face, or 0 */ 58 faceidx smooth; /* the smooth face for this face, or 0 */
59 uint8 type; // 0 normal face, otherwise other resource
60 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
54 uint8 visibility; 61 uint8 visibility;
55 uint8 magicmap; /* Color to show this in magic map */ 62 uint8 magicmap; /* Color to show this in magic map */
56 63
57 faceinfo () 64 facedata *data (int faceset) const;
58 : number (0), smooth (0), visibility (0), magicmap (0)
59 { }
60}; 65};
61 66
67inline void
68object_freezer::put (const keyword_string k, faceinfo *v)
69{
70 if (expect_true (v))
71 put (k, v->name);
72 else
73 put (k);
74}
75
62typedef 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;
63 77
64extern facehash_t facehash; 78extern facehash_t facehash;
65extern std::vector<faceinfo> faces; 79extern std::vector<faceinfo> faces;
66 80
67/* 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
… …
82{ 96{
83 faceinfo *face; 97 faceinfo *face;
84 uint8 flags; 98 uint8 flags;
85}; 99};
86 100
101typedef uint16 animidx;
102
87struct animation 103struct animation
88{ 104{
105 faceidx *faces; /* The different animations */
106 int num_animations; /* How many different faces to animate */
107 sint8 facings; /* How many facings (1,2,4,8) */
108 animidx number;
89 shstr name; /* Name of the animation sequence */ 109 shstr name; /* Name of the animation sequence */
90 uint8 num_animations; /* How many different faces to animate */ 110
91 uint8 facings; /* How many facings (1,2,4,8) */ 111 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
92 faceidx *faces; /* The different animations */ 112 static animation &find (const char *name);
93 uint16 num; /* Where we are in the array */ 113
114 void resize (int new_size);
94}; 115};
116
117typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
118
119extern std::vector<animation> animations;
95 120
96#endif 121#endif
97 122

Diff Legend

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