ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/image.C
(Generate patch)

Comparing deliantra/server/common/image.C (file contents):
Revision 1.27 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.28 by root, Tue Jul 24 04:55:33 2007 UTC

94 94
95 return &faces [idx]; 95 return &faces [idx];
96} 96}
97 97
98facedata * 98facedata *
99faceinfo::data (int faceset) const
100{
101 return (facedata *)&(faceset && !type && data64.data.size () ? data64 : data32);
102}
103
104facedata *
99face_data (faceidx idx, int faceset) 105face_data (faceidx idx, int faceset)
100{ 106{
101 if (faceinfo *f = face_info (idx)) 107 if (faceinfo *f = face_info (idx))
102 return &(faceset && !f->type && f->data64.data.size () ? f->data64 : f->data32); 108 return f->data (faceset);
103 109
104 return 0; 110 return 0;
105} 111}
106 112

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines