--- deliantra/server/socket/info.C	2006/08/29 08:01:38	1.2
+++ deliantra/server/socket/info.C	2006/09/03 00:18:43	1.4
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_sock_info_c =
- *   "$Id: info.C,v 1.2 2006/08/29 08:01:38 root Exp $";
+ *   "$Id: info.C,v 1.4 2006/09/03 00:18:43 root Exp $";
  */
 
 /*
@@ -117,12 +117,11 @@
 
     if (outputs->buf==NULL) return;
     if (outputs->count > 1) {
-        snprintf(tbuf,MAX_BUF, "%d times %s", outputs->count, outputs->buf);
+        snprintf(tbuf,MAX_BUF, "%d times %s", outputs->count, &outputs->buf);
         print_message(NDI_BLACK, pl, tbuf);
     } else
-        print_message(NDI_BLACK, pl, outputs->buf);
+        print_message(NDI_BLACK, pl, &outputs->buf);
 
-    free_string(outputs->buf);
     outputs->buf=NULL;
     outputs->first_update=0;	/* This way, it will be reused */
 }
@@ -171,9 +170,7 @@
 
             pl->contr->outputs[oldest].first_update = pticks;
             pl->contr->outputs[oldest].count = 1;
-            if (pl->contr->outputs[oldest].buf!=NULL)
-                free_string(pl->contr->outputs[oldest].buf);
-            pl->contr->outputs[oldest].buf = add_string(buf);
+            pl->contr->outputs[oldest].buf = buf;
         }
     }
 }
@@ -379,7 +376,7 @@
             if(op==NULL) break;
 
             sprintf (obuf, "Range: %s (%s)", query_base_name(op, 0), 
-                     op->race ? op->race : "nothing");
+                     op->race ? (const char *)op->race : "nothing");
             }
             break;
 
@@ -388,22 +385,19 @@
                 if (pl->casting_time > -1) {
                     if (pl->casting_time == 0)
                         sprintf(obuf,"Range: Holding spell (%s)",
-                                pl->spell->name);
+                                (const char *)pl->spell->name);
                     else
                         sprintf(obuf,"Range: Casting spell (%s)",
-                                pl->spell->name);
+                                (const char *)pl->spell->name);
                 } else
-                    sprintf(obuf,"Range: spell (%s)", 
-                            pl->contr->ranges[range_magic]->name);
+                    sprintf(obuf,"Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
             } else
-                sprintf(obuf,"Range: spell (%s)", 
-                        pl->contr->ranges[range_magic]->name);
+                sprintf(obuf,"Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
             break;
 
         case range_misc:
-            sprintf(obuf,"Range: %s", 
-                    pl->contr->ranges[range_misc]?
-                    query_base_name(pl->contr->ranges[range_misc],0): "none");
+            sprintf(obuf,"Range: %s", pl->contr->ranges[range_misc] ?
+                    query_base_name(pl->contr->ranges[range_misc],0) : "none");
             break;
 
         /* range_scroll is only used for controlling golems.  If the
@@ -411,7 +405,7 @@
          */
         case range_golem:
             if (pl->contr->ranges[range_golem]!=NULL)
-                sprintf(obuf,"Range: golem (%s)",pl->contr->ranges[range_golem]->name);
+                sprintf(obuf,"Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
             else {
                 pl->contr->shoottype = range_none;
                 strcpy(obuf,"Range: nothing");
@@ -420,7 +414,7 @@
 
         case range_skill:
             sprintf(obuf,"Skill: %s", pl->chosen_skill!=NULL ?
-                    pl->chosen_skill->name : "none");
+                    (const char *)pl->chosen_skill->name : "none");
             break;
 
     case range_builder:
@@ -439,9 +433,9 @@
 {
     /* Eneq(@csd.uu.se): Let players define their own titles. */
     if (pl->contr->own_title[0]=='\0')
-        sprintf(buf,"Player: %s the %s",pl->name,pl->contr->title);
+        sprintf(buf,"Player: %s the %s",(const char *)pl->name,(const char *)pl->contr->title);
     else
-        sprintf(buf,"Player: %s %s",pl->name,pl->contr->own_title);
+        sprintf(buf,"Player: %s %s",(const char *)pl->name,(const char *)pl->contr->own_title);
 }