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.29 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.40 by root, Mon Oct 29 23:55:53 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * 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,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23#ifndef FACE_H__ 23#ifndef FACE_H__
24#define FACE_H__ 24#define FACE_H__
25 25
26#include <string> 26#include <util.h>
27#include <tr1/unordered_map> 27#include <tr1/unordered_map>
28 28
29#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
30#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
31 31
32typedef uint16 faceidx; 32typedef uint16 faceidx;
33 33
34extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
35 35
36struct facedata 36struct facedata
37{ 37{
38 std::string data; 38 refcnt_buf data; // no need to be refcounted actually
39 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
41
42 facedata ()
43 : chksum_len (0)
44 { }
40}; 45};
41 46
42/* New face structure - this enforces the notion that data is face by 47/* New face structure - this enforces the notion that data is face by
43 * face only - you can not change the color of an item - you need to instead 48 * face only - you can not change the color of an item - you need to instead
44 * create a new face with that color. 49 * create a new face with that color.
45 */ 50 */
46struct faceinfo 51struct faceinfo
47{ 52{
48 faceinfo () 53 faceinfo ()
49 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0) 54 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1), meta_hv (0)
50 { 55 {
51 } 56 }
52 57
53 shstr name; 58 shstr name;
54 std::string meta; 59 HV *meta_hv; /* note, no destructor of copy constructor, must never be freed, but can be moved aorund */
55 facedata data32, data64; // either 32/64 face or data32 == generic resource 60 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
56 faceidx number; /* This is the image id. It should be the */ 61 faceidx number; /* This is the image id. It should be the */
57 /* same value as its position in the array */ 62 /* same value as its position in the array */
58 faceidx smooth; /* the smooth face for this face, or 0 */ 63 faceidx smooth; /* the smooth face for this face, or 0 */
59 uint8 type; // 0 normal face, otherwise other resource 64 uint8 type; // 0 normal face, otherwise other resource
60 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 65 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
61 uint8 visibility; 66 uint8 visibility;
62 uint8 magicmap; /* Color to show this in magic map */ 67 uint8 magicmap; /* Color to show this in magic map */
63 68
64 facedata *data (int faceset) const; 69 facedata *data (int faceset) const;
70
71 int refcnt; // reference count - 1
72 void ref () { ++refcnt; }
73 void unref ();
65}; 74};
66 75
67inline void 76inline void
68object_freezer::put (keyword k, faceinfo *v) 77object_freezer::put (const keyword_string k, faceinfo *v)
69{ 78{
70 put (k, v ? &v->name : (const char *)0); 79 if (expect_true (v))
80 put (k, v->name);
81 else
82 put (k);
71} 83}
72 84
73typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 85typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
74 86
75extern facehash_t facehash; 87extern facehash_t facehash;
… …
84 * If a face is not found, then defidx is returned. This can be useful 96 * If a face is not found, then defidx is returned. This can be useful
85 * if you want some default face used, or can be set to negative so that 97 * if you want some default face used, or can be set to negative so that
86 * it will be known that the face could not be found. 98 * it will be known that the face could not be found.
87 */ 99 */
88faceidx face_find (const char *name, faceidx defidx = 0); 100faceidx face_find (const char *name, faceidx defidx = 0);
101faceidx face_alloc ();
89faceinfo *face_info (faceidx idx); 102faceinfo *face_info (faceidx idx);
90facedata *face_data (faceidx idx, int faceset); 103facedata *face_data (faceidx idx, int faceset);
91 104
92struct MapLook 105struct MapLook
93{ 106{

Diff Legend

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