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.26 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.32 by root, Sat Jan 16 00:08:33 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1994,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * 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>
22 */ 21 */
23 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>
29 28
30#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
31#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
32 31
33typedef uint16 faceidx; 32typedef uint16 faceidx;
34 33
35extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face;
36 35
37struct facedata 36struct facedata
38{ 37{
39 std::string data; 38 std::string data;
40 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
41
42 facedata ()
43 : chksum_len (0)
44 { }
41}; 45};
42 46
43/* 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
44 * 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
45 * create a new face with that color. 49 * create a new face with that color.
… …
64 68
65 facedata *data (int faceset) const; 69 facedata *data (int faceset) const;
66}; 70};
67 71
68inline void 72inline void
69object_freezer::put (keyword k, faceinfo *v) 73object_freezer::put (const keyword_string k, faceinfo *v)
70{ 74{
71 put (k, v ? &v->name : (const char *)0); 75 if (expect_true (v))
76 put (k, v->name);
77 else
78 put (k);
72} 79}
73 80
74typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 81typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
75 82
76extern facehash_t facehash; 83extern facehash_t facehash;
… …
112 void resize (int new_size); 119 void resize (int new_size);
113}; 120};
114 121
115typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 122typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
116 123
117extern animhash_t animhash;
118extern std::vector<animation> animations; 124extern std::vector<animation> animations;
119 125
120#endif 126#endif
121 127

Diff Legend

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