--- deliantra/server/server/c_party.C 2006/08/29 08:01:37 1.2 +++ deliantra/server/server/c_party.C 2006/09/03 00:18:42 1.3 @@ -1,6 +1,6 @@ /* * static char *rcsid_c_party_c = - * "$Id: c_party.C,v 1.2 2006/08/29 08:01:37 root Exp $"; + * "$Id: c_party.C,v 1.3 2006/09/03 00:18:42 root Exp $"; */ /* @@ -183,7 +183,7 @@ op->contr->party_to_join = NULL; new_draw_info_format(NDI_UNIQUE, 0,op, "You have joined party: %s\n",joined_party->partyname); - snprintf( buf, MAX_BUF, "%s joins party %s", op->name, joined_party->partyname ); + snprintf( buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname ); send_party_message( op, buf ); op->contr->state = ST_PLAYING; return; @@ -308,7 +308,7 @@ } params += 4; currentparty = op->contr->party->partyname; - snprintf(buf,MAX_BUF-1, "[%s] %s says: %s", currentparty, op->name, params); + snprintf(buf,MAX_BUF-1, "[%s] %s says: %s", currentparty, &op->name, params); send_party_message(op,buf); new_draw_info_format(NDI_WHITE, 0,op,"[%s] You say: %s", currentparty, params); return 1; @@ -361,7 +361,7 @@ currentparty = op->contr->party->partyname; new_draw_info_format(NDI_UNIQUE, 0, op, "You leave party %s.",currentparty); - sprintf(buf,"%s leaves party %s.",op->name,currentparty); + sprintf(buf,"%s leaves party %s.",&op->name,currentparty); send_party_message(op,buf); op->contr->party=NULL; return 1; @@ -380,13 +380,13 @@ if (settings.set_title == TRUE) { if(pl->ob->contr->own_title[0]!='\0') sprintf(buf,"%3d %s the %s", - pl->ob->level,pl->ob->name,pl->ob->contr->own_title); + pl->ob->level,&pl->ob->name,pl->ob->contr->own_title); else sprintf(buf,"%3d %s the %s", - pl->ob->level,pl->ob->name,pl->ob->contr->title); + pl->ob->level,&pl->ob->name,pl->ob->contr->title); } else sprintf(buf,"%3d %s the %s", - pl->ob->level,pl->ob->name,pl->ob->contr->title); + pl->ob->level,&pl->ob->name,pl->ob->contr->title); new_draw_info(NDI_UNIQUE, 0,op,buf); } return 1; @@ -414,7 +414,7 @@ new_draw_info_format(NDI_UNIQUE, 0, op, "The password for party %s is %s", tmplist->partyname,tmplist->passwd); snprintf( buf, MAX_BUF, "Password for party %s is now %s, changed by %s", - tmplist->partyname, tmplist->passwd, op->name ); + tmplist->partyname, tmplist->passwd, &op->name ); send_party_message(op,buf); return 0; } @@ -475,7 +475,7 @@ op->contr->party = firstparty; new_draw_info_format(NDI_UNIQUE, 0, op, "You have joined party: %s",firstparty->partyname); - snprintf( buf, MAX_BUF, "%s joins party %s", op->name, firstparty->partyname ); + snprintf( buf, MAX_BUF, "%s joins party %s", &op->name, firstparty->partyname ); send_party_message( op, buf ); return 0; } @@ -500,7 +500,7 @@ new_draw_info_format(NDI_UNIQUE, 0, op, "You have joined party: %s",tmpparty->partyname); op->contr->party = tmpparty; - snprintf( buf, MAX_BUF, "%s joins party %s", op->name, tmpparty->partyname ); + snprintf( buf, MAX_BUF, "%s joins party %s", &op->name, tmpparty->partyname ); send_party_message( op, buf ); return 0; }