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

Diff Legend

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