--- deliantra/server/server/c_party.C 2007/11/08 19:43:26 1.21 +++ deliantra/server/server/c_party.C 2008/04/24 04:40:31 1.22 @@ -25,8 +25,7 @@ #include #include -static partylist *firstparty = NULL; /* Keeps track of first party in list */ -static partylist *lastparty = NULL; /*Keeps track of last party in list */ +static partylist *firstparty; partylist * get_firstparty (void) @@ -34,36 +33,9 @@ return firstparty; } -void remove_party (partylist *target_party); - -/* Forms the party struct for a party called 'params'. it is the responsibility - * of the caller to ensure that the name is unique, and that it is placed in the - * main party list correctly */ -static partylist * -form_party (object *op, const char *params) -{ - partylist *newparty; - - newparty = (partylist *) malloc (sizeof (partylist)); - newparty->partyname = strdup (params); - newparty->total_exp = 0; - newparty->kills = 0; - newparty->passwd[0] = '\0'; - newparty->next = NULL; - newparty->partyleader = strdup (op->name); - new_draw_info_format (NDI_UNIQUE, 0, op, "You have formed party: %s", newparty->partyname); - op->contr->party = newparty; - - return newparty; -} - void remove_party (partylist *target_party) { - partylist *tmpparty; - partylist *previousparty; - partylist *nextparty; - if (firstparty == NULL) { LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname); @@ -74,55 +46,20 @@ if (pl->party == target_party) pl->party = NULL; - /* special case-ism for parties at the beginning and end of the list */ - if (target_party == firstparty) - { - firstparty = firstparty->next; - - if (target_party->partyleader) - free (target_party->partyleader); + partylist **prevlink = &firstparty; - if (target_party->partyname) - free (target_party->partyname); - - free (target_party); - return; - } - else if (target_party == lastparty) - { - for (tmpparty = firstparty; tmpparty->next != NULL; tmpparty = tmpparty->next) - { - if (tmpparty->next == target_party) - { - lastparty = tmpparty; - - if (target_party->partyleader) - free (target_party->partyleader); - - if (target_party->partyname) - free (target_party->partyname); - - free (target_party); - lastparty->next = NULL; - return; - } - } - } - for (tmpparty = firstparty; tmpparty->next != NULL; tmpparty = tmpparty->next) - if (tmpparty->next == target_party) + for (partylist *p = firstparty; p; p = p->next) + if (p->next == target_party) { - previousparty = tmpparty; - nextparty = tmpparty->next->next; - /* this should be safe, because we already dealt with the lastparty case */ - - previousparty->next = nextparty; - if (target_party->partyleader) - free (target_party->partyleader); - if (target_party->partyname) - free (target_party->partyname); - free (target_party); - return; + prevlink = &p->next; + break; } + + *prevlink = target_party->next; + + free (target_party->partyleader); + free (target_party->partyname); + sfree (target_party); } /* Remove unused parties, this could be made to scale a lot better. */ @@ -135,6 +72,7 @@ if (!firstparty) return; /* we can't obsolete parties if there aren't any */ + for (party = firstparty; party != NULL; party = next) { next = party->next; @@ -192,6 +130,14 @@ } void +send_party_message (object *op, const char *msg) +{ + for_all_players (pl) + if (pl->ob->contr->party == op->contr->party && pl->ob != op) + new_draw_info (NDI_WHITE, 0, pl->ob, msg); +} + +void receive_party_password (object *op, char k) { @@ -217,14 +163,6 @@ } } -void -send_party_message (object *op, char *msg) -{ - for_all_players (pl) - if (pl->ob->contr->party == op->contr->party && pl->ob != op) - new_draw_info (NDI_WHITE, 0, pl->ob, msg); -} - int command_gsay (object *op, char *params) { @@ -242,345 +180,204 @@ int command_party (object *op, char *params) { - char buf[MAX_BUF]; - partylist *tmpparty, *oldparty; /* For iterating over linked list */ - char *currentparty; /* For iterating over linked list */ + dynbuf_text buf; + partylist *party = op->contr->party; - if (params == NULL) - { - if (op->contr->party == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); - new_draw_info (NDI_UNIQUE, 0, op, "For help try: party help"); - } - else - { - currentparty = op->contr->party->partyname; - new_draw_info_format (NDI_UNIQUE, 0, op, "You are a member of party %s.", currentparty); - } - return 1; - } - - if (strcmp (params, "help") == 0) - { - new_draw_info (NDI_UNIQUE, 0, op, "To form a party type: party form "); - new_draw_info (NDI_UNIQUE, 0, op, "To join a party type: party join "); - new_draw_info (NDI_UNIQUE, 0, op, "If the party has a passwd, it will you prompt you for it."); - new_draw_info (NDI_UNIQUE, 0, op, "For a list of current parties type: party list"); - new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); - new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd "); - new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max"); - new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say "); - new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who"); - new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills"); - return 1; - } + if (!params) + params = (char *)""; - if (!strncmp (params, "kills", 5)) + if (!strcmp (params, "help")) + buf << "To form a party type: C \n\n" + "To join a party type: C \n\n" + "If the party has a passwd, it will you prompt you for it.\n\n" + "For a list of current parties type: C\n\n" + "To leave a party type: C\n\n" + "To change a passwd for a party type: C \n\n" + "There is an 8 character max\n\n" + "To talk to party members type: C \n\n" + "To see who is in your party: C\n\n" + "To see what you've killed, type: C"; + else if (strncmp (params, "form ", 5) == 0) { - int i, max; - char chr; - char buffer[80]; - float exp; + params += 5; - if (op->contr->party == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); - return 1; - } - tmpparty = op->contr->party; - if (!tmpparty->kills) - { - new_draw_info (NDI_UNIQUE, 0, op, "You haven't killed anything yet."); - return 1; - } - max = tmpparty->kills - 1; - if (max > PARTY_KILL_LOG - 1) - max = PARTY_KILL_LOG - 1; - new_draw_info (NDI_UNIQUE, 0, op, "Killed | Killer| Exp"); - new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------"); - for (i = 0; i <= max; i++) + if (party) + buf << "You are already a member of party " << party->partyname << ". You must leave it first."; + else { - exp = tmpparty->party_kills[i].exp; - chr = ' '; - if (exp > 1000000) - { - exp /= 1000000; - chr = 'M'; - } - else if (exp > 1000) + for (partylist *tmpparty = firstparty; tmpparty; tmpparty = tmpparty->next) { - exp /= 1000; - chr = 'k'; + if (!strcmp (tmpparty->partyname, params)) + { + buf << "The party " << tmpparty->partyname << " already exists, pick another name"; + goto reply; + } } - sprintf (buffer, "%16s|%16s|%6.1f%c", tmpparty->party_kills[i].dead, tmpparty->party_kills[i].killer, exp, chr); - new_draw_info (NDI_UNIQUE, 0, op, buffer); - } - exp = tmpparty->total_exp; - chr = ' '; - if (exp > 1000000) - { - exp /= 1000000; - chr = 'M'; - } - else if (exp > 1000) - { - exp /= 1000; - chr = 'k'; + + /* Forms the party struct for a party called 'params'. it is the responsibility + * of the caller to ensure that the name is unique, and that it is placed in the + * main party list correctly */ + + party = salloc0 (); + party->partyname = strdup (params); + party->total_exp = 0; + party->kills = 0; + party->passwd[0] = '\0'; + party->next = NULL; + party->partyleader = strdup (op->name); + + buf << "You have formed party: " << party->partyname << "."; + + party->next = firstparty; + op->contr->party = firstparty = party; } - new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------"); - sprintf (buffer, "Totals: %d kills, %.1f%c exp", tmpparty->kills, exp, chr); - new_draw_info (NDI_UNIQUE, 0, op, buffer); - return 1; } - - if (strncmp (params, "say ", 4) == 0) + else if (strcmp (params, "list") == 0) { - if (op->contr->party == NULL) + if (!firstparty) + buf << "There are no parties active right now"; + else { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); - return 1; + buf << "Party name Leader\n\n" + "---------- ------\n\n"; + + for (partylist *p = firstparty; p; p = p->next) + buf.printf ("%-32s %s\n\n", p->partyname, p->partyleader); } - params += 4; - currentparty = op->contr->party->partyname; - snprintf (buf, MAX_BUF - 1, "[%s] %s says: %s", currentparty, &op->name, params); - send_party_message (op, buf); - new_draw_info_format (NDI_LT_GREEN | NDI_UNIQUE, 0, op, "[%s] You say: %s", currentparty, params); - return 1; } - - if (strncmp (params, "form ", 5) == 0) + else if (strncmp (params, "join ", 5) == 0) { - int player_count; - params += 5; - if (op->contr->party) - oldparty = op->contr->party; - else - oldparty = NULL; - if (firstparty) - { - for (tmpparty = firstparty; tmpparty != NULL; tmpparty = tmpparty->next) + /* Can't join a party cause non exist */ + if (!firstparty) + buf << "Party: " << params << " does not exist. You must form it first."; + else if (party) + buf << "You are already a member of party " << party->partyname << ". You must leave it first."; + else + for (partylist *p = firstparty; p; p = p->next) + if (!strcmp (p->partyname, params)) { - if (!strcmp (tmpparty->partyname, params)) + if (!*p->passwd) { - new_draw_info_format (NDI_UNIQUE, 0, op, "The party %s already exists, pick another name", params); - return 1; + op->contr->party = p; + + buf << op->name << " joins party " << p->partyname << "."; + send_party_message (op, buf); + buf.clear (); + + buf << "You have joined party: " << p->partyname << "."; } + else + get_party_password (op, p); + + goto reply; } - lastparty->next = form_party (op, params); - lastparty = lastparty->next; - } + else + buf << "Party " << params << " does not exist. You must form it first."; + } + else if (!party) + buf << "You are not a member of any party.\n\n" + "For help try: C"; + else if (!*params) + buf << "You are a member of party " << party->partyname << "."; + else if (!strncmp (params, "kills", 5)) + { + if (!party->kills) + buf << "You haven't killed anything yet."; else { - firstparty = form_party (op, params); - lastparty = firstparty; - } - /* - * The player might have previously been a member of a party, if so, he will be leaving - * it, so check if there are any other members and if not, delete the party - */ - player_count = 0; - if (oldparty) - { - for_all_players (pl) - if (pl->party == oldparty) - player_count++; + int max = min (party->kills - 1, PARTY_KILL_LOG - 1); - if (player_count == 0) - remove_party (oldparty); - } + buf << "Killed | Killer| Exp\n\n" + << "----------------+----------------+--------\n\n"; - return 0; - } /* form */ + for (int i = 0; i <= max; i++) + { + sint64 exp = party->party_kills[i].exp; + char suffix = ' '; + if (exp > 1000000) + { + exp /= 1000000; + suffix = 'M'; + } + else if (exp > 1000) + { + exp /= 1000; + suffix = 'k'; + } - if (strcmp (params, "leave") == 0) - { - if (op->contr->party == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); - return 1; - } - 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); - send_party_message (op, buf); - op->contr->party = NULL; - return 1; - } + buf.printf ("%16s|%16s|%6.1f%c\n\n", party->party_kills[i].dead, party->party_kills[i].killer, (double)exp, suffix); + } + + buf << "----------------+----------------+--------\n\n"; - if (strcmp (params, "who") == 0) - { - tmpparty = op->contr->party; - if (op->contr->party == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); - return 1; - } - new_draw_info_format (NDI_UNIQUE, 0, op, "Members of party: %s.", op->contr->party->partyname); - for_all_players (pl) - if (pl->ob->contr->party == op->contr->party) { - if (settings.set_title == TRUE) + sint64 exp = party->total_exp; + char suffix = ' '; + + if (exp > 1000000) { - 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); - else - sprintf (buf, "%3d %s the %s", pl->ob->level, &pl->ob->name, pl->ob->contr->title); + exp /= 1000000; + suffix = 'M'; + } + else if (exp > 1000) + { + exp /= 1000; + suffix = 'k'; } - else - sprintf (buf, "%3d %s the %s", pl->ob->level, &pl->ob->name, pl->ob->contr->title); - new_draw_info (NDI_UNIQUE, 0, op, buf); - } - return 1; - } /* leave */ - - if (strncmp (params, "passwd ", 7) == 0) - { - partylist *tmplist; - - params += 7; - - if (op->contr->party == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of a party"); - return 1; - } - - if (strlen (params) > 8) - { - new_draw_info (NDI_UNIQUE, 0, op, "The password must not exceed 8 characters"); - return 1; - } - tmplist = firstparty; - while (tmplist != NULL) - { - if (tmplist == op->contr->party) - { - strcpy (tmplist->passwd, params); - 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); - send_party_message (op, buf); - return 0; - } - tmplist = tmplist->next; + buf.printf ("Totals: %d kills, %.1f%c exp", party->kills, (double)exp, suffix); + } } - return 0; - } /* passwd */ - - if (strcmp (params, "list") == 0) + } + else if (strncmp (params, "say ", 4) == 0) { - partylist *tmplist; - - tmplist = firstparty; + params += 4; - if (firstparty == NULL) - { - new_draw_info (NDI_UNIQUE, 0, op, "There are no parties active right now"); - return 1; - } + buf << "[" << party->partyname << "] " << op->name << " says: " << params; + send_party_message (op, buf); + buf.clear (); - new_draw_info (NDI_UNIQUE, 0, op, "Party name Leader"); - new_draw_info (NDI_UNIQUE, 0, op, "---------- ------"); + buf << "[" << party->partyname << "] You say: " << params; + } + else if (strcmp (params, "leave") == 0) + { + buf << op->name << " leaves party " << party->partyname << "."; + send_party_message (op, buf); + buf.clear (); - while (tmplist != NULL) - { - new_draw_info_format (NDI_UNIQUE, 0, op, "%-32s %s", tmplist->partyname, tmplist->partyleader); - tmplist = tmplist->next; - } - return 0; - } /* list */ + buf << "You leave party " << party->partyname << "."; - if (strncmp (params, "join ", 5) == 0) + op->contr->party = 0; + obsolete_parties (); + } + else if (strcmp (params, "who") == 0) { + buf << "Members of party " << party->partyname << ".\n\n"; - params += 5; - - /* Can't join a party cause non exist */ - if (firstparty == NULL) - { - new_draw_info_format (NDI_UNIQUE, 0, op, "Party: %s does not exist. You must form it first", params); - return 1; - } + for_all_players (pl) + if (pl->ob->contr->party == party) + buf.printf ("%s/%d %s", &pl->ob->name, pl->ob->level, + *pl->ob->contr->own_title ? pl->ob->contr->own_title : pl->ob->contr->title); + } + else if (strncmp (params, "passwd ", 7) == 0) + { + params += 7; - /* Special case if thier is only one party */ - if (firstparty->next == NULL) + if (strlen (params) > 8) + buf << "The password must not exceed 8 characters"; + else { - if (strcmp (firstparty->partyname, params) != 0) - { - new_draw_info_format (NDI_UNIQUE, 0, op, "Party: %s does not exist. You must form it first", params); - return 1; - } - else - { - if (op->contr->party == firstparty) - { - new_draw_info_format (NDI_UNIQUE, 0, op, "You are already in party: %s", firstparty->partyname); - return 1; - } - /* found party player wants to join */ - if (firstparty->passwd[0] == '\0') - { - 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); - send_party_message (op, buf); - return 0; - } - else - { - get_party_password (op, firstparty); - return 0; - } - } + strcpy (party->passwd, params); + buf << "The password for party " << party->partyname << " is set to B<" << params << "> by " << &op->name; } + } + else + buf << "I did not understand your command. For help try: C"; - tmpparty = firstparty; - while (tmpparty != NULL) - { - if (strcmp (tmpparty->partyname, params) == 0) - { - if (op->contr->party == tmpparty) - { - new_draw_info_format (NDI_UNIQUE, 0, op, "You are already a member of party: %s", tmpparty->partyname); - return 1; - } - else - { - if (tmpparty->passwd[0] == '\0') - { - 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); - send_party_message (op, buf); - return 0; - } - else - { - get_party_password (op, tmpparty); - return 0; - } - } - } - else - tmpparty = tmpparty->next; - } +reply: + op->contr->send_msg (NDI_UNIQUE | NDI_REPLY, MSG_CHANNEL("party"), buf); - new_draw_info_format (NDI_UNIQUE, 0, op, "Party %s does not exist. You must form it first.", params); - return 1; - } /* join */ - - new_draw_info (NDI_UNIQUE, 0, op, "To form a party type: party form "); - new_draw_info (NDI_UNIQUE, 0, op, "To join a party type: party join "); - new_draw_info (NDI_UNIQUE, 0, op, "If the party has a passwd, it will you prompt you for it."); - new_draw_info (NDI_UNIQUE, 0, op, "For a list of current parties type: party list"); - new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); - new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd "); - new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max"); - new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say "); - new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who"); - new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills"); return 1; }