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.14 by root, Thu Apr 12 14:18:05 2007 UTC vs.
Revision 1.19 by root, Thu Jul 12 08:40:14 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 <crossfire@schmorp.de>
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>
… …
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 shstr name; 49 shstr name;
50 facedata data32, data64; 50 std::string meta;
51 facedata data32, data64; // either 32/64 face or data32 == generic resource
51 faceidx number; /* This is the image id. It should be the */ 52 faceidx number; /* This is the image id. It should be the */
52 /* same value as its position in the array */ 53 /* same value as its position in the array */
53 faceidx smooth; /* the smooth face for this face, or 0 */ 54 faceidx smooth; /* the smooth face for this face, or 0 */
55 uint8 type; // 0 normal face, otherwise other resource
54 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 56 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
55 uint8 visibility; 57 uint8 visibility;
56 uint8 magicmap; /* Color to show this in magic map */ 58 uint8 magicmap; /* Color to show this in magic map */
57 59
58 faceinfo () 60 faceinfo ()
59 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0) 61 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
60 { } 62 { }
61}; 63};
64
65inline void
66object_freezer::put (keyword k, faceinfo *v)
67{
68 put (k, v ? &v->name : (const char *)0);
69}
62 70
63typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 71typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
64 72
65extern facehash_t facehash; 73extern facehash_t facehash;
66extern std::vector<faceinfo> faces; 74extern std::vector<faceinfo> faces;

Diff Legend

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