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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.23 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.48 by root, Tue Jun 5 13:05:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <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#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 66 return NULL;
67 }
68
69 return pl;
76 } 70 }
71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 73 return 0;
78} 74}
79 75
80/** 76/**
81 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
90 op->contr->hidden = 0; 86 op->contr->hidden = 0;
91 op->invisible = 1; 87 op->invisible = 1;
92 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
93 op->map->players++; 89 op->map->players++;
94 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
91
95 if (!silent_dm) 92 if (!silent_dm)
96 {
97 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
98 }
99 } 94 }
100 else 95 else
101 { 96 {
102 op->contr->hidden = 1; 97 op->contr->hidden = 1;
103 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
104 op->map->players--; 99 op->map->players--;
100
105 if (!silent_dm) 101 if (!silent_dm)
106 {
107 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
108 } 103
109 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
110 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
111 } 106 }
112} 107}
113 108
… …
177 172
178 become_follower (ob, god); 173 become_follower (ob, god);
179 return 1; 174 return 1;
180} 175}
181 176
182/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
183 * Add player's IP to ban_file and kick them off the server
184 * I know most people have dynamic IPs but this is more of a short term
185 * solution if they have to get a new IP to play maybe they'll calm down.
186 * This uses the banish_file in the local directory *not* the ban_file
187 * The action is logged with a ! for easy searching. -tm
188 */
189int
190command_banish (object *op, char *params)
191{
192 player *pl;
193 FILE *banishfile;
194 char buf[MAX_BUF];
195 time_t now;
196
197 if (!params)
198 {
199 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
200 return 1;
201 }
202
203 pl = get_other_player_from_name (op, params);
204 if (!pl)
205 return 1;
206
207 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
208
209 if ((banishfile = fopen (buf, "a")) == NULL)
210 {
211 LOG (llevDebug, "Could not find file banish_file.\n");
212 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
213 return 0;
214 }
215
216 now = time (NULL);
217 /*
218 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code.
220 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket->host, &op->name, ctime (&now));
222 fprintf (banishfile, "*@%s\n", pl->socket->host);
223 fclose (banishfile);
224
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket->host);
226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
227 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
228 command_kick (op, (char *) &pl->ob->name);
229 return 1;
230}
231
232int 178int
233command_kick (object *op, char *params) 179command_kick (object *op, char *params)
234{ 180{
235 for (player *pl = first_player; pl; pl = pl->next) 181 for_all_players (pl)
236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
237 { 183 {
238 object *op = pl->ob; 184 object *op = pl->ob;
239 185
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 { 187 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
243 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
244 } 190 }
245 191
246 pl->socket->status = Ns_Dead; 192 pl->ns->destroy ();
247 } 193 }
248 194
249 return 1; 195 return 1;
250} 196}
251 197
198//TODO
199#if 0
252int 200int
253command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
254{ 202{
255 if (!op) 203 if (!op)
256 return 0; 204 return 0;
… …
267 215
268 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
269 217
270 return 1; 218 return 1;
271} 219}
272 220#endif
273int
274command_shutdown (object *op, char *params)
275{
276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
277 {
278 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
279 return 1;
280 }
281
282 cleanup ();
283 /* not reached */
284 return 1;
285}
286 221
287int 222int
288command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
289{ 224{
290 int ticks; 225 int ticks;
… …
326 object *dummy; 261 object *dummy;
327 player *pl; 262 player *pl;
328 263
329 if (!op) 264 if (!op)
330 return 0; 265 return 0;
266
331 if (params == NULL) 267 if (params == NULL)
332 { 268 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 270 return 1;
335 } 271 }
272
336 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
337 if (!pl) 274 if (!pl)
338 return 1; 275 return 1;
276
339 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 278 if (!dummy)
341 { 279 {
342 /* we have nowhere to send the prisoner.... */ 280 /* we have nowhere to send the prisoner.... */
343 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
344 return 0; 282 return 0;
345 } 283 }
346 enter_exit (pl->ob, dummy); 284
285 pl->ob->enter_exit (dummy);
347 dummy->destroy (); 286 dummy->destroy ();
348 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
351 return 1; 290 return 1;
… …
380 319
381 dummy = object::create (); 320 dummy = object::create ();
382 EXIT_PATH (dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
383 EXIT_X (dummy) = op->x + freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
384 EXIT_Y (dummy) = op->y + freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
385 enter_exit (pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
386 dummy->destroy (); 325 dummy->destroy ();
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 328
390 return 1;
391}
392
393/**
394 * Teleport next to target player.
395 */
396
397/* mids 01/16/2002 */
398int
399command_teleport (object *op, char *params)
400{
401 int i;
402 object *dummy;
403 player *pl;
404
405 if (!op)
406 return 0;
407
408 if (params == NULL)
409 {
410 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
411 return 1;
412 }
413
414 pl = get_other_player_from_name (op, params);
415 if (!pl)
416 return 1;
417
418 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
419 if (i == -1)
420 {
421 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
422 return 1;
423 }
424
425 dummy = object::create ();
426 EXIT_PATH (dummy) = pl->ob->map->path;
427 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
428 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
429 enter_exit (op, dummy);
430 dummy->destroy ();
431 if (!op->contr->hidden)
432 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
433 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
434 return 1; 329 return 1;
435} 330}
436 331
437/** 332/**
438 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
528 * we also set up spell_name which is only 423 * we also set up spell_name which is only
529 * the first word. 424 * the first word.
530 */ 425 */
531 426
532 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
536 { 431 {
537 strcpy (spell_name, cp); 432 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
539 if (fsp) 434 if (fsp)
540 { 435 {
541 *fsp = 0; 436 *fsp = 0;
542 fsp++; 437 fsp++;
543 at_spell = archetype::find (spell_name); 438 at_spell = archetype::find (spell_name);
544 439
545 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
546 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
547 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
548 else 443 else
549 at_spell = NULL; 444 at_spell = NULL;
550 } 445 }
551 } 446 }
… …
553 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
554 * in this case means its an artifact. 449 * in this case means its an artifact.
555 */ 450 */
556 if (!at_spell) 451 if (!at_spell)
557 { 452 {
558 if (find_artifactlist (at->clone.type) == NULL) 453 if (find_artifactlist (at->type) == NULL)
559 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
560 else 455 else
561 { 456 {
562 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
563 458
564 do 459 while (art)
565 { 460 {
566 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
567 break; 462 break;
463
568 art = art->next; 464 art = art->next;
569 } 465 }
570 while (art != NULL);
571 466
572 if (!art) 467 if (!art)
573 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
574 } 469 }
575 470
576 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 471 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
577 } 472 }
578 } /* if cp */ 473 } /* if cp */
579 474
580 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
581 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
582 { 477 {
583 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 478 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
584 return 1; 479 return 1;
585 } 480 }
586 481
… …
588 * Rather than have two different blocks with a lot of similar code, 483 * Rather than have two different blocks with a lot of similar code,
589 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
590 * if that one object should be inserted or if we need to make copies. 485 * if that one object should be inserted or if we need to make copies.
591 */ 486 */
592 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
593
594 if (settings.real_wiz == FALSE)
595 SET_FLAG (tmp, FLAG_WAS_WIZ);
596 488
597 if (set_magic) 489 if (set_magic)
598 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
599 491
600 if (art) 492 if (art)
… …
680 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 572 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
681 573
682 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
683 } 575 }
684 576
685 if (at->clone.nrof) 577 if (at->nrof)
686 { 578 {
687 if (at_spell) 579 if (at_spell)
688 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
689 581
690 tmp->x = op->x; 582 tmp->x = op->x;
… …
705 } 597 }
706 else 598 else
707 { 599 {
708 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
709 { 601 {
710 archetype *atmp;
711 object *prev = 0, *head = 0; 602 object *prev = 0, *head = 0;
712 603
713 for (atmp = at; atmp; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
714 { 605 {
715 object *dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
716 607
717 if (at_spell) 608 if (at_spell)
718 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
725 { 616 {
726 head = dup; 617 head = dup;
727 tmp->copy_to (dup); 618 tmp->copy_to (dup);
728 } 619 }
729 620
730 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ);
732
733 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
734 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
735 dup->map = op->map; 623 dup->map = op->map;
736 624
737 if (head != dup) 625 if (head != dup)
738 { 626 {
739 dup->head = head; 627 dup->head = head;
… …
749 int size_x = 0; 637 int size_x = 0;
750 int size_y = 0; 638 int size_y = 0;
751 639
752 while (check) 640 while (check)
753 { 641 {
754 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
755 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
756 check = check->more; 644 check = check->more;
757 } 645 }
758 646
759 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 647 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
760 { 648 {
… …
786 /* Wonder if we really want to push all of these, but since 674 /* Wonder if we really want to push all of these, but since
787 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
788 */ 676 */
789 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
790 678
791 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
792 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
793 681
794 esrv_send_item (op, head); 682 esrv_send_item (op, head);
795 } 683 }
796 684
797 /* free the one we used to copy */ 685 /* free the one we used to copy */
… …
852 free (dump); 740 free (dump);
853 741
854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
856 744
857 return 1;
858}
859
860/**
861 * When DM is possessing a monster, flip aggression on and off, to allow
862 * better motion.
863 */
864int
865command_mon_aggr (object *op, char *params)
866{
867 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
868 {
869 op->enemy = NULL;
870 SET_FLAG (op, FLAG_UNAGGRESSIVE);
871 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
872 }
873 else
874 {
875 CLEAR_FLAG (op, FLAG_FRIENDLY);
876 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
877 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
878 }
879
880 return 1;
881}
882
883/** DM can possess a monster. Basically, this tricks the client into thinking
884 * a given monster, is actually the player it controls. This allows a DM
885 * to inhabit a monster's body, and run around the game with it.
886 * This function is severely broken - it has tons of hardcoded values,
887 */
888int
889command_possess (object *op, char *params)
890{
891 object *victim, *curinv, *nextinv;
892 player *pl;
893 int i;
894 char buf[MAX_BUF];
895
896 victim = NULL;
897 if (params != NULL)
898 {
899 if (sscanf (params, "%d", &i))
900 victim = find_object (i);
901 else if (sscanf (params, "%s", buf))
902 victim = find_object_name (buf);
903 }
904 if (victim == NULL)
905 {
906 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
907 return 1;
908 }
909
910 if (victim == op)
911 {
912 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
913 return 1;
914 }
915
916 /* clear out the old inventory */
917 curinv = op->inv;
918 while (curinv != NULL)
919 {
920 nextinv = curinv->below;
921 esrv_del_item (op->contr, curinv->count);
922 curinv = nextinv;
923 }
924
925 /* make the switch */
926 pl = op->contr;
927 victim->contr = pl;
928 pl->ob = victim;
929 victim->type = PLAYER;
930 SET_FLAG (victim, FLAG_WIZ);
931
932 /* send the inventory to the client */
933 curinv = victim->inv;
934 while (curinv != NULL)
935 {
936 nextinv = curinv->below;
937 esrv_send_item (victim, curinv);
938 curinv = nextinv;
939 }
940 /* basic patchup */
941 /* The use of hard coded values is terrible. Note
942 * that really, to be fair, this shouldn't get changed at
943 * all - if you are possessing a kobold, you should have the
944 * same limitations. As it is, as more body locations are added,
945 * this will give this player more locations than perhaps
946 * they should be allowed.
947 */
948 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
949 if (i == 1 || i == 6 || i == 8 || i == 9)
950 victim->body_info[i] = 2;
951 else
952 victim->body_info[i] = 1;
953
954 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
955 esrv_send_inventory (victim, victim);
956
957 fix_player (victim);
958
959 do_some_living (victim);
960 return 1; 745 return 1;
961} 746}
962 747
963int 748int
964command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
979 return 1; 764 return 1;
980 } 765 }
981 766
982 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
983 arg2++; 768 arg2++;
984 if (settings.real_wiz == FALSE) 769
985 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
986 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
987 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 771 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
988 else 772 else
989 {
990 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 773 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
991 }
992 774
993 return 1; 775 return 1;
994} 776}
995 777
996int 778int
… …
1045 827
1046 if (from != STACK_FROM_STACK) 828 if (from != STACK_FROM_STACK)
1047 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 829 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1048 dm_stack_pop (op->contr); 830 dm_stack_pop (op->contr);
1049 831
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 tmp->remove ();
1054 }
1055
1056 if (tmp->head) 832 if (tmp->head)
1057 tmp = tmp->head; 833 tmp = tmp->head;
1058 834
1059 tmp->destroy (); 835 tmp->destroy ();
1060 return 1; 836 return 1;
… …
1067command_addexp (object *op, char *params) 843command_addexp (object *op, char *params)
1068{ 844{
1069 char buf[MAX_BUF], skill[MAX_BUF]; 845 char buf[MAX_BUF], skill[MAX_BUF];
1070 int i, q; 846 int i, q;
1071 object *skillob = NULL; 847 object *skillob = NULL;
1072 player *pl;
1073 848
1074 skill[0] = '\0'; 849 skill[0] = '\0';
1075 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 850 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1076 { 851 {
1077 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 852 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1078 return 1; 853 return 1;
1079 } 854 }
1080 855
1081 for (pl = first_player; pl != NULL; pl = pl->next) 856 for_all_players (pl)
1082 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 857 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1083 break;
1084
1085 if (pl == NULL)
1086 { 858 {
1087 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1088 return 1;
1089 }
1090
1091 if (q >= 3) 859 if (q >= 3)
1092 { 860 {
1093 skillob = find_skill_by_name (pl->ob, skill); 861 skillob = find_skill_by_name (pl->ob, skill);
1094 if (!skillob) 862 if (!skillob)
1095 { 863 {
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 864 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
865 return 1;
866 }
867
868 i = check_exp_adjust (skillob, i);
869 skillob->stats.exp += i;
870 calc_perm_exp (skillob);
871 player_lvl_adj (pl->ob, skillob);
872 }
873
874 pl->ob->stats.exp += i;
875 calc_perm_exp (pl->ob);
876 player_lvl_adj (pl->ob, NULL);
877
1097 return 1; 878 return 1;
1098 } 879 }
1099 880
1100 i = check_exp_adjust (skillob, i); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1101 skillob->stats.exp += i;
1102 calc_perm_exp (skillob);
1103 player_lvl_adj (pl->ob, skillob);
1104 }
1105
1106 pl->ob->stats.exp += i;
1107 calc_perm_exp (pl->ob);
1108 player_lvl_adj (pl->ob, NULL);
1109
1110 if (settings.real_wiz == FALSE)
1111 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1112 return 1; 882 return 1;
1113} 883}
1114 884
1115/**************************************************************************/ 885/**************************************************************************/
1116 886
… …
1122 892
1123int 893int
1124command_stats (object *op, char *params) 894command_stats (object *op, char *params)
1125{ 895{
1126 char thing[20]; 896 char thing[20];
1127 player *pl;
1128 char buf[MAX_BUF]; 897 char buf[MAX_BUF];
1129 898
1130 thing[0] = '\0'; 899 thing[0] = '\0';
1131 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 900 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1132 { 901 {
1133 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1134 return 1; 903 return 1;
1135 } 904 }
1136 905
1137 for (pl = first_player; pl != NULL; pl = pl->next) 906 for_all_players (pl)
1138 if (!strcmp (pl->ob->name, thing)) 907 if (!strcmp (pl->ob->name, thing))
1139 { 908 {
1140 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 909 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1141 new_draw_info (NDI_UNIQUE, 0, op, buf); 910 new_draw_info (NDI_UNIQUE, 0, op, buf);
1142 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 911 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
… …
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 918 new_draw_info (NDI_UNIQUE, 0, op, buf);
1150 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 919 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 920 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 921 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 922 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 break; 923 return 1;
1155 } 924 }
1156 if (pl == NULL) 925
1157 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 926 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1158 return 1; 927 return 1;
1159} 928}
1160 929
1161int 930int
1162command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1163{ 932{
1164 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1165 int iii; 934 int iii;
1166 player *pl;
1167 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1168 936
1169 iii = 0; 937 iii = 0;
1170 thing[0] = '\0'; 938 thing[0] = '\0';
1171 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1185 { 953 {
1186 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 954 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1187 return 1; 955 return 1;
1188 } 956 }
1189 957
1190 for (pl = first_player; pl != NULL; pl = pl->next) 958 for_all_players (pl)
1191 { 959 {
1192 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1193 { 961 {
1194 if (settings.real_wiz == FALSE)
1195 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1196 if (!strcmp ("str", thing2))
1197 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 962 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1198 if (!strcmp ("dex", thing2))
1199 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 963 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1200 if (!strcmp ("con", thing2))
1201 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 964 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1202 if (!strcmp ("wis", thing2))
1203 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 965 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1204 if (!strcmp ("cha", thing2))
1205 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 966 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1206 if (!strcmp ("int", thing2))
1207 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 967 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1208 if (!strcmp ("pow", thing2))
1209 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 968 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
969
1210 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1211 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1212 fix_player (pl->ob); 972 pl->ob->update_stats ();
1213 return 1; 973 return 1;
1214 } 974 }
1215 } 975 }
1216 976
1217 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 977 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1218 return 1; 978 return 1;
1219} 979}
1220 980
1221int 981int
1222command_reset (object *op, char *params)
1223{
1224 maptile *m;
1225 object *dummy = NULL, *tmp = NULL;
1226
1227 if (params == NULL)
1228 {
1229 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1230 return 1;
1231 }
1232
1233 if (strcmp (params, ".") == 0)
1234 params = op->map->path;
1235
1236 m = has_been_loaded (params);
1237 if (m == NULL)
1238 {
1239 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1240 return 1;
1241 }
1242
1243 if (m->in_memory != MAP_SWAPPED)
1244 {
1245 if (m->in_memory != MAP_IN_MEMORY)
1246 {
1247 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1248 return 0;
1249 }
1250
1251 /*
1252 * Only attempt to remove the player that is doing the reset, and not other
1253 * players or wiz's.
1254 */
1255 if (op->map == m)
1256 {
1257 dummy = object::create ();
1258 dummy->map = NULL;
1259 EXIT_X (dummy) = op->x;
1260 EXIT_Y (dummy) = op->y;
1261 EXIT_PATH (dummy) = op->map->path;
1262 op->remove ();
1263 op->map = NULL;
1264 tmp = op;
1265 }
1266 swap_map (m);
1267 }
1268
1269 if (m->in_memory == MAP_SWAPPED)
1270 {
1271 LOG (llevDebug, "Resetting map %s.\n", m->path);
1272
1273 /* setting this effectively causes an immediate reload */
1274 m->reset_time = 1;
1275 flush_old_maps ();
1276 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1277
1278 if (tmp)
1279 {
1280 enter_exit (tmp, dummy);
1281 dummy->destroy ();
1282 }
1283
1284 return 1;
1285 }
1286 else
1287 {
1288 player *pl;
1289 int playercount = 0;
1290
1291 /* Need to re-insert player if swap failed for some reason */
1292 if (tmp)
1293 {
1294 insert_ob_in_map (op, m, NULL, 0);
1295 dummy->destroy ();
1296 }
1297
1298 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1299 for (pl = first_player; pl != NULL; pl = pl->next)
1300 {
1301 if (pl->ob->map == m && pl->ob != op)
1302 {
1303 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1304 playercount++;
1305 }
1306 }
1307 if (!playercount)
1308 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1309 return 1;
1310 }
1311}
1312
1313int
1314command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1315{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1316 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1317 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1318 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1319 987
1320 if (settings.real_wiz == TRUE)
1321 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1322 if (op->contr->hidden) 988 if (op->contr->hidden)
1323 { 989 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 990 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1325 op->map->players++; 991 op->map->players++;
1326 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 992 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1385 { 1051 {
1386 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1052 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1387 return 0; 1053 return 0;
1388 } 1054 }
1389 1055
1390 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket->host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1391 { 1057 {
1392 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1393 SET_FLAG (op, FLAG_WAS_WIZ);
1394 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1395 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1396 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1062 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1397 /* 1063 /*
1398 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1399 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1400 * is probably something like a wiz_force which gives that and any 1066 * is probably something like a wiz_force which gives that and any
1401 * other desired abilities. 1067 * other desired abilities.
1402 */ 1068 */
1403 clear_los (op); 1069 clear_los (op->contr);
1404 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1405 1071
1406 if (!silent) 1072 if (!silent)
1407 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1073 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1408 1074
… …
1435command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1436{ 1102{
1437 if (op) 1103 if (op)
1438 { 1104 {
1439 op->invisible += 100; 1105 op->invisible += 100;
1440 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1441 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1442 } 1108 }
1443 1109
1444 return 0; 1110 return 0;
1445} 1111}
… …
1457 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1458 */ 1124 */
1459static object * 1125static object *
1460get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1461{ 1127{
1462 archetype *ar; 1128 archetype *at;
1463 archetype *found; 1129 archetype *found;
1464 int conflict_found; 1130 int conflict_found;
1465 size_t spell_name_length; 1131 size_t spell_name_length;
1466 1132
1467 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1468 conflict_found = 0; 1134 conflict_found = 0;
1469 found = NULL; 1135 found = NULL;
1470 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1471 { 1137 {
1472 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1473 continue; 1139 continue;
1474 1140
1475 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1476 continue; 1142 continue;
1477 1143
1478 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1479 continue; 1145 continue;
1480 1146
1481 if (found != NULL) 1147 if (found != NULL)
1482 { 1148 {
1483 if (!conflict_found) 1149 if (!conflict_found)
1484 { 1150 {
1485 conflict_found = 1; 1151 conflict_found = 1;
1486 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1152 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1487 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1488 } 1154 }
1155
1489 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1490 continue; 1157 continue;
1491 } 1158 }
1492 1159
1493 found = ar; 1160 found = at;
1494 } 1161 }
1495 1162
1496 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1497 if (conflict_found) 1164 if (conflict_found)
1498 return NULL; 1165 return NULL;
… …
1503 1170
1504 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1505 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1506 conflict_found = 0; 1173 conflict_found = 0;
1507 found = NULL; 1174 found = NULL;
1508 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1509 { 1176 {
1510 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1511 continue; 1178 continue;
1512 1179
1513 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1514 continue; 1181 continue;
1515 1182
1516 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1517 continue; 1184 continue;
1518 1185
1519 if (found != NULL) 1186 if (found != NULL)
1520 { 1187 {
1521 if (!conflict_found) 1188 if (!conflict_found)
1522 { 1189 {
1523 conflict_found = 1; 1190 conflict_found = 1;
1524 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1191 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1525 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1192 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1526 } 1193 }
1527 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1194 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1528 continue; 1195 continue;
1529 } 1196 }
1530 1197
1531 found = ar; 1198 found = at;
1532 } 1199 }
1533 1200
1534 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1535 if (conflict_found) 1202 if (conflict_found)
1536 return NULL; 1203 return NULL;

Diff Legend

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