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

Diff Legend

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