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.22 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.42 by root, Sat Nov 17 23:40:03 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24#include <global.h> 26#include <global.h>
25#include <sproto.h> 27#include <sproto.h>
26#include <spells.h> 28#include <spells.h>
27 29
28static partylist *firstparty; 30static partylist *firstparty;
29 31
30partylist * 32partylist *
31get_firstparty (void) 33get_firstparty ()
32{ 34{
33 return firstparty; 35 return firstparty;
34} 36}
35 37
36void 38static void
37remove_party (partylist *target_party) 39remove_party (partylist *target_party)
38{ 40{
39 if (firstparty == NULL) 41 if (firstparty == NULL)
40 { 42 {
41 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname); 43 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname);
… …
62 sfree (target_party); 64 sfree (target_party);
63} 65}
64 66
65/* Remove unused parties, this could be made to scale a lot better. */ 67/* Remove unused parties, this could be made to scale a lot better. */
66void 68void
67obsolete_parties (void) 69obsolete_parties ()
68{ 70{
69 int player_count; 71 int player_count;
70 partylist *party; 72 partylist *party;
71 partylist *next = NULL; 73 partylist *next = NULL;
72 74
… …
109 assign (party->party_kills[pos].dead, dead); 111 assign (party->party_kills[pos].dead, dead);
110 party->party_kills[pos].killer[MAX_NAME] = 0; 112 party->party_kills[pos].killer[MAX_NAME] = 0;
111 party->party_kills[pos].dead[MAX_NAME] = 0; 113 party->party_kills[pos].dead[MAX_NAME] = 0;
112} 114}
113 115
114int 116static int
115confirm_party_password (object *op) 117confirm_party_password (object *op)
116{ 118{
117 partylist *tmppartylist; 119 partylist *tmppartylist;
118 120
119 for (tmppartylist = firstparty; tmppartylist != NULL; tmppartylist = tmppartylist->next) 121 for (tmppartylist = firstparty; tmppartylist != NULL; tmppartylist = tmppartylist->next)
… …
127 } 129 }
128 } 130 }
129 return 1; 131 return 1;
130} 132}
131 133
132void 134static void
133send_party_message (object *op, const char *msg) 135send_party_message (object *op, const char *msg)
134{ 136{
135 for_all_players (pl) 137 for_all_players (pl)
136 if (pl->ob->contr->party == op->contr->party && pl->ob != op) 138 if (pl->ob->contr->party == op->contr->party && pl->ob != op)
137 new_draw_info (NDI_WHITE, 0, pl->ob, msg); 139 pl->send_msg (NDI_UNIQUE, MSG_CHANNEL ("party"), msg);
138} 140}
139 141
140void 142void
141receive_party_password (object *op, char k) 143receive_party_password (object *op, char k)
142{ 144{
… …
164} 166}
165 167
166int 168int
167command_gsay (object *op, char *params) 169command_gsay (object *op, char *params)
168{ 170{
169 char party_params[MAX_BUF];
170
171 if (!params) 171 if (!params)
172 return 0; 172 return 0;
173 173
174 strcpy (party_params, "say ");
175 strcat (party_params, params);
176 command_party (op, party_params); 174 command_party (op, format ("say %s", params));
175
177 return 0; 176 return 0;
178} 177}
179 178
180int 179int
181command_party (object *op, char *params) 180command_party (object *op, char *params)
182{ 181{
183 dynbuf_text buf; 182 dynbuf_text &buf = msg_dynbuf; buf.clear ();
183
184 partylist *party = op->contr->party; 184 partylist *party = op->contr->party;
185 185
186 if (!params) 186 if (!params)
187 params = (char *)""; 187 params = (char *)"";
188 188
189 if (!strcmp (params, "help")) 189 if (!strcmp (params, "help"))
190 buf << "\n"
190 buf << "To form a party type: C<party form> <partyname>\n\n" 191 " - To form a party type: C<party form> <partyname>\n"
191 "To join a party type: C<party join> <partyname>\n\n" 192 " - 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" 193 " - 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" 194 " - For a list of current parties type: C<party list>\n"
194 "To leave a party type: C<party leave>\n\n" 195 " - To leave a party type: C<party leave>\n"
195 "To change a passwd for a party type: C<party passwd> <password>\n\n" 196 " - To change a passwd for a party type: C<party passwd> <password>\n"
196 "There is an 8 character max\n\n" 197 " - There is an 8 character max\n"
197 "To talk to party members type: C<party say> <msg>\n\n" 198 " - To talk to party members type: C<party say> <msg>\n"
198 "To see who is in your party: C<party who>\n\n" 199 " - To see who is in your party: C<party who>\n"
199 "To see what you've killed, type: C<party kills>"; 200 " - To see what you've killed, type: C<party kills>\n";
200 else if (strncmp (params, "form ", 5) == 0) 201 else if (strncmp (params, "form ", 5) == 0)
201 { 202 {
202 params += 5; 203 params += 5;
203 204
204 if (party) 205 if (party)
… …
213 goto reply; 214 goto reply;
214 } 215 }
215 } 216 }
216 217
217 /* Forms the party struct for a party called 'params'. it is the responsibility 218 /* Forms the party struct for a party called 'params'. it is the responsibility
218 * of the caller to ensure that the name is unique, and that it is placed in the 219 * of the caller to ensure that the name is unique, and that it is placed in the
219 * main party list correctly */ 220 * main party list correctly */
220 221
221 party = salloc0<partylist> (); 222 party = salloc0<partylist> ();
222 party->partyname = strdup (params); 223 party->partyname = strdup (params);
223 party->total_exp = 0; 224 party->total_exp = 0;
… …
287 buf << "You haven't killed anything yet."; 288 buf << "You haven't killed anything yet.";
288 else 289 else
289 { 290 {
290 int max = min (party->kills - 1, PARTY_KILL_LOG - 1); 291 int max = min (party->kills - 1, PARTY_KILL_LOG - 1);
291 292
292 buf << "Killed | Killer| Exp\n\n" 293 buf << " Killed | Killer| Exp\n"
293 << "----------------+----------------+--------\n\n"; 294 << " ----------------+----------------+--------\n";
294 295
295 for (int i = 0; i <= max; i++) 296 for (int i = 0; i <= max; i++)
296 { 297 {
297 sint64 exp = party->party_kills[i].exp; 298 sint64 exp = party->party_kills[i].exp;
298 char suffix = ' '; 299 char suffix = ' ';
… …
305 { 306 {
306 exp /= 1000; 307 exp /= 1000;
307 suffix = 'k'; 308 suffix = 'k';
308 } 309 }
309 310
310 buf.printf ("%16s|%16s|%6.1f%c\n\n", party->party_kills[i].dead, party->party_kills[i].killer, (double)exp, suffix); 311 buf.printf (" %16s|%16s|%6.1f%c\n", party->party_kills[i].dead, party->party_kills[i].killer, (double)exp, suffix);
311 } 312 }
312 313
313 buf << "----------------+----------------+--------\n\n"; 314 buf << " ----------------+----------------+--------\n";
314 315
315 { 316 {
316 sint64 exp = party->total_exp; 317 sint64 exp = party->total_exp;
317 char suffix = ' '; 318 char suffix = ' ';
318 319
… …
325 { 326 {
326 exp /= 1000; 327 exp /= 1000;
327 suffix = 'k'; 328 suffix = 'k';
328 } 329 }
329 330
330 buf.printf ("Totals: %d kills, %.1f%c exp", party->kills, (double)exp, suffix); 331 buf.printf (" Totals: %d kills, %.1f%c exp", party->kills, (double)exp, suffix);
331 } 332 }
332 } 333 }
333 } 334 }
334 else if (strncmp (params, "say ", 4) == 0) 335 else if (strncmp (params, "say ", 4) == 0)
335 { 336 {
… …
352 op->contr->party = 0; 353 op->contr->party = 0;
353 obsolete_parties (); 354 obsolete_parties ();
354 } 355 }
355 else if (strcmp (params, "who") == 0) 356 else if (strcmp (params, "who") == 0)
356 { 357 {
357 buf << "Members of party " << party->partyname << ".\n\n"; 358 buf << "Members of party " << party->partyname << ".\n";
358 359
359 for_all_players (pl) 360 for_all_players (pl)
360 if (pl->ob->contr->party == party) 361 if (pl->ob->contr->party == party)
361 buf.printf ("%s/%d %s", &pl->ob->name, pl->ob->level, 362 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); 363 *pl->ob->contr->own_title ? pl->ob->contr->own_title : pl->ob->contr->title);
363 } 364 }
364 else if (strncmp (params, "passwd ", 7) == 0) 365 else if (strncmp (params, "passwd ", 7) == 0)
365 { 366 {
366 params += 7; 367 params += 7;
… …
375 } 376 }
376 else 377 else
377 buf << "I did not understand your command. For help try: C<party help>"; 378 buf << "I did not understand your command. For help try: C<party help>";
378 379
379reply: 380reply:
380 op->contr->send_msg (NDI_UNIQUE | NDI_REPLY, MSG_CHANNEL("party"), buf); 381 op->contr->send_msg (NDI_UNIQUE | NDI_REPLY, MSG_CHANNEL ("party"), buf);
381 382
382 return 1; 383 return 1;
383} 384}

Diff Legend

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