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.30 by pippijn, Sat Jan 6 14:42:30 2007 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 (at your option) any later version. 11 * any later version.
12 12 *
13 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
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 GNU General Public License for more details. 16 * for more details.
17 17 *
18 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
19 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
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 *
22 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>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <spells.h> 27#include <spells.h>
28#include <treasure.h> 28#include <treasure.h>
… …
86 op->contr->hidden = 0; 86 op->contr->hidden = 0;
87 op->invisible = 1; 87 op->invisible = 1;
88 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");
89 op->map->players++; 89 op->map->players++;
90 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
91 if (!silent_dm) 92 if (!silent_dm)
92 {
93 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!");
94 }
95 } 94 }
96 else 95 else
97 { 96 {
98 op->contr->hidden = 1; 97 op->contr->hidden = 1;
99 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.");
100 op->map->players--; 99 op->map->players--;
100
101 if (!silent_dm) 101 if (!silent_dm)
102 {
103 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..");
104 } 103
105 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);
106 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);
107 } 106 }
108} 107}
109 108
… …
173 172
174 become_follower (ob, god); 173 become_follower (ob, god);
175 return 1; 174 return 1;
176} 175}
177 176
178/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
179 * Add player's IP to ban_file and kick them off the server
180 * I know most people have dynamic IPs but this is more of a short term
181 * solution if they have to get a new IP to play maybe they'll calm down.
182 * This uses the banish_file in the local directory *not* the ban_file
183 * The action is logged with a ! for easy searching. -tm
184 */
185int
186command_banish (object *op, char *params)
187{
188 player *pl;
189 FILE *banishfile;
190 char buf[MAX_BUF];
191 time_t now;
192
193 if (!params)
194 {
195 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
196 return 1;
197 }
198
199 pl = get_other_player_from_name (op, params);
200 if (!pl)
201 return 1;
202
203 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
204
205 if ((banishfile = fopen (buf, "a")) == NULL)
206 {
207 LOG (llevDebug, "Could not find file banish_file.\n");
208 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
209 return 0;
210 }
211
212 now = time (NULL);
213 /*
214 * Record this as a comment - then we don't have to worry about changing
215 * the parsing code.
216 */
217 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
218 fprintf (banishfile, "*@%s\n", pl->ns->host);
219 fclose (banishfile);
220
221 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
222 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
223 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
224 command_kick (op, (char *) &pl->ob->name);
225 return 1;
226}
227
228int 178int
229command_kick (object *op, char *params) 179command_kick (object *op, char *params)
230{ 180{
231 for_all_players (pl) 181 for_all_players (pl)
232 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)))
… …
266 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
267 217
268 return 1; 218 return 1;
269} 219}
270#endif 220#endif
271
272int
273command_shutdown (object *op, char *params)
274{
275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
276 {
277 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
278 return 1;
279 }
280
281 cleanup ("dm initiated shutdown", 0);
282
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;
… …
389 pl->ob->enter_exit (dummy); 324 pl->ob->enter_exit (dummy);
390 dummy->destroy (); 325 dummy->destroy ();
391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
392 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
393 328
394 return 1;
395}
396
397/**
398 * Teleport next to target player.
399 */
400
401/* mids 01/16/2002 */
402int
403command_teleport (object *op, char *params)
404{
405 int i;
406 object *dummy;
407 player *pl;
408
409 if (!op)
410 return 0;
411
412 if (params == NULL)
413 {
414 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
415 return 1;
416 }
417
418 pl = get_other_player_from_name (op, params);
419 if (!pl)
420 return 1;
421
422 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
423 if (i == -1)
424 {
425 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
426 return 1;
427 }
428
429 dummy = object::create ();
430 EXIT_PATH (dummy) = pl->ob->map->path;
431 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
432 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
433 op->enter_exit (dummy);
434 dummy->destroy ();
435 if (!op->contr->hidden)
436 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
437 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
438 return 1; 329 return 1;
439} 330}
440 331
441/** 332/**
442 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
532 * we also set up spell_name which is only 423 * we also set up spell_name which is only
533 * the first word. 424 * the first word.
534 */ 425 */
535 426
536 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
538 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
539 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
540 { 431 {
541 strcpy (spell_name, cp); 432 assign (spell_name, cp);
542 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
543 if (fsp) 434 if (fsp)
544 { 435 {
545 *fsp = 0; 436 *fsp = 0;
546 fsp++; 437 fsp++;
547 at_spell = archetype::find (spell_name); 438 at_spell = archetype::find (spell_name);
548 439
549 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
550 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
551 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
552 else 443 else
553 at_spell = NULL; 444 at_spell = NULL;
554 } 445 }
555 } 446 }
… …
557 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
558 * in this case means its an artifact. 449 * in this case means its an artifact.
559 */ 450 */
560 if (!at_spell) 451 if (!at_spell)
561 { 452 {
562 if (find_artifactlist (at->clone.type) == NULL) 453 if (find_artifactlist (at->type) == NULL)
563 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);
564 else 455 else
565 { 456 {
566 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
567 458
568 do 459 while (art)
569 { 460 {
570 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
571 break; 462 break;
463
572 art = art->next; 464 art = art->next;
573 } 465 }
574 while (art != NULL);
575 466
576 if (!art) 467 if (!art)
577 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);
578 } 469 }
579 470
580 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);
581 } 472 }
582 } /* if cp */ 473 } /* if cp */
583 474
584 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
585 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
586 { 477 {
587 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);
588 return 1; 479 return 1;
589 } 480 }
590 481
… …
592 * 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,
593 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
594 * 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.
595 */ 486 */
596 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
597
598 if (settings.real_wiz == FALSE)
599 SET_FLAG (tmp, FLAG_WAS_WIZ);
600 488
601 if (set_magic) 489 if (set_magic)
602 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
603 491
604 if (art) 492 if (art)
… …
684 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);
685 573
686 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
687 } 575 }
688 576
689 if (at->clone.nrof) 577 if (at->nrof)
690 { 578 {
691 if (at_spell) 579 if (at_spell)
692 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
693 581
694 tmp->x = op->x; 582 tmp->x = op->x;
… …
709 } 597 }
710 else 598 else
711 { 599 {
712 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
713 { 601 {
714 archetype *atmp;
715 object *prev = 0, *head = 0; 602 object *prev = 0, *head = 0;
716 603
717 for (atmp = at; atmp; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
718 { 605 {
719 object *dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
720 607
721 if (at_spell) 608 if (at_spell)
722 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
729 { 616 {
730 head = dup; 617 head = dup;
731 tmp->copy_to (dup); 618 tmp->copy_to (dup);
732 } 619 }
733 620
734 if (settings.real_wiz == FALSE)
735 SET_FLAG (dup, FLAG_WAS_WIZ);
736
737 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
738 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
739 dup->map = op->map; 623 dup->map = op->map;
740 624
741 if (head != dup) 625 if (head != dup)
742 { 626 {
743 dup->head = head; 627 dup->head = head;
… …
753 int size_x = 0; 637 int size_x = 0;
754 int size_y = 0; 638 int size_y = 0;
755 639
756 while (check) 640 while (check)
757 { 641 {
758 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
759 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
760 check = check->more; 644 check = check->more;
761 } 645 }
762 646
763 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))
764 { 648 {
… …
790 /* 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
791 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
792 */ 676 */
793 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
794 678
795 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
796 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
797 681
798 esrv_send_item (op, head); 682 esrv_send_item (op, head);
799 } 683 }
800 684
801 /* free the one we used to copy */ 685 /* free the one we used to copy */
… …
856 free (dump); 740 free (dump);
857 741
858 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
859 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
860 744
861 return 1;
862}
863
864/**
865 * When DM is possessing a monster, flip aggression on and off, to allow
866 * better motion.
867 */
868int
869command_mon_aggr (object *op, char *params)
870{
871 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
872 {
873 op->enemy = NULL;
874 SET_FLAG (op, FLAG_UNAGGRESSIVE);
875 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
876 }
877 else
878 {
879 CLEAR_FLAG (op, FLAG_FRIENDLY);
880 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
881 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
882 }
883
884 return 1;
885}
886
887/** DM can possess a monster. Basically, this tricks the client into thinking
888 * a given monster, is actually the player it controls. This allows a DM
889 * to inhabit a monster's body, and run around the game with it.
890 * This function is severely broken - it has tons of hardcoded values,
891 */
892int
893command_possess (object *op, char *params)
894{
895 object *victim, *curinv, *nextinv;
896 player *pl;
897 int i;
898 char buf[MAX_BUF];
899
900 victim = NULL;
901 if (params != NULL)
902 {
903 if (sscanf (params, "%d", &i))
904 victim = find_object (i);
905 else if (sscanf (params, "%s", buf))
906 victim = find_object_name (buf);
907 }
908 if (victim == NULL)
909 {
910 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
911 return 1;
912 }
913
914 if (victim == op)
915 {
916 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
917 return 1;
918 }
919
920 /* clear out the old inventory */
921 curinv = op->inv;
922 while (curinv != NULL)
923 {
924 nextinv = curinv->below;
925 esrv_del_item (op->contr, curinv->count);
926 curinv = nextinv;
927 }
928
929 /* make the switch */
930 pl = op->contr;
931 victim->contr = pl;
932 pl->ob = victim;
933 victim->type = PLAYER;
934 SET_FLAG (victim, FLAG_WIZ);
935
936 /* send the inventory to the client */
937 curinv = victim->inv;
938 while (curinv != NULL)
939 {
940 nextinv = curinv->below;
941 esrv_send_item (victim, curinv);
942 curinv = nextinv;
943 }
944 /* basic patchup */
945 /* The use of hard coded values is terrible. Note
946 * that really, to be fair, this shouldn't get changed at
947 * all - if you are possessing a kobold, you should have the
948 * same limitations. As it is, as more body locations are added,
949 * this will give this player more locations than perhaps
950 * they should be allowed.
951 */
952 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
953 if (i == 1 || i == 6 || i == 8 || i == 9)
954 victim->body_info[i] = 2;
955 else
956 victim->body_info[i] = 1;
957
958 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
959 esrv_send_inventory (victim, victim);
960
961 victim->update_stats ();
962
963 do_some_living (victim);
964 return 1; 745 return 1;
965} 746}
966 747
967int 748int
968command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
983 return 1; 764 return 1;
984 } 765 }
985 766
986 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
987 arg2++; 768 arg2++;
988 if (settings.real_wiz == FALSE) 769
989 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
990 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
991 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);
992 else 772 else
993 {
994 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);
995 }
996 774
997 return 1; 775 return 1;
998} 776}
999 777
1000int 778int
… …
1048 } 826 }
1049 827
1050 if (from != STACK_FROM_STACK) 828 if (from != STACK_FROM_STACK)
1051 /* 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 */
1052 dm_stack_pop (op->contr); 830 dm_stack_pop (op->contr);
1053
1054 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1055 {
1056 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1057 tmp->remove ();
1058 }
1059 831
1060 if (tmp->head) 832 if (tmp->head)
1061 tmp = tmp->head; 833 tmp = tmp->head;
1062 834
1063 tmp->destroy (); 835 tmp->destroy ();
… …
1100 } 872 }
1101 873
1102 pl->ob->stats.exp += i; 874 pl->ob->stats.exp += i;
1103 calc_perm_exp (pl->ob); 875 calc_perm_exp (pl->ob);
1104 player_lvl_adj (pl->ob, NULL); 876 player_lvl_adj (pl->ob, NULL);
1105
1106 if (settings.real_wiz == FALSE)
1107 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1108 877
1109 return 1; 878 return 1;
1110 } 879 }
1111 880
1112 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
… …
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';
… …
1189 957
1190 for_all_players (pl) 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 pl->ob->update_stats (); 972 pl->ob->update_stats ();
1213 return 1; 973 return 1;
1214 } 974 }
… …
1218 return 1; 978 return 1;
1219} 979}
1220 980
1221int 981int
1222command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1223{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1224 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1225 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1226 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1227 987
1228 if (settings.real_wiz == TRUE)
1229 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1230 if (op->contr->hidden) 988 if (op->contr->hidden)
1231 { 989 {
1232 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");
1233 op->map->players++; 991 op->map->players++;
1234 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);
… …
1296 } 1054 }
1297 1055
1298 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1299 { 1057 {
1300 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1301 SET_FLAG (op, FLAG_WAS_WIZ);
1302 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1303 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1304 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!");
1305 /* 1063 /*
1306 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1307 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1308 * 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
1309 * other desired abilities. 1067 * other desired abilities.
1310 */ 1068 */
1311 clear_los (op); 1069 clear_los (op->contr);
1312 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1313 1071
1314 if (!silent) 1072 if (!silent)
1315 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!");
1316 1074
… …
1343command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1344{ 1102{
1345 if (op) 1103 if (op)
1346 { 1104 {
1347 op->invisible += 100; 1105 op->invisible += 100;
1348 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1349 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1350 } 1108 }
1351 1109
1352 return 0; 1110 return 0;
1353} 1111}
… …
1365 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1366 */ 1124 */
1367static object * 1125static object *
1368get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1369{ 1127{
1370 archetype *ar; 1128 archetype *at;
1371 archetype *found; 1129 archetype *found;
1372 int conflict_found; 1130 int conflict_found;
1373 size_t spell_name_length; 1131 size_t spell_name_length;
1374 1132
1375 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1376 conflict_found = 0; 1134 conflict_found = 0;
1377 found = NULL; 1135 found = NULL;
1378 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1379 { 1137 {
1380 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1381 continue; 1139 continue;
1382 1140
1383 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1384 continue; 1142 continue;
1385 1143
1386 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1387 continue; 1145 continue;
1388 1146
1389 if (found != NULL) 1147 if (found != NULL)
1390 { 1148 {
1391 if (!conflict_found) 1149 if (!conflict_found)
1392 { 1150 {
1393 conflict_found = 1; 1151 conflict_found = 1;
1394 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);
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1396 } 1154 }
1155
1397 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1398 continue; 1157 continue;
1399 } 1158 }
1400 1159
1401 found = ar; 1160 found = at;
1402 } 1161 }
1403 1162
1404 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1405 if (conflict_found) 1164 if (conflict_found)
1406 return NULL; 1165 return NULL;
… …
1411 1170
1412 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1413 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1414 conflict_found = 0; 1173 conflict_found = 0;
1415 found = NULL; 1174 found = NULL;
1416 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1417 { 1176 {
1418 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1419 continue; 1178 continue;
1420 1179
1421 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1422 continue; 1181 continue;
1423 1182
1424 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1425 continue; 1184 continue;
1426 1185
1427 if (found != NULL) 1186 if (found != NULL)
1428 { 1187 {
1429 if (!conflict_found) 1188 if (!conflict_found)
1430 { 1189 {
1431 conflict_found = 1; 1190 conflict_found = 1;
1432 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);
1433 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);
1434 } 1193 }
1435 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);
1436 continue; 1195 continue;
1437 } 1196 }
1438 1197
1439 found = ar; 1198 found = at;
1440 } 1199 }
1441 1200
1442 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1443 if (conflict_found) 1202 if (conflict_found)
1444 return NULL; 1203 return NULL;

Diff Legend

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