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.7 by root, Fri Nov 17 21:26:42 2006 UTC vs.
Revision 1.14 by root, Sun Jan 7 02:39:14 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
20 21
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23*/
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29 28
30#ifdef COZY_SERVER 29#ifdef COZY_SERVER
31// used for pet monster logic etc. 30// used for pet monster logic etc.
32int 31int
… …
54form_party (object *op, const char *params) 53form_party (object *op, const char *params)
55{ 54{
56 partylist *newparty; 55 partylist *newparty;
57 56
58 newparty = (partylist *) malloc (sizeof (partylist)); 57 newparty = (partylist *) malloc (sizeof (partylist));
59 newparty->partyname = strdup_local (params); 58 newparty->partyname = strdup (params);
60 newparty->total_exp = 0; 59 newparty->total_exp = 0;
61 newparty->kills = 0; 60 newparty->kills = 0;
62 newparty->passwd[0] = '\0'; 61 newparty->passwd[0] = '\0';
63 newparty->next = NULL; 62 newparty->next = NULL;
64 newparty->partyleader = strdup_local (op->name); 63 newparty->partyleader = strdup (op->name);
65 new_draw_info_format (NDI_UNIQUE, 0, op, "You have formed party: %s", newparty->partyname); 64 new_draw_info_format (NDI_UNIQUE, 0, op, "You have formed party: %s", newparty->partyname);
66 op->contr->party = newparty; 65 op->contr->party = newparty;
67 66
68 return newparty; 67 return newparty;
69} 68}
… …
80 { 79 {
81 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname); 80 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname);
82 return; 81 return;
83 } 82 }
84 83
85 for (pl = first_player; pl != NULL; pl = pl->next) 84 for_all_players (pl)
86 if (pl->party == target_party) 85 if (pl->party == target_party)
87 pl->party = NULL; 86 pl->party = NULL;
88 87
89 /* special case-ism for parties at the beginning and end of the list */ 88 /* special case-ism for parties at the beginning and end of the list */
90 if (target_party == firstparty) 89 if (target_party == firstparty)
… …
150 return; /* we can't obsolete parties if there aren't any */ 149 return; /* we can't obsolete parties if there aren't any */
151 for (party = firstparty; party != NULL; party = next) 150 for (party = firstparty; party != NULL; party = next)
152 { 151 {
153 next = party->next; 152 next = party->next;
154 player_count = 0; 153 player_count = 0;
155 for (pl = first_player; pl != NULL; pl = pl->next) 154 for_all_players (pl)
156 if (pl->party == party) 155 if (pl->party == party)
157 player_count++; 156 player_count++;
158 if (player_count == 0) 157 if (player_count == 0)
159 remove_party (party); 158 remove_party (party);
160 } 159 }
161} 160}
162 161
163#ifdef PARTY_KILL_LOG
164void 162void
165add_kill_to_party (partylist *party, char *killer, char *dead, long exp) 163add_kill_to_party (partylist *party, char *killer, char *dead, long exp)
166{ 164{
167 int i, pos; 165 int i, pos;
168 166
169 if (party == NULL) 167 if (party == NULL)
170 return; 168 return;
169
171 if (party->kills >= PARTY_KILL_LOG) 170 if (party->kills >= PARTY_KILL_LOG)
172 { 171 {
173 pos = PARTY_KILL_LOG - 1; 172 pos = PARTY_KILL_LOG - 1;
174 for (i = 0; i < PARTY_KILL_LOG - 1; i++) 173 for (i = 0; i < PARTY_KILL_LOG - 1; i++)
175 party->party_kills[i] = party->party_kills[i + 1]; 174 party->party_kills[i] = party->party_kills[i + 1];
176 } 175 }
177 else 176 else
178 pos = party->kills; 177 pos = party->kills;
178
179 party->kills++; 179 party->kills++;
180 party->total_exp += exp; 180 party->total_exp += exp;
181 party->party_kills[pos].exp = exp; 181 party->party_kills[pos].exp = exp;
182 assign (party->party_kills[pos].killer, killer); 182 assign (party->party_kills[pos].killer, killer);
183 assign (party->party_kills[pos].dead, dead); 183 assign (party->party_kills[pos].dead, dead);
184 party->party_kills[pos].killer[MAX_NAME] = 0; 184 party->party_kills[pos].killer[MAX_NAME] = 0;
185 party->party_kills[pos].dead[MAX_NAME] = 0; 185 party->party_kills[pos].dead[MAX_NAME] = 0;
186} 186}
187#endif
188 187
189int 188int
190confirm_party_password (object *op) 189confirm_party_password (object *op)
191{ 190{
192 partylist *tmppartylist; 191 partylist *tmppartylist;
… …
216 op->contr->party = op->contr->party_to_join; 215 op->contr->party = op->contr->party_to_join;
217 op->contr->party_to_join = NULL; 216 op->contr->party_to_join = NULL;
218 new_draw_info_format (NDI_UNIQUE, 0, op, "You have joined party: %s\n", joined_party->partyname); 217 new_draw_info_format (NDI_UNIQUE, 0, op, "You have joined party: %s\n", joined_party->partyname);
219 snprintf (buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname); 218 snprintf (buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname);
220 send_party_message (op, buf); 219 send_party_message (op, buf);
221 op->contr->state = ST_PLAYING; 220 op->contr->ns->state = ST_PLAYING;
222 return; 221 return;
223 } 222 }
224 else 223 else
225 { 224 {
226 new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password"); 225 new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password");
227 op->contr->party_to_join = NULL; 226 op->contr->party_to_join = NULL;
228 op->contr->state = ST_PLAYING; 227 op->contr->ns->state = ST_PLAYING;
229 return; 228 return;
230 } 229 }
231} 230}
232 231
233void 232void
234send_party_message (object *op, char *msg) 233send_party_message (object *op, char *msg)
235{ 234{
236 player *pl; 235 player *pl;
237 236
238 for (pl = first_player; pl != NULL; pl = pl->next) 237 for_all_players (pl)
239 if (pl->ob->contr->party == op->contr->party && pl->ob != op) 238 if (pl->ob->contr->party == op->contr->party && pl->ob != op)
240 new_draw_info (NDI_WHITE, 0, pl->ob, msg); 239 new_draw_info (NDI_WHITE, 0, pl->ob, msg);
241} 240}
242 241
243int 242int
… …
245{ 244{
246 char party_params[MAX_BUF]; 245 char party_params[MAX_BUF];
247 246
248 if (!params) 247 if (!params)
249 return 0; 248 return 0;
249
250 strcpy (party_params, "say "); 250 strcpy (party_params, "say ");
251 strcat (party_params, params); 251 strcat (party_params, params);
252 command_party (op, party_params); 252 command_party (op, party_params);
253 return 0; 253 return 0;
254} 254}
255
256 255
257int 256int
258command_party (object *op, char *params) 257command_party (object *op, char *params)
259{ 258{
260 char buf[MAX_BUF]; 259 char buf[MAX_BUF];
… …
285 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); 284 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave");
286 new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd <password>"); 285 new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd <password>");
287 new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max"); 286 new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max");
288 new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say <msg>"); 287 new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say <msg>");
289 new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who"); 288 new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who");
290#ifdef PARTY_KILL_LOG
291 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills"); 289 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills");
292#endif
293 return 1; 290 return 1;
294 } 291 }
295 292
296#ifdef PARTY_KILL_LOG
297 if (!strncmp (params, "kills", 5)) 293 if (!strncmp (params, "kills", 5))
298 { 294 {
299 int i, max; 295 int i, max;
300 char chr; 296 char chr;
301 char buffer[80]; 297 char buffer[80];
… …
349 new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------"); 345 new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------");
350 sprintf (buffer, "Totals: %d kills, %.1f%c exp", tmpparty->kills, exp, chr); 346 sprintf (buffer, "Totals: %d kills, %.1f%c exp", tmpparty->kills, exp, chr);
351 new_draw_info (NDI_UNIQUE, 0, op, buffer); 347 new_draw_info (NDI_UNIQUE, 0, op, buffer);
352 return 1; 348 return 1;
353 } 349 }
354#endif /* PARTY_KILL_LOG */
355 350
356 if (strncmp (params, "say ", 4) == 0) 351 if (strncmp (params, "say ", 4) == 0)
357 { 352 {
358 if (op->contr->party == NULL) 353 if (op->contr->party == NULL)
359 { 354 {
… …
402 * it, so check if there are any other members and if not, delete the party 397 * it, so check if there are any other members and if not, delete the party
403 */ 398 */
404 player_count = 0; 399 player_count = 0;
405 if (oldparty) 400 if (oldparty)
406 { 401 {
407 for (pl = first_player; pl->next != NULL; pl = pl->next) 402 for_all_players (pl)
408 {
409 if (pl->party == oldparty) 403 if (pl->party == oldparty)
410 player_count++; 404 player_count++;
411 } 405
412 if (player_count == 0) 406 if (player_count == 0)
413 remove_party (oldparty); 407 remove_party (oldparty);
414 } 408 }
409
415 return 0; 410 return 0;
416 } /* form */ 411 } /* form */
417 412
418 if (strcmp (params, "leave") == 0) 413 if (strcmp (params, "leave") == 0)
419 { 414 {
… …
439 { 434 {
440 new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); 435 new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party.");
441 return 1; 436 return 1;
442 } 437 }
443 new_draw_info_format (NDI_UNIQUE, 0, op, "Members of party: %s.", op->contr->party->partyname); 438 new_draw_info_format (NDI_UNIQUE, 0, op, "Members of party: %s.", op->contr->party->partyname);
444 for (pl = first_player; pl != NULL; pl = pl->next) 439 for_all_players (pl)
445 if (pl->ob->contr->party == op->contr->party) 440 if (pl->ob->contr->party == op->contr->party)
446 { 441 {
447 if (settings.set_title == TRUE) 442 if (settings.set_title == TRUE)
448 { 443 {
449 if (pl->ob->contr->own_title[0] != '\0') 444 if (pl->ob->contr->own_title[0] != '\0')
… …
601 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); 596 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave");
602 new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd <password>"); 597 new_draw_info (NDI_UNIQUE, 0, op, "To change a passwd for a party type: party passwd <password>");
603 new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max"); 598 new_draw_info (NDI_UNIQUE, 0, op, "There is an 8 character max");
604 new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say <msg>"); 599 new_draw_info (NDI_UNIQUE, 0, op, "To talk to party members type: party say <msg>");
605 new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who"); 600 new_draw_info (NDI_UNIQUE, 0, op, "To see who is in your party: party who");
606#ifdef PARTY_KILL_LOG
607 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills"); 601 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills");
608#endif
609 return 1; 602 return 1;
610} 603}

Diff Legend

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