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.12 by root, Tue Apr 3 00:21:37 2007 UTC vs.
Revision 1.14 by root, Thu Apr 12 14:18:05 2007 UTC

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 smoothlevel; // smoothlevel is per-face in 2.x servers
54 uint8 visibility; 55 uint8 visibility;
55 uint8 magicmap; /* Color to show this in magic map */ 56 uint8 magicmap; /* Color to show this in magic map */
56 57
57 faceinfo () 58 faceinfo ()
58 : number (0), smooth (0), visibility (0), magicmap (0) 59 : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
59 { } 60 { }
60}; 61};
61 62
62typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 63typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
63 64
82{ 83{
83 faceinfo *face; 84 faceinfo *face;
84 uint8 flags; 85 uint8 flags;
85}; 86};
86 87
88typedef uint16 animidx;
89
87struct animation 90struct animation
88{ 91{
89 shstr name; /* Name of the animation sequence */ 92 shstr name; /* Name of the animation sequence */
93 animidx number;
90 uint8 num_animations; /* How many different faces to animate */ 94 uint8 num_animations; /* How many different faces to animate */
91 uint8 facings; /* How many facings (1,2,4,8) */ 95 uint8 facings; /* How many facings (1,2,4,8) */
92 faceidx *faces; /* The different animations */ 96 faceidx *faces; /* The different animations */
93 uint16 num; /* Where we are in the array */ 97
98 static animation &create (const char *name, uint8 frames, uint8 facings = 1);
99 static animation &find (const char *name);
100
101 void resize (int new_size);
94}; 102};
103
104typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t;
105
106extern animhash_t animhash;
107extern std::vector<animation> animations;
95 108
96#endif 109#endif
97 110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines