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.26 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.38 by root, Tue Jan 3 11:23:41 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include <global.h> 23#include <global.h>
25#include <stdio.h> 24#include <stdio.h>
26 25
27#include "face.h" 26#include "face.h"
28#include "crc.h" 27#include "crc.h"
29 28
30faceidx blank_face, empty_face; 29faceidx blank_face, empty_face, magicmouth_face;
31 30
32facehash_t facehash; 31facehash_t facehash;
33std::vector<faceinfo> faces; 32std::vector<faceinfo> faces;
34 33
35/* the only thing this table is used for now is to 34static std::vector<faceidx> faces_free;
36 * translate the colorname in the magicmap field of the
37 * face into a numeric index that is then sent to the
38 * client for magic map commands. The order of this table
39 * must match that of the NDI colors in include/newclient.h.
40 */
41static const char *const colorname[] = {
42 "black", /* 0 */
43 "white", /* 1 */
44 "blue", /* 2 */
45 "red", /* 3 */
46 "orange", /* 4 */
47 "light_blue", /* 5 */
48 "dark_orange", /* 6 */
49 "green", /* 7 */
50 "light_green", /* 8 */
51 "grey", /* 9 */
52 "brown", /* 10 */
53 "yellow", /* 11 */
54 "khaki" /* 12 */
55};
56 35
57/* 36faceidx face_alloc ()
58 * Returns the matching color in the coloralias if found,
59 * 0 otherwise. Note that 0 will actually be black, so there is no
60 * way the calling function can tell if an error occurred or not
61 */
62static uint8
63find_color (const char *name)
64{ 37{
65 uint8 i; 38 faceidx idx;
66 39
67 for (i = 0; i < sizeof (colorname) / sizeof (*colorname); i++) 40 if (faces_freelist.empty ())
68 if (!strcmp (name, colorname[i])) 41 {
69 return i; 42 idx = faces_free.back ();
43 faces_free.pop_back ();
44 }
45 else
46 {
47 idx = faces.size ();
70 48
71 LOG (llevError, "Unknown color: %s\n", name); 49 if (!idx) // skip index 0
50 idx = 1;
51
52 faces.resize (idx + 1);
53 }
54
72 return 0; 55 return idx;
56}
57
58faceinfo::unref ()
59{
60 if (--refcnt)
61 return;
62
63 refcnt = 1;
64
73} 65}
74 66
75faceidx 67faceidx
76face_find (const char *name, faceidx defidx) 68face_find (const char *name, faceidx defidx)
77{ 69{
… …
94 86
95 return &faces [idx]; 87 return &faces [idx];
96} 88}
97 89
98facedata * 90facedata *
91faceinfo::data (int faceset) const
92{
93 if (!face [faceset].data.size ())
94 faceset = 0;
95
96 return (facedata *)(face + faceset);
97}
98
99facedata *
99face_data (faceidx idx, int faceset) 100face_data (faceidx idx, int faceset)
100{ 101{
101 if (faceinfo *f = face_info (idx)) 102 if (faceinfo *f = face_info (idx))
102 return &(faceset && !f->type ? f->data64 : f->data32); 103 return f->data (faceset);
103 104
104 return 0; 105 return 0;
105} 106}
106 107

Diff Legend

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