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.21 by root, Wed Mar 14 04:12:27 2007 UTC vs.
Revision 1.23 by root, Thu Apr 12 14:18:04 2007 UTC

19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The maintainer of this code can be reached at <crossfire@schmorp.de> 22 * The maintainer of this code can be reached at <crossfire@schmorp.de>
23 */ 23 */
24
25 24
26#include <global.h> 25#include <global.h>
27#include <stdio.h> 26#include <stdio.h>
28 27
29#include "face.h" 28#include "face.h"
75} 74}
76 75
77faceidx 76faceidx
78face_find (const char *name, faceidx defidx) 77face_find (const char *name, faceidx defidx)
79{ 78{
79 if (!name)
80 return defidx;
81
80 facehash_t::iterator i = facehash.find (name); 82 facehash_t::iterator i = facehash.find (name);
81 83
82 return i == facehash.end () 84 return i == facehash.end ()
83 ? defidx : i->second; 85 ? defidx : i->second;
84} 86}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines