--- deliantra/server/socket/info.C 2006/08/31 17:54:15 1.3 +++ 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.3 2006/08/31 17:54:15 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; } } } @@ -393,17 +390,14 @@ sprintf(obuf,"Range: Casting spell (%s)", (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");