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.20 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.29 by root, Thu Nov 8 19:43:23 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The maintainer of this code can be reached at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
25 23
26#include <global.h> 24#include <global.h>
27#include <stdio.h> 25#include <stdio.h>
28 26
29#include "face.h" 27#include "face.h"
… …
75} 73}
76 74
77faceidx 75faceidx
78face_find (const char *name, faceidx defidx) 76face_find (const char *name, faceidx defidx)
79{ 77{
78 if (!name)
79 return defidx;
80
80 facehash_t::iterator i = facehash.find (name); 81 facehash_t::iterator i = facehash.find (name);
81 82
82 return i == facehash.end () 83 return i == facehash.end ()
83 ? defidx : i->second; 84 ? defidx : i->second;
84} 85}
85 86
86faceinfo * 87faceinfo *
87face_info (faceidx idx) 88face_info (faceidx idx)
88{ 89{
90 assert (0 < (faceidx)-1); // faceidx must be unsigned
91
89 if (idx >= faces.size ()) 92 if (idx >= faces.size ())
90 return 0; 93 return 0;
91 94
92 return &faces [idx]; 95 return &faces [idx];
93} 96}
94 97
95facedata * 98facedata *
99faceinfo::data (int faceset) const
100{
101 return (facedata *)&(faceset && !type && data64.data.size () ? data64 : data32);
102}
103
104facedata *
96face_data (faceidx idx, int faceset) 105face_data (faceidx idx, int faceset)
97{ 106{
98 if (faceinfo *f = face_info (idx)) 107 if (faceinfo *f = face_info (idx))
99 return &(faceset ? f->data32 : f->data64); 108 return f->data (faceset);
100 109
101 return 0; 110 return 0;
102} 111}
103 112

Diff Legend

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