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.28 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.47 by root, Mon Jun 4 13:04:00 2007 UTC

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

Diff Legend

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