--- deliantra/server/common/image.C	2009/11/03 23:44:20	1.32
+++ deliantra/server/common/image.C	2010/04/14 02:31:23	1.35
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -26,51 +26,11 @@
 #include "face.h"
 #include "crc.h"
 
-faceidx blank_face, empty_face;
+faceidx blank_face, empty_face, magicmouth_face;
 
 facehash_t facehash;
 std::vector<faceinfo> faces;
 
-/* the only thing this table is used for now is to
- * translate the colorname in the magicmap field of the
- * face into a numeric index that is then sent to the
- * client for magic map commands.  The order of this table
- * must match that of the NDI colors in include/newclient.h.
- */
-static const char *const colorname[] = {
-  "black",                      /* 0  */
-  "white",                      /* 1  */
-  "blue",                       /* 2  */
-  "red",                        /* 3  */
-  "orange",                     /* 4  */
-  "light_blue",                 /* 5  */
-  "dark_orange",                /* 6  */
-  "green",                      /* 7  */
-  "light_green",                /* 8  */
-  "grey",                       /* 9  */
-  "brown",                      /* 10 */
-  "yellow",                     /* 11 */
-  "khaki"                       /* 12 */
-};
-
-/*
- * 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)
-{
-  uint8 i;
-
-  for (i = 0; i < sizeof (colorname) / sizeof (*colorname); i++)
-    if (!strcmp (name, colorname[i]))
-      return i;
-
-  LOG (llevError, "Unknown color: %s\n", name);
-  return 0;
-}
-
 faceidx
 face_find (const char *name, faceidx defidx)
 {