| … | |
… | |
| 42 | |
42 | |
| 43 | /* New face structure - this enforces the notion that data is face by |
43 | /* 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 |
44 | * face only - you can not change the color of an item - you need to instead |
| 45 | * create a new face with that color. |
45 | * create a new face with that color. |
| 46 | */ |
46 | */ |
| 47 | struct faceinfo : zero_initialised |
47 | struct faceinfo |
| 48 | { |
48 | { |
| 49 | shstr name; |
49 | shstr name; |
| 50 | facedata data32, data64; |
50 | facedata data32, data64; |
| 51 | faceidx number; /* This is the image id. It should be the */ |
51 | faceidx number; /* This is the image id. It should be the */ |
| 52 | /* same value as its position in the array */ |
52 | /* same value as its position in the array */ |
| 53 | faceidx smooth; /* the smooth face for this face, or 0 */ |
53 | faceidx smooth; /* the smooth face for this face, or 0 */ |
| 54 | uint8 visibility; |
54 | uint8 visibility; |
| 55 | uint8 magicmap; /* Color to show this in magic map */ |
55 | uint8 magicmap; /* Color to show this in magic map */ |
|
|
56 | |
|
|
57 | faceinfo () |
|
|
58 | : number (0), smooth (0), visibility (0), magicmap (0) |
|
|
59 | { } |
| 56 | }; |
60 | }; |
| 57 | |
61 | |
| 58 | typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; |
62 | typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; |
| 59 | |
63 | |
| 60 | extern facehash_t facehash; |
64 | extern facehash_t facehash; |
