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.34 by root, Mon Feb 5 01:24:46 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>
… …
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;
… …
488 * we also set up spell_name which is only 423 * we also set up spell_name which is only
489 * the first word. 424 * the first word.
490 */ 425 */
491 426
492 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
493 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
494 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
495 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
496 { 431 {
497 assign (spell_name, cp); 432 assign (spell_name, cp);
498 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
499 if (fsp) 434 if (fsp)
500 { 435 {
501 *fsp = 0; 436 *fsp = 0;
502 fsp++; 437 fsp++;
503 at_spell = archetype::find (spell_name); 438 at_spell = archetype::find (spell_name);
504 439
505 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
506 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
507 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
508 else 443 else
509 at_spell = NULL; 444 at_spell = NULL;
510 } 445 }
511 } 446 }
… …
513 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
514 * in this case means its an artifact. 449 * in this case means its an artifact.
515 */ 450 */
516 if (!at_spell) 451 if (!at_spell)
517 { 452 {
518 if (find_artifactlist (at->clone.type) == NULL) 453 if (find_artifactlist (at->type) == NULL)
519 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);
520 else 455 else
521 { 456 {
522 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
523 458
524 do 459 while (art)
525 { 460 {
526 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
527 break; 462 break;
463
528 art = art->next; 464 art = art->next;
529 } 465 }
530 while (art != NULL);
531 466
532 if (!art) 467 if (!art)
533 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);
534 } 469 }
535 470
536 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);
537 } 472 }
538 } /* if cp */ 473 } /* if cp */
539 474
540 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
541 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
542 { 477 {
543 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);
544 return 1; 479 return 1;
545 } 480 }
546 481
… …
548 * 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,
549 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
550 * 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.
551 */ 486 */
552 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
553
554 if (settings.real_wiz == FALSE)
555 SET_FLAG (tmp, FLAG_WAS_WIZ);
556 488
557 if (set_magic) 489 if (set_magic)
558 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
559 491
560 if (art) 492 if (art)
… …
640 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);
641 573
642 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
643 } 575 }
644 576
645 if (at->clone.nrof) 577 if (at->nrof)
646 { 578 {
647 if (at_spell) 579 if (at_spell)
648 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
649 581
650 tmp->x = op->x; 582 tmp->x = op->x;
… …
665 } 597 }
666 else 598 else
667 { 599 {
668 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
669 { 601 {
670 archetype *atmp;
671 object *prev = 0, *head = 0; 602 object *prev = 0, *head = 0;
672 603
673 for (atmp = at; atmp; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
674 { 605 {
675 object *dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
676 607
677 if (at_spell) 608 if (at_spell)
678 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
685 { 616 {
686 head = dup; 617 head = dup;
687 tmp->copy_to (dup); 618 tmp->copy_to (dup);
688 } 619 }
689 620
690 if (settings.real_wiz == FALSE)
691 SET_FLAG (dup, FLAG_WAS_WIZ);
692
693 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
694 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
695 dup->map = op->map; 623 dup->map = op->map;
696 624
697 if (head != dup) 625 if (head != dup)
698 { 626 {
699 dup->head = head; 627 dup->head = head;
… …
709 int size_x = 0; 637 int size_x = 0;
710 int size_y = 0; 638 int size_y = 0;
711 639
712 while (check) 640 while (check)
713 { 641 {
714 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
715 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
716 check = check->more; 644 check = check->more;
717 } 645 }
718 646
719 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))
720 { 648 {
… …
746 /* 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
747 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
748 */ 676 */
749 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
750 678
751 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
752 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
753 681
754 esrv_send_item (op, head); 682 esrv_send_item (op, head);
755 } 683 }
756 684
757 /* free the one we used to copy */ 685 /* free the one we used to copy */
… …
812 free (dump); 740 free (dump);
813 741
814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816 744
817 return 1;
818}
819
820/**
821 * When DM is possessing a monster, flip aggression on and off, to allow
822 * better motion.
823 */
824int
825command_mon_aggr (object *op, char *params)
826{
827 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
828 {
829 op->enemy = NULL;
830 SET_FLAG (op, FLAG_UNAGGRESSIVE);
831 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
832 }
833 else
834 {
835 CLEAR_FLAG (op, FLAG_FRIENDLY);
836 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
837 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
838 }
839
840 return 1;
841}
842
843/** DM can possess a monster. Basically, this tricks the client into thinking
844 * a given monster, is actually the player it controls. This allows a DM
845 * to inhabit a monster's body, and run around the game with it.
846 * This function is severely broken - it has tons of hardcoded values,
847 */
848int
849command_possess (object *op, char *params)
850{
851 object *victim, *curinv, *nextinv;
852 player *pl;
853 int i;
854 char buf[MAX_BUF];
855
856 victim = NULL;
857 if (params != NULL)
858 {
859 if (sscanf (params, "%d", &i))
860 victim = find_object (i);
861 else if (sscanf (params, "%s", buf))
862 victim = find_object_name (buf);
863 }
864 if (victim == NULL)
865 {
866 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
867 return 1;
868 }
869
870 if (victim == op)
871 {
872 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
873 return 1;
874 }
875
876 /* clear out the old inventory */
877 curinv = op->inv;
878 while (curinv != NULL)
879 {
880 nextinv = curinv->below;
881 esrv_del_item (op->contr, curinv->count);
882 curinv = nextinv;
883 }
884
885 /* make the switch */
886 pl = op->contr;
887 victim->contr = pl;
888 pl->ob = victim;
889 victim->type = PLAYER;
890 SET_FLAG (victim, FLAG_WIZ);
891
892 /* send the inventory to the client */
893 curinv = victim->inv;
894 while (curinv != NULL)
895 {
896 nextinv = curinv->below;
897 esrv_send_item (victim, curinv);
898 curinv = nextinv;
899 }
900 /* basic patchup */
901 /* The use of hard coded values is terrible. Note
902 * that really, to be fair, this shouldn't get changed at
903 * all - if you are possessing a kobold, you should have the
904 * same limitations. As it is, as more body locations are added,
905 * this will give this player more locations than perhaps
906 * they should be allowed.
907 */
908 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
909 if (i == 1 || i == 6 || i == 8 || i == 9)
910 victim->body_info[i] = 2;
911 else
912 victim->body_info[i] = 1;
913
914 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
915 esrv_send_inventory (victim, victim);
916
917 victim->update_stats ();
918
919 do_some_living (victim);
920 return 1; 745 return 1;
921} 746}
922 747
923int 748int
924command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
939 return 1; 764 return 1;
940 } 765 }
941 766
942 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
943 arg2++; 768 arg2++;
944 if (settings.real_wiz == FALSE) 769
945 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
946 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
947 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);
948 else 772 else
949 {
950 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);
951 }
952 774
953 return 1; 775 return 1;
954} 776}
955 777
956int 778int
… …
1050 } 872 }
1051 873
1052 pl->ob->stats.exp += i; 874 pl->ob->stats.exp += i;
1053 calc_perm_exp (pl->ob); 875 calc_perm_exp (pl->ob);
1054 player_lvl_adj (pl->ob, NULL); 876 player_lvl_adj (pl->ob, NULL);
1055
1056 if (settings.real_wiz == FALSE)
1057 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1058 877
1059 return 1; 878 return 1;
1060 } 879 }
1061 880
1062 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
… …
1111int 930int
1112command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1113{ 932{
1114 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1115 int iii; 934 int iii;
1116 player *pl;
1117 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1118 936
1119 iii = 0; 937 iii = 0;
1120 thing[0] = '\0'; 938 thing[0] = '\0';
1121 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1139 957
1140 for_all_players (pl) 958 for_all_players (pl)
1141 { 959 {
1142 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1143 { 961 {
1144 if (settings.real_wiz == FALSE)
1145 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1146 if (!strcmp ("str", thing2))
1147 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;
1148 if (!strcmp ("dex", thing2))
1149 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;
1150 if (!strcmp ("con", thing2))
1151 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;
1152 if (!strcmp ("wis", thing2))
1153 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;
1154 if (!strcmp ("cha", thing2))
1155 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;
1156 if (!strcmp ("int", thing2))
1157 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;
1158 if (!strcmp ("pow", thing2))
1159 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
1160 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1161 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1162 pl->ob->update_stats (); 972 pl->ob->update_stats ();
1163 return 1; 973 return 1;
1164 } 974 }
… …
1168 return 1; 978 return 1;
1169} 979}
1170 980
1171int 981int
1172command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1173{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1174 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1175 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1176 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1177 987
1178 if (settings.real_wiz == TRUE)
1179 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1180 if (op->contr->hidden) 988 if (op->contr->hidden)
1181 { 989 {
1182 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");
1183 op->map->players++; 991 op->map->players++;
1184 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);
… …
1246 } 1054 }
1247 1055
1248 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1249 { 1057 {
1250 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1251 SET_FLAG (op, FLAG_WAS_WIZ);
1252 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1253 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1254 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!");
1255 /* 1063 /*
1256 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1257 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1258 * 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
1259 * other desired abilities. 1067 * other desired abilities.
1260 */ 1068 */
1261 clear_los (op); 1069 clear_los (op->contr);
1262 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1263 1071
1264 if (!silent) 1072 if (!silent)
1265 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!");
1266 1074
… …
1293command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1294{ 1102{
1295 if (op) 1103 if (op)
1296 { 1104 {
1297 op->invisible += 100; 1105 op->invisible += 100;
1298 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1299 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1300 } 1108 }
1301 1109
1302 return 0; 1110 return 0;
1303} 1111}
… …
1315 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1316 */ 1124 */
1317static object * 1125static object *
1318get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1319{ 1127{
1320 archetype *ar; 1128 archetype *at;
1321 archetype *found; 1129 archetype *found;
1322 int conflict_found; 1130 int conflict_found;
1323 size_t spell_name_length; 1131 size_t spell_name_length;
1324 1132
1325 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1326 conflict_found = 0; 1134 conflict_found = 0;
1327 found = NULL; 1135 found = NULL;
1328 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1329 { 1137 {
1330 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1331 continue; 1139 continue;
1332 1140
1333 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1334 continue; 1142 continue;
1335 1143
1336 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1337 continue; 1145 continue;
1338 1146
1339 if (found != NULL) 1147 if (found != NULL)
1340 { 1148 {
1341 if (!conflict_found) 1149 if (!conflict_found)
1342 { 1150 {
1343 conflict_found = 1; 1151 conflict_found = 1;
1344 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);
1345 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1346 } 1154 }
1155
1347 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1348 continue; 1157 continue;
1349 } 1158 }
1350 1159
1351 found = ar; 1160 found = at;
1352 } 1161 }
1353 1162
1354 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1355 if (conflict_found) 1164 if (conflict_found)
1356 return NULL; 1165 return NULL;
… …
1361 1170
1362 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1363 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1364 conflict_found = 0; 1173 conflict_found = 0;
1365 found = NULL; 1174 found = NULL;
1366 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1367 { 1176 {
1368 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1369 continue; 1178 continue;
1370 1179
1371 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1372 continue; 1181 continue;
1373 1182
1374 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1375 continue; 1184 continue;
1376 1185
1377 if (found != NULL) 1186 if (found != NULL)
1378 { 1187 {
1379 if (!conflict_found) 1188 if (!conflict_found)
1380 { 1189 {
1381 conflict_found = 1; 1190 conflict_found = 1;
1382 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);
1383 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);
1384 } 1193 }
1385 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);
1386 continue; 1195 continue;
1387 } 1196 }
1388 1197
1389 found = ar; 1198 found = at;
1390 } 1199 }
1391 1200
1392 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1393 if (conflict_found) 1202 if (conflict_found)
1394 return NULL; 1203 return NULL;

Diff Legend

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