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.32 by root, Tue Nov 3 23:44:20 2009 UTC vs.
Revision 1.33 by root, Thu Nov 19 04:29:08 2009 UTC

28 28
29faceidx blank_face, empty_face; 29faceidx blank_face, empty_face;
30 30
31facehash_t facehash; 31facehash_t facehash;
32std::vector<faceinfo> faces; 32std::vector<faceinfo> faces;
33
34/* the only thing this table is used for now is to
35 * translate the colorname in the magicmap field of the
36 * face into a numeric index that is then sent to the
37 * client for magic map commands. The order of this table
38 * must match that of the NDI colors in include/newclient.h.
39 */
40static const char *const colorname[] = {
41 "black", /* 0 */
42 "white", /* 1 */
43 "blue", /* 2 */
44 "red", /* 3 */
45 "orange", /* 4 */
46 "light_blue", /* 5 */
47 "dark_orange", /* 6 */
48 "green", /* 7 */
49 "light_green", /* 8 */
50 "grey", /* 9 */
51 "brown", /* 10 */
52 "yellow", /* 11 */
53 "khaki" /* 12 */
54};
55
56/*
57 * Returns the matching color in the coloralias if found,
58 * 0 otherwise. Note that 0 will actually be black, so there is no
59 * way the calling function can tell if an error occurred or not
60 */
61static uint8
62find_color (const char *name)
63{
64 uint8 i;
65
66 for (i = 0; i < sizeof (colorname) / sizeof (*colorname); i++)
67 if (!strcmp (name, colorname[i]))
68 return i;
69
70 LOG (llevError, "Unknown color: %s\n", name);
71 return 0;
72}
73 33
74faceidx 34faceidx
75face_find (const char *name, faceidx defidx) 35face_find (const char *name, faceidx defidx)
76{ 36{
77 if (!name) 37 if (!name)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines