ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_party.C
(Generate patch)

Comparing deliantra/server/server/c_party.C (file contents):
Revision 1.23 by root, Thu Apr 24 06:44:50 2008 UTC vs.
Revision 1.29 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
132void 133void
133send_party_message (object *op, const char *msg) 134send_party_message (object *op, const char *msg)
134{ 135{
135 for_all_players (pl) 136 for_all_players (pl)
136 if (pl->ob->contr->party == op->contr->party && pl->ob != op) 137 if (pl->ob->contr->party == op->contr->party && pl->ob != op)
137 new_draw_info (NDI_WHITE, 0, pl->ob, msg); 138 pl->send_msg (NDI_UNIQUE, MSG_CHANNEL ("party"), msg);
138} 139}
139 140
140void 141void
141receive_party_password (object *op, char k) 142receive_party_password (object *op, char k)
142{ 143{
… …
178} 179}
179 180
180int 181int
181command_party (object *op, char *params) 182command_party (object *op, char *params)
182{ 183{
183 dynbuf_text buf; 184 dynbuf_text &buf = msg_dynbuf; buf.clear ();
185
184 partylist *party = op->contr->party; 186 partylist *party = op->contr->party;
185 187
186 if (!params) 188 if (!params)
187 params = (char *)""; 189 params = (char *)"";
188 190
189 if (!strcmp (params, "help")) 191 if (!strcmp (params, "help"))
192 buf << "\n"
190 buf << "To form a party type: C<party form> <partyname>\n\n" 193 " - To form a party type: C<party form> <partyname>\n"
191 "To join a party type: C<party join> <partyname>\n\n" 194 " - To join a party type: C<party join> <partyname>\n"
192 "If the party has a passwd, it will you prompt you for it.\n\n" 195 " - If the party has a passwd, it will you prompt you for it.\n"
193 "For a list of current parties type: C<party list>\n\n" 196 " - For a list of current parties type: C<party list>\n"
194 "To leave a party type: C<party leave>\n\n" 197 " - To leave a party type: C<party leave>\n"
195 "To change a passwd for a party type: C<party passwd> <password>\n\n" 198 " - To change a passwd for a party type: C<party passwd> <password>\n"
196 "There is an 8 character max\n\n" 199 " - There is an 8 character max\n"
197 "To talk to party members type: C<party say> <msg>\n\n" 200 " - To talk to party members type: C<party say> <msg>\n"
198 "To see who is in your party: C<party who>\n\n" 201 " - To see who is in your party: C<party who>\n"
199 "To see what you've killed, type: C<party kills>"; 202 " - To see what you've killed, type: C<party kills>\n";
200 else if (strncmp (params, "form ", 5) == 0) 203 else if (strncmp (params, "form ", 5) == 0)
201 { 204 {
202 params += 5; 205 params += 5;
203 206
204 if (party) 207 if (party)
… …
287 buf << "You haven't killed anything yet."; 290 buf << "You haven't killed anything yet.";
288 else 291 else
289 { 292 {
290 int max = min (party->kills - 1, PARTY_KILL_LOG - 1); 293 int max = min (party->kills - 1, PARTY_KILL_LOG - 1);
291 294
292 buf << "Killed | Killer| Exp\n\n" 295 buf << " Killed | Killer| Exp\n"
293 << "----------------+----------------+--------\n\n"; 296 << " ----------------+----------------+--------\n";
294 297
295 for (int i = 0; i <= max; i++) 298 for (int i = 0; i <= max; i++)
296 { 299 {
297 sint64 exp = party->party_kills[i].exp; 300 sint64 exp = party->party_kills[i].exp;
298 char suffix = ' '; 301 char suffix = ' ';
… …
305 { 308 {
306 exp /= 1000; 309 exp /= 1000;
307 suffix = 'k'; 310 suffix = 'k';
308 } 311 }
309 312
310 buf.printf ("%16s|%16s|%6.1f%c\n\n", party->party_kills[i].dead, party->party_kills[i].killer, (double)exp, suffix); 313 buf.printf (" %16s|%16s|%6.1f%c\n", party->party_kills[i].dead, party->party_kills[i].killer, (double)exp, suffix);
311 } 314 }
312 315
313 buf << "----------------+----------------+--------\n\n"; 316 buf << " ----------------+----------------+--------\n";
314 317
315 { 318 {
316 sint64 exp = party->total_exp; 319 sint64 exp = party->total_exp;
317 char suffix = ' '; 320 char suffix = ' ';
318 321
… …
325 { 328 {
326 exp /= 1000; 329 exp /= 1000;
327 suffix = 'k'; 330 suffix = 'k';
328 } 331 }
329 332
330 buf.printf ("Totals: %d kills, %.1f%c exp", party->kills, (double)exp, suffix); 333 buf.printf (" Totals: %d kills, %.1f%c exp", party->kills, (double)exp, suffix);
331 } 334 }
332 } 335 }
333 } 336 }
334 else if (strncmp (params, "say ", 4) == 0) 337 else if (strncmp (params, "say ", 4) == 0)
335 { 338 {
… …
352 op->contr->party = 0; 355 op->contr->party = 0;
353 obsolete_parties (); 356 obsolete_parties ();
354 } 357 }
355 else if (strcmp (params, "who") == 0) 358 else if (strcmp (params, "who") == 0)
356 { 359 {
357 buf << "Members of party " << party->partyname << ".\n\n"; 360 buf << "Members of party " << party->partyname << ".\n";
358 361
359 for_all_players (pl) 362 for_all_players (pl)
360 if (pl->ob->contr->party == party) 363 if (pl->ob->contr->party == party)
361 buf.printf ("%s/%d %s\n\n", &pl->ob->name, pl->ob->level, 364 buf.printf (" - %s/%d %s\n\n", &pl->ob->name, pl->ob->level,
362 *pl->ob->contr->own_title ? pl->ob->contr->own_title : pl->ob->contr->title); 365 *pl->ob->contr->own_title ? pl->ob->contr->own_title : pl->ob->contr->title);
363 } 366 }
364 else if (strncmp (params, "passwd ", 7) == 0) 367 else if (strncmp (params, "passwd ", 7) == 0)
365 { 368 {
366 params += 7; 369 params += 7;
… …
375 } 378 }
376 else 379 else
377 buf << "I did not understand your command. For help try: C<party help>"; 380 buf << "I did not understand your command. For help try: C<party help>";
378 381
379reply: 382reply:
380 op->contr->send_msg (NDI_UNIQUE | NDI_REPLY, MSG_CHANNEL("party"), buf); 383 op->contr->send_msg (NDI_UNIQUE | NDI_REPLY, MSG_CHANNEL ("party"), buf);
381 384
382 return 1; 385 return 1;
383} 386}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines