--- deliantra/server/socket/info.C	2010/03/26 00:59:22	1.59
+++ deliantra/server/socket/info.C	2012/11/17 06:05:33	1.67
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 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
  * Free Software Foundation, either version 3 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 Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -41,7 +41,7 @@
 #include <cstring>
 
 /**
- * Draws a normal message on the client.  It is pretty 
+ * Draws a normal message on the client.  It is pretty
  * much the same thing as the draw_info above, but takes a color
  * parameter.  the esrv_drawinfo functions should probably be
  * replaced with this, just using black as the color.
@@ -95,10 +95,10 @@
       if (len == buf->len && !memcmp (msg, buf->msg, len))
         {
           // found matching buf, see if expired
-          if (buf->expire <= pticks || !buf->count)
+          if (buf->expire <= server_tick || !buf->count)
             {
               // yes, take over matching buffer, print
-              buf->expire = pticks + pl->outputs_sync;
+              buf->expire = server_tick + pl->outputs_sync;
               buf->count  = pl->outputs_count;
 
               return false;
@@ -114,7 +114,7 @@
     }
 
   // new message, evoke oldest buffer
-  lru->expire = pticks + pl->outputs_sync;
+  lru->expire = server_tick + pl->outputs_sync;
   lru->count  = pl->outputs_count;
   lru->len    = len;
   memcpy (lru->msg, msg, len);
@@ -341,7 +341,6 @@
 void
 draw_magic_map (object *pl)
 {
-  char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
   int xmin, xmax, ymin, ymax;
 
   if (pl->type != PLAYER)
@@ -350,6 +349,9 @@
       return;
     }
 
+  char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
+  assert(("Out of memory!", map_mark != NULL));
+
   /* First, we figure out what spaces are 'reachable' by the player */
   magic_mapping_mark (pl, map_mark, 3);