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.17 by root, Sun Jul 1 04:08:14 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to mark@pyramid.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24
24#ifndef FACE_H__ 25#ifndef FACE_H__
25#define FACE_H__ 26#define FACE_H__
26 27
27#include <string> 28#include <string>
28#include <tr1/unordered_map> 29#include <tr1/unordered_map>
… …
45 * create a new face with that color. 46 * create a new face with that color.
46 */ 47 */
47struct faceinfo 48struct faceinfo
48{ 49{
49 shstr name; 50 shstr name;
50 facedata data32, data64; 51 std::string meta;
52 facedata data32, data64; // either 32/64 face or data32 == generic resource
51 faceidx number; /* This is the image id. It should be the */ 53 faceidx number; /* This is the image id. It should be the */
52 /* same value as its position in the array */ 54 /* same value as its position in the array */
53 faceidx smooth; /* the smooth face for this face, or 0 */ 55 faceidx smooth; /* the smooth face for this face, or 0 */
56 uint8 type; // 0 normal face, 1 generic resource
57 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
54 uint8 visibility; 58 uint8 visibility;
55 uint8 magicmap; /* Color to show this in magic map */ 59 uint8 magicmap; /* Color to show this in magic map */
56 60
57 faceinfo () 61 faceinfo ()
58 : number (0), smooth (0), visibility (0), magicmap (0) 62 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
59 { } 63 { }
60}; 64};
65
66inline void
67object_freezer::put (keyword k, faceinfo *v)
68{
69 put (k, v ? &v->name : (const char *)0);
70}
61 71
62typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 72typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
63 73
64extern facehash_t facehash; 74extern facehash_t facehash;
65extern std::vector<faceinfo> faces; 75extern std::vector<faceinfo> faces;
… …
82{ 92{
83 faceinfo *face; 93 faceinfo *face;
84 uint8 flags; 94 uint8 flags;
85}; 95};
86 96
97typedef uint16 animidx;
98
87struct animation 99struct animation
88{ 100{
89 shstr name; /* Name of the animation sequence */ 101 shstr name; /* Name of the animation sequence */
102 animidx number;
90 uint8 num_animations; /* How many different faces to animate */ 103 uint8 num_animations; /* How many different faces to animate */
91 uint8 facings; /* How many facings (1,2,4,8) */ 104 uint8 facings; /* How many facings (1,2,4,8) */
92 faceidx *faces; /* The different animations */ 105 faceidx *faces; /* The different animations */
93 uint16 num; /* Where we are in the array */ 106
107 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
108 static animation &find (const char *name);
109
110 void resize (int new_size);
94}; 111};
112
113typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t;
114
115extern animhash_t animhash;
116extern std::vector<animation> animations;
95 117
96#endif 118#endif
97 119

Diff Legend

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