--- deliantra/server/common/image.C 2007/01/06 14:42:28 1.10 +++ deliantra/server/common/image.C 2007/01/15 21:06:18 1.12 @@ -1,26 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The maintainer of this code can be reached at -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The maintainer of this code can be reached at + */ #include @@ -114,6 +114,7 @@ { return strcmp (a->name, b->name); } + static int compar_smooth (const struct smoothing *a, const struct smoothing *b) { @@ -124,13 +125,11 @@ return 0; } - /* * Returns the matching color in the coloralias if found, * 0 otherwise. Note that 0 will actually be black, so there is no * way the calling function can tell if an error occurred or not */ - static uint8 find_color (const char *name) { @@ -146,7 +145,6 @@ /* This reads the lib/faces file, getting color and visibility information. * it is called by ReadBmapNames. */ - static void ReadFaceData (void) { @@ -219,6 +217,7 @@ else LOG (llevDebug, "Got unknown line in faces file: %s\n", buf); } + LOG (llevDebug, "done\n"); fclose (fp); } @@ -228,7 +227,6 @@ * independent (ie, what display the person is on will not make a * difference.) */ - void ReadBmapNames (void) {