--- deliantra/server/socket/info.C	2009/11/04 14:45:30	1.54
+++ deliantra/server/socket/info.C	2010/03/26 00:59:22	1.59
@@ -2,8 +2,8 @@
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * 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
@@ -53,21 +53,6 @@
 }
 
 /**
- * Draws   an extended message on the client. 
- * ns      the socket to send message to
- * color   color informations (used mainly if client does not support message type)
- * type,
- * subtype type and subtype of text message
- * intro   Intro message to send with main message if client does not support the message type
- * message The main message
- */
-static void
-esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
-{
-  ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
-}
-
-/**
  * Frontend for esrv_print_msg
  * \param colr message color
  * \param pl player to send to. Can be NULL
@@ -186,60 +171,9 @@
   va_end (ap);
 }
 
-void
-draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
-{
-
-  if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
-    return;
-
-  if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
-    {
-      char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
-
-      if (buf == NULL)
-        LOG (llevError, "info::draw_ext_info -> Out of memory!");
-      else
-        {
-          strcpy (buf, oldmessage == NULL ? message : oldmessage);
-          strip_media_tag (buf);
-          new_draw_info (flags, pri, pl, buf);
-          free (buf);
-        }
-    }
-  else
-    esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
-}
-
-void
-draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
-{
-  va_list ap;
-  va_start (ap, new_format);
-
-  if (!pl || !pl->is_player ())
-    return;
-
-  // TODO: just assume, and rip out?
-  if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
-    {
-      LOG (llevDebug, "Non supported extension text type for client.\n");
-      new_draw_info (flags, pri, pl, vformat (old_format, ap));
-    }
-  else
-    {
-      char *buf = vformat (new_format, ap);
-      strip_media_tag (buf);
-      esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
-    }
-
-  va_end (ap);
-}
-
 /**
  * Writes to everyone on the map *except* op.  This is useful for emotions.
  */
-
 void
 new_info_map_except (int color, maptile * map, object *op, const char *str)
 {
@@ -249,17 +183,6 @@
 }
 
 /**
- * Writes to everyone on the map except op1 and op2
- */
-void
-new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
-{
-  for_all_players (pl)
-    if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
-      new_draw_info (color, 0, pl->ob, str);
-}
-
-/**
  * Writes to everyone on the specified map
  */
 void
@@ -369,7 +292,7 @@
  * strength is an initial strength*2 rectangular area that we automatically
  * see in/penetrate through.
  */
-void
+static void
 magic_mapping_mark (object *pl, char *map_mark, int strength)
 {
   for (int x = -strength; x < strength; x++)