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.27 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.38 by root, Tue Jan 3 11:25:31 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 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 * 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 it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * 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
10 * 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
11 * option) any later version. 9 * option) any later version.
… …
23 */ 21 */
24 22
25#ifndef FACE_H__ 23#ifndef FACE_H__
26#define FACE_H__ 24#define FACE_H__
27 25
28#include <string> 26#include <util.h>
29#include <tr1/unordered_map> 27#include <tr1/unordered_map>
30 28
31#define CHKSUM_SIZE 6 29#define CHKSUM_MAXLEN 15
32#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 10000 // stupid gcfclient artificially limits
33 31
34typedef uint16 faceidx; 32typedef uint16 faceidx;
35 33
36extern faceidx blank_face, empty_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
37 35
38struct facedata 36struct facedata
39{ 37{
40 std::string data; 38 refcnt_buf data; // no need to be refcounted actually
41 uint8 chksum[CHKSUM_SIZE]; 39 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len;
41
42 facedata ()
43 : chksum_len (0)
44 { }
42}; 45};
43 46
44/* 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
45 * 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
46 * create a new face with that color. 49 * create a new face with that color.
47 */ 50 */
48struct faceinfo 51struct faceinfo
49{ 52{
50 faceinfo () 53 faceinfo ()
51 : 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)
52 { 55 {
53 } 56 }
54 57
55 shstr name; 58 shstr name;
56 std::string meta; 59 std::string meta;
57 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
58 faceidx number; /* This is the image id. It should be the */ 61 faceidx number; /* This is the image id. It should be the */
59 /* same value as its position in the array */ 62 /* same value as its position in the array */
60 faceidx smooth; /* the smooth face for this face, or 0 */ 63 faceidx smooth; /* the smooth face for this face, or 0 */
61 uint8 type; // 0 normal face, otherwise other resource 64 uint8 type; // 0 normal face, otherwise other resource
62 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers 65 uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
63 uint8 visibility; 66 uint8 visibility;
64 uint8 magicmap; /* Color to show this in magic map */ 67 uint8 magicmap; /* Color to show this in magic map */
65 68
66 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 ();
67}; 74};
68 75
69inline void 76inline void
70object_freezer::put (keyword k, faceinfo *v) 77object_freezer::put (const keyword_string k, faceinfo *v)
71{ 78{
72 put (k, v ? &v->name : (const char *)0); 79 if (expect_true (v))
80 put (k, v->name);
81 else
82 put (k);
73} 83}
74 84
75typedef 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;
76 86
77extern facehash_t facehash; 87extern facehash_t facehash;
… …
86 * 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
87 * 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
88 * it will be known that the face could not be found. 98 * it will be known that the face could not be found.
89 */ 99 */
90faceidx face_find (const char *name, faceidx defidx = 0); 100faceidx face_find (const char *name, faceidx defidx = 0);
101faceidx face_alloc ();
91faceinfo *face_info (faceidx idx); 102faceinfo *face_info (faceidx idx);
92facedata *face_data (faceidx idx, int faceset); 103facedata *face_data (faceidx idx, int faceset);
93 104
94struct MapLook 105struct MapLook
95{ 106{
… …
113 void resize (int new_size); 124 void resize (int new_size);
114}; 125};
115 126
116typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 127typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
117 128
118extern animhash_t animhash;
119extern std::vector<animation> animations; 129extern std::vector<animation> animations;
120 130
121#endif 131#endif
122 132

Diff Legend

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