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.32 by pippijn, Mon Jan 15 21:06:20 2007 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 (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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <spells.h> 26#include <spells.h>
… …
86 op->contr->hidden = 0; 85 op->contr->hidden = 0;
87 op->invisible = 1; 86 op->invisible = 1;
88 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");
89 op->map->players++; 88 op->map->players++;
90 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
91 if (!silent_dm) 91 if (!silent_dm)
92 {
93 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!");
94 }
95 } 93 }
96 else 94 else
97 { 95 {
98 op->contr->hidden = 1; 96 op->contr->hidden = 1;
99 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.");
100 op->map->players--; 98 op->map->players--;
99
101 if (!silent_dm) 100 if (!silent_dm)
102 {
103 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..");
104 } 102
105 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);
106 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);
107 } 105 }
108} 106}
109 107
… …
173 171
174 become_follower (ob, god); 172 become_follower (ob, god);
175 return 1; 173 return 1;
176} 174}
177 175
178/** 176// 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 177int
229command_kick (object *op, char *params) 178command_kick (object *op, char *params)
230{ 179{
231 for_all_players (pl) 180 for_all_players (pl)
232 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)))
… …
266 ready_map_name (op->map->path, 0); 215 ready_map_name (op->map->path, 0);
267 216
268 return 1; 217 return 1;
269} 218}
270#endif 219#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 220
287int 221int
288command_freeze (object *op, char *params) 222command_freeze (object *op, char *params)
289{ 223{
290 int ticks; 224 int ticks;
… …
488 * we also set up spell_name which is only 422 * we also set up spell_name which is only
489 * the first word. 423 * the first word.
490 */ 424 */
491 425
492 at_spell = archetype::find (cp); 426 at_spell = archetype::find (cp);
493 if (!at_spell || at_spell->clone.type != SPELL) 427 if (!at_spell || at_spell->type != SPELL)
494 at_spell = find_archetype_by_object_name (cp); 428 at_spell = find_archetype_by_object_name (cp);
495 if (!at_spell || at_spell->clone.type != SPELL) 429 if (!at_spell || at_spell->type != SPELL)
496 { 430 {
497 strcpy (spell_name, cp); 431 assign (spell_name, cp);
498 fsp = strchr (spell_name, ' '); 432 fsp = strchr (spell_name, ' ');
499 if (fsp) 433 if (fsp)
500 { 434 {
501 *fsp = 0; 435 *fsp = 0;
502 fsp++; 436 fsp++;
503 at_spell = archetype::find (spell_name); 437 at_spell = archetype::find (spell_name);
504 438
505 /* Got a spell, update the first string pointer */ 439 /* Got a spell, update the first string pointer */
506 if (at_spell && at_spell->clone.type == SPELL) 440 if (at_spell && at_spell->type == SPELL)
507 bp2 = cp + strlen (spell_name) + 1; 441 bp2 = cp + strlen (spell_name) + 1;
508 else 442 else
509 at_spell = NULL; 443 at_spell = NULL;
510 } 444 }
511 } 445 }
… …
513 /* OK - we didn't find a spell - presume the 'of' 447 /* OK - we didn't find a spell - presume the 'of'
514 * in this case means its an artifact. 448 * in this case means its an artifact.
515 */ 449 */
516 if (!at_spell) 450 if (!at_spell)
517 { 451 {
518 if (find_artifactlist (at->clone.type) == NULL) 452 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); 453 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
520 else 454 else
521 { 455 {
522 art = find_artifactlist (at->clone.type)->items; 456 art = find_artifactlist (at->type)->items;
523 457
524 do 458 while (art)
525 { 459 {
526 if (!strcmp (art->item->name, cp)) 460 if (!strcmp (art->item->name, cp))
527 break; 461 break;
462
528 art = art->next; 463 art = art->next;
529 } 464 }
530 while (art != NULL);
531 465
532 if (!art) 466 if (!art)
533 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);
534 } 468 }
535 469
536 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);
537 } 471 }
538 } /* if cp */ 472 } /* if cp */
539 473
540 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 474 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
541 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 475 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
542 { 476 {
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); 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);
544 return 1; 478 return 1;
545 } 479 }
546 480
… …
548 * 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,
549 * just create one object, do all the processing, and then determine 483 * 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. 484 * if that one object should be inserted or if we need to make copies.
551 */ 485 */
552 tmp = arch_to_object (at); 486 tmp = arch_to_object (at);
553
554 if (settings.real_wiz == FALSE)
555 SET_FLAG (tmp, FLAG_WAS_WIZ);
556 487
557 if (set_magic) 488 if (set_magic)
558 set_abs_magic (tmp, magic); 489 set_abs_magic (tmp, magic);
559 490
560 if (art) 491 if (art)
… …
640 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);
641 572
642 bp2 = bp3 + 1; 573 bp2 = bp3 + 1;
643 } 574 }
644 575
645 if (at->clone.nrof) 576 if (at->nrof)
646 { 577 {
647 if (at_spell) 578 if (at_spell)
648 insert_ob_in_ob (arch_to_object (at_spell), tmp); 579 insert_ob_in_ob (arch_to_object (at_spell), tmp);
649 580
650 tmp->x = op->x; 581 tmp->x = op->x;
… …
665 } 596 }
666 else 597 else
667 { 598 {
668 for (i = 0; i < (set_nrof ? nrof : 1); i++) 599 for (i = 0; i < (set_nrof ? nrof : 1); i++)
669 { 600 {
670 archetype *atmp;
671 object *prev = 0, *head = 0; 601 object *prev = 0, *head = 0;
672 602
673 for (atmp = at; atmp; atmp = atmp->more) 603 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
674 { 604 {
675 object *dup = arch_to_object (atmp); 605 object *dup = arch_to_object (atmp);
676 606
677 if (at_spell) 607 if (at_spell)
678 insert_ob_in_ob (arch_to_object (at_spell), dup); 608 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
685 { 615 {
686 head = dup; 616 head = dup;
687 tmp->copy_to (dup); 617 tmp->copy_to (dup);
688 } 618 }
689 619
690 if (settings.real_wiz == FALSE)
691 SET_FLAG (dup, FLAG_WAS_WIZ);
692
693 dup->x = op->x + dup->arch->clone.x; 620 dup->x = op->x + dup->arch->x;
694 dup->y = op->y + dup->arch->clone.y; 621 dup->y = op->y + dup->arch->y;
695 dup->map = op->map; 622 dup->map = op->map;
696 623
697 if (head != dup) 624 if (head != dup)
698 { 625 {
699 dup->head = head; 626 dup->head = head;
… …
709 int size_x = 0; 636 int size_x = 0;
710 int size_y = 0; 637 int size_y = 0;
711 638
712 while (check) 639 while (check)
713 { 640 {
714 size_x = MAX (size_x, check->arch->clone.x); 641 size_x = MAX (size_x, check->arch->x);
715 size_y = MAX (size_y, check->arch->clone.y); 642 size_y = MAX (size_y, check->arch->y);
716 check = check->more; 643 check = check->more;
717 } 644 }
718 645
719 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))
720 { 647 {
… …
746 /* 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
747 * things like rods have nrof 0, we want to cover those. 674 * things like rods have nrof 0, we want to cover those.
748 */ 675 */
749 dm_stack_push (op->contr, head->count); 676 dm_stack_push (op->contr, head->count);
750 677
751 if (at->clone.randomitems != NULL && !at_spell) 678 if (at->randomitems != NULL && !at_spell)
752 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 679 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
753 680
754 esrv_send_item (op, head); 681 esrv_send_item (op, head);
755 } 682 }
756 683
757 /* free the one we used to copy */ 684 /* free the one we used to copy */
… …
812 free (dump); 739 free (dump);
813 740
814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 741 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 742 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816 743
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; 744 return 1;
921} 745}
922 746
923int 747int
924command_patch (object *op, char *params) 748command_patch (object *op, char *params)
… …
939 return 1; 763 return 1;
940 } 764 }
941 765
942 if ((arg2 = strchr (arg, ' '))) 766 if ((arg2 = strchr (arg, ' ')))
943 arg2++; 767 arg2++;
944 if (settings.real_wiz == FALSE) 768
945 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
946 if (set_variable (tmp, arg) == -1) 769 if (set_variable (tmp, arg) == -1)
947 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);
948 else 771 else
949 {
950 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);
951 }
952 773
953 return 1; 774 return 1;
954} 775}
955 776
956int 777int
… …
1005 826
1006 if (from != STACK_FROM_STACK) 827 if (from != STACK_FROM_STACK)
1007 /* 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 */
1008 dm_stack_pop (op->contr); 829 dm_stack_pop (op->contr);
1009 830
1010 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1011 {
1012 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1013 tmp->remove ();
1014 }
1015
1016 if (tmp->head) 831 if (tmp->head)
1017 tmp = tmp->head; 832 tmp = tmp->head;
1018 833
1019 tmp->destroy (); 834 tmp->destroy ();
1020 return 1; 835 return 1;
… …
1025 */ 840 */
1026int 841int
1027command_addexp (object *op, char *params) 842command_addexp (object *op, char *params)
1028{ 843{
1029 char buf[MAX_BUF], skill[MAX_BUF]; 844 char buf[MAX_BUF], skill[MAX_BUF];
1030 int i, q; 845 int q;
846 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1031 object *skillob = NULL; 847 object *skillob = NULL;
1032 848
1033 skill[0] = '\0'; 849 skill[0] = '\0';
1034 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))
1035 { 851 {
1036 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>].");
1037 return 1; 853 return 1;
1038 } 854 }
1039 855
… …
1056 } 872 }
1057 873
1058 pl->ob->stats.exp += i; 874 pl->ob->stats.exp += i;
1059 calc_perm_exp (pl->ob); 875 calc_perm_exp (pl->ob);
1060 player_lvl_adj (pl->ob, NULL); 876 player_lvl_adj (pl->ob, NULL);
1061
1062 if (settings.real_wiz == FALSE)
1063 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1064 877
1065 return 1; 878 return 1;
1066 } 879 }
1067 880
1068 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
… …
1117int 930int
1118command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1119{ 932{
1120 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1121 int iii; 934 int iii;
1122 player *pl;
1123 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1124 936
1125 iii = 0; 937 iii = 0;
1126 thing[0] = '\0'; 938 thing[0] = '\0';
1127 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1145 957
1146 for_all_players (pl) 958 for_all_players (pl)
1147 { 959 {
1148 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1149 { 961 {
1150 if (settings.real_wiz == FALSE)
1151 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1152 if (!strcmp ("str", thing2))
1153 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;
1154 if (!strcmp ("dex", thing2))
1155 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;
1156 if (!strcmp ("con", thing2))
1157 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;
1158 if (!strcmp ("wis", thing2))
1159 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;
1160 if (!strcmp ("cha", thing2))
1161 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;
1162 if (!strcmp ("int", thing2))
1163 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;
1164 if (!strcmp ("pow", thing2))
1165 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
1166 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1167 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1168 pl->ob->update_stats (); 972 pl->ob->update_stats ();
1169 return 1; 973 return 1;
1170 } 974 }
… …
1174 return 1; 978 return 1;
1175} 979}
1176 980
1177int 981int
1178command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1179{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1180 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1181 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1182 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1183 987
1184 if (settings.real_wiz == TRUE)
1185 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1186 if (op->contr->hidden) 988 if (op->contr->hidden)
1187 { 989 {
1188 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");
1189 op->map->players++; 991 op->map->players++;
1190 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);
… …
1252 } 1054 }
1253 1055
1254 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1255 { 1057 {
1256 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1257 SET_FLAG (op, FLAG_WAS_WIZ);
1258 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1259 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1260 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!");
1261 /* 1063 /*
1262 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1263 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1264 * 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
1265 * other desired abilities. 1067 * other desired abilities.
1266 */ 1068 */
1267 clear_los (op); 1069 clear_los (op->contr);
1268 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1269 1071
1270 if (!silent) 1072 if (!silent)
1271 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!");
1272 1074
… …
1299command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1300{ 1102{
1301 if (op) 1103 if (op)
1302 { 1104 {
1303 op->invisible += 100; 1105 op->invisible += 100;
1304 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1305 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1306 } 1108 }
1307 1109
1308 return 0; 1110 return 0;
1309} 1111}
… …
1321 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1322 */ 1124 */
1323static object * 1125static object *
1324get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1325{ 1127{
1326 archetype *ar; 1128 archetype *at;
1327 archetype *found; 1129 archetype *found;
1328 int conflict_found; 1130 int conflict_found;
1329 size_t spell_name_length; 1131 size_t spell_name_length;
1330 1132
1331 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1332 conflict_found = 0; 1134 conflict_found = 0;
1333 found = NULL; 1135 found = NULL;
1334 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1335 { 1137 {
1336 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1337 continue; 1139 continue;
1338 1140
1339 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1340 continue; 1142 continue;
1341 1143
1342 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1343 continue; 1145 continue;
1344 1146
1345 if (found != NULL) 1147 if (found != NULL)
1346 { 1148 {
1347 if (!conflict_found) 1149 if (!conflict_found)
1348 { 1150 {
1349 conflict_found = 1; 1151 conflict_found = 1;
1350 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);
1351 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1352 } 1154 }
1155
1353 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1354 continue; 1157 continue;
1355 } 1158 }
1356 1159
1357 found = ar; 1160 found = at;
1358 } 1161 }
1359 1162
1360 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1361 if (conflict_found) 1164 if (conflict_found)
1362 return NULL; 1165 return NULL;
… …
1367 1170
1368 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1369 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1370 conflict_found = 0; 1173 conflict_found = 0;
1371 found = NULL; 1174 found = NULL;
1372 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1373 { 1176 {
1374 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1375 continue; 1178 continue;
1376 1179
1377 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1378 continue; 1181 continue;
1379 1182
1380 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1381 continue; 1184 continue;
1382 1185
1383 if (found != NULL) 1186 if (found != NULL)
1384 { 1187 {
1385 if (!conflict_found) 1188 if (!conflict_found)
1386 { 1189 {
1387 conflict_found = 1; 1190 conflict_found = 1;
1388 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);
1389 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);
1390 } 1193 }
1391 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);
1392 continue; 1195 continue;
1393 } 1196 }
1394 1197
1395 found = ar; 1198 found = at;
1396 } 1199 }
1397 1200
1398 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1399 if (conflict_found) 1202 if (conflict_found)
1400 return NULL; 1203 return NULL;

Diff Legend

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