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.8 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.12 by root, Sun Dec 31 10:28:36 2006 UTC

… …
20 20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24#include <global.h> 24#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 25#include <sproto.h>
27#endif
28#include <spells.h> 26#include <spells.h>
29 27
30#ifdef COZY_SERVER 28#ifdef COZY_SERVER
31// used for pet monster logic etc. 29// used for pet monster logic etc.
32int 30int
… …
80 { 78 {
81 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname); 79 LOG (llevError, "remove_party(): I was asked to remove party %s, but no parties are defined", target_party->partyname);
82 return; 80 return;
83 } 81 }
84 82
85 for (pl = first_player; pl != NULL; pl = pl->next) 83 for_all_players (pl)
86 if (pl->party == target_party) 84 if (pl->party == target_party)
87 pl->party = NULL; 85 pl->party = NULL;
88 86
89 /* special case-ism for parties at the beginning and end of the list */ 87 /* special case-ism for parties at the beginning and end of the list */
90 if (target_party == firstparty) 88 if (target_party == firstparty)
… …
150 return; /* we can't obsolete parties if there aren't any */ 148 return; /* we can't obsolete parties if there aren't any */
151 for (party = firstparty; party != NULL; party = next) 149 for (party = firstparty; party != NULL; party = next)
152 { 150 {
153 next = party->next; 151 next = party->next;
154 player_count = 0; 152 player_count = 0;
155 for (pl = first_player; pl != NULL; pl = pl->next) 153 for_all_players (pl)
156 if (pl->party == party) 154 if (pl->party == party)
157 player_count++; 155 player_count++;
158 if (player_count == 0) 156 if (player_count == 0)
159 remove_party (party); 157 remove_party (party);
160 } 158 }
161} 159}
162 160
163#ifdef PARTY_KILL_LOG
164void 161void
165add_kill_to_party (partylist *party, char *killer, char *dead, long exp) 162add_kill_to_party (partylist *party, char *killer, char *dead, long exp)
166{ 163{
167 int i, pos; 164 int i, pos;
168 165
169 if (party == NULL) 166 if (party == NULL)
170 return; 167 return;
168
171 if (party->kills >= PARTY_KILL_LOG) 169 if (party->kills >= PARTY_KILL_LOG)
172 { 170 {
173 pos = PARTY_KILL_LOG - 1; 171 pos = PARTY_KILL_LOG - 1;
174 for (i = 0; i < PARTY_KILL_LOG - 1; i++) 172 for (i = 0; i < PARTY_KILL_LOG - 1; i++)
175 party->party_kills[i] = party->party_kills[i + 1]; 173 party->party_kills[i] = party->party_kills[i + 1];
176 } 174 }
177 else 175 else
178 pos = party->kills; 176 pos = party->kills;
177
179 party->kills++; 178 party->kills++;
180 party->total_exp += exp; 179 party->total_exp += exp;
181 party->party_kills[pos].exp = exp; 180 party->party_kills[pos].exp = exp;
182 assign (party->party_kills[pos].killer, killer); 181 assign (party->party_kills[pos].killer, killer);
183 assign (party->party_kills[pos].dead, dead); 182 assign (party->party_kills[pos].dead, dead);
184 party->party_kills[pos].killer[MAX_NAME] = 0; 183 party->party_kills[pos].killer[MAX_NAME] = 0;
185 party->party_kills[pos].dead[MAX_NAME] = 0; 184 party->party_kills[pos].dead[MAX_NAME] = 0;
186} 185}
187#endif
188 186
189int 187int
190confirm_party_password (object *op) 188confirm_party_password (object *op)
191{ 189{
192 partylist *tmppartylist; 190 partylist *tmppartylist;
… …
216 op->contr->party = op->contr->party_to_join; 214 op->contr->party = op->contr->party_to_join;
217 op->contr->party_to_join = NULL; 215 op->contr->party_to_join = NULL;
218 new_draw_info_format (NDI_UNIQUE, 0, op, "You have joined party: %s\n", joined_party->partyname); 216 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); 217 snprintf (buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname);
220 send_party_message (op, buf); 218 send_party_message (op, buf);
221 op->contr->state = ST_PLAYING; 219 op->contr->ns->state = ST_PLAYING;
222 return; 220 return;
223 } 221 }
224 else 222 else
225 { 223 {
226 new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password"); 224 new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password");
227 op->contr->party_to_join = NULL; 225 op->contr->party_to_join = NULL;
228 op->contr->state = ST_PLAYING; 226 op->contr->ns->state = ST_PLAYING;
229 return; 227 return;
230 } 228 }
231} 229}
232 230
233void 231void
234send_party_message (object *op, char *msg) 232send_party_message (object *op, char *msg)
235{ 233{
236 player *pl; 234 player *pl;
237 235
238 for (pl = first_player; pl != NULL; pl = pl->next) 236 for_all_players (pl)
239 if (pl->ob->contr->party == op->contr->party && pl->ob != op) 237 if (pl->ob->contr->party == op->contr->party && pl->ob != op)
240 new_draw_info (NDI_WHITE, 0, pl->ob, msg); 238 new_draw_info (NDI_WHITE, 0, pl->ob, msg);
241} 239}
242 240
243int 241int
… …
245{ 243{
246 char party_params[MAX_BUF]; 244 char party_params[MAX_BUF];
247 245
248 if (!params) 246 if (!params)
249 return 0; 247 return 0;
248
250 strcpy (party_params, "say "); 249 strcpy (party_params, "say ");
251 strcat (party_params, params); 250 strcat (party_params, params);
252 command_party (op, party_params); 251 command_party (op, party_params);
253 return 0; 252 return 0;
254} 253}
255
256 254
257int 255int
258command_party (object *op, char *params) 256command_party (object *op, char *params)
259{ 257{
260 char buf[MAX_BUF]; 258 char buf[MAX_BUF];
… …
285 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); 283 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>"); 284 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"); 285 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>"); 286 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"); 287 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"); 288 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills");
292#endif
293 return 1; 289 return 1;
294 } 290 }
295 291
296#ifdef PARTY_KILL_LOG
297 if (!strncmp (params, "kills", 5)) 292 if (!strncmp (params, "kills", 5))
298 { 293 {
299 int i, max; 294 int i, max;
300 char chr; 295 char chr;
301 char buffer[80]; 296 char buffer[80];
… …
349 new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------"); 344 new_draw_info (NDI_UNIQUE, 0, op, "----------------+----------------+--------");
350 sprintf (buffer, "Totals: %d kills, %.1f%c exp", tmpparty->kills, exp, chr); 345 sprintf (buffer, "Totals: %d kills, %.1f%c exp", tmpparty->kills, exp, chr);
351 new_draw_info (NDI_UNIQUE, 0, op, buffer); 346 new_draw_info (NDI_UNIQUE, 0, op, buffer);
352 return 1; 347 return 1;
353 } 348 }
354#endif /* PARTY_KILL_LOG */
355 349
356 if (strncmp (params, "say ", 4) == 0) 350 if (strncmp (params, "say ", 4) == 0)
357 { 351 {
358 if (op->contr->party == NULL) 352 if (op->contr->party == NULL)
359 { 353 {
… …
439 { 433 {
440 new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party."); 434 new_draw_info (NDI_UNIQUE, 0, op, "You are not a member of any party.");
441 return 1; 435 return 1;
442 } 436 }
443 new_draw_info_format (NDI_UNIQUE, 0, op, "Members of party: %s.", op->contr->party->partyname); 437 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) 438 for_all_players (pl)
445 if (pl->ob->contr->party == op->contr->party) 439 if (pl->ob->contr->party == op->contr->party)
446 { 440 {
447 if (settings.set_title == TRUE) 441 if (settings.set_title == TRUE)
448 { 442 {
449 if (pl->ob->contr->own_title[0] != '\0') 443 if (pl->ob->contr->own_title[0] != '\0')
… …
601 new_draw_info (NDI_UNIQUE, 0, op, "To leave a party type: party leave"); 595 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>"); 596 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"); 597 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>"); 598 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"); 599 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"); 600 new_draw_info (NDI_UNIQUE, 0, op, "To see what you've killed, type: party kills");
608#endif
609 return 1; 601 return 1;
610} 602}

Diff Legend

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