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.38 by pippijn, Fri Mar 2 13:43:59 2007 UTC vs.
Revision 1.61 by root, Sat Dec 20 02:32:31 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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>
… …
179command_kick (object *op, char *params) 178command_kick (object *op, char *params)
180{ 179{
181 for_all_players (pl) 180 for_all_players (pl)
182 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)))
183 { 182 {
184 object *op = pl->ob; 183 object *plop = pl->ob;
185 184
186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
187 { 186 {
188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &plop->name);
189 strcpy (op->contr->killer, "kicked"); 188 plop->contr->killer = op;
190 } 189 }
191 190
192 pl->ns->destroy (); 191 pl->ns->destroy ();
193 } 192 }
194 193
195 return 1;
196}
197
198/**
199 * Add player's IP to ban_file and kick them off the server
200 * I know most people have dynamic IPs but this is more of a short term
201 * solution if they have to get a new IP to play maybe they'll calm down.
202 * This uses the banish_file in the local directory *not* the ban_file
203 * The action is logged with a ! for easy searching. -tm
204 */
205int
206command_banish (object *op, char *params)
207{
208 player *pl;
209 FILE *banishfile;
210 char buf[MAX_BUF];
211 time_t now;
212
213 if (!params)
214 {
215 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
216 return 1;
217 }
218
219 pl = get_other_player_from_name (op, params);
220 if (!pl)
221 return 1;
222
223 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
224
225 if ((banishfile = fopen (buf, "a")) == NULL)
226 {
227 LOG (llevDebug, "Could not find file banish_file.\n");
228 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
229 return 0;
230 }
231
232 now = time (NULL);
233 /*
234 * Record this as a comment - then we don't have to worry about changing
235 * the parsing code.
236 */
237 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
238 fprintf (banishfile, "*@%s\n", pl->ns->host);
239 fclose (banishfile);
240
241 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
242 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
243 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
244 command_kick (op, (char *) &pl->ob->name);
245 return 1; 194 return 1;
246} 195}
247 196
248//TODO 197//TODO
249#if 0 198#if 0
… …
330 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
331 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 280 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
332 return 0; 281 return 0;
333 } 282 }
334 283
335 pl->ob->enter_exit (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
336 dummy->destroy (); 285 dummy->destroy ();
286
337 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
338 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
339 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
340 return 1; 290 return 1;
341} 291}
… …
365 { 315 {
366 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
367 return 1; 317 return 1;
368 } 318 }
369 319
370 dummy = object::create (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
371 EXIT_PATH (dummy) = op->map->path;
372 EXIT_X (dummy) = op->x + freearr_x[i];
373 EXIT_Y (dummy) = op->y + freearr_y[i];
374 pl->ob->enter_exit (dummy);
375 dummy->destroy ();
376 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
377 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
378 323
379 return 1; 324 return 1;
380} 325}
… …
473 * we also set up spell_name which is only 418 * we also set up spell_name which is only
474 * the first word. 419 * the first word.
475 */ 420 */
476 421
477 at_spell = archetype::find (cp); 422 at_spell = archetype::find (cp);
478 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
479 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
480 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
481 { 426 {
482 assign (spell_name, cp); 427 assign (spell_name, cp);
483 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
484 if (fsp) 429 if (fsp)
485 { 430 {
486 *fsp = 0; 431 *fsp = 0;
487 fsp++; 432 fsp++;
488 at_spell = archetype::find (spell_name); 433 at_spell = archetype::find (spell_name);
489 434
490 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
491 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
492 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
493 else 438 else
494 at_spell = NULL; 439 at_spell = NULL;
495 } 440 }
496 } 441 }
… …
498 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
499 * in this case means its an artifact. 444 * in this case means its an artifact.
500 */ 445 */
501 if (!at_spell) 446 if (!at_spell)
502 { 447 {
503 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
504 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 449 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
505 else 450 else
506 { 451 {
507 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
508 453
509 do 454 while (art)
510 { 455 {
511 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (art->item->name, cp))
512 break; 457 break;
458
513 art = art->next; 459 art = art->next;
514 } 460 }
515 while (art != NULL);
516 461
517 if (!art) 462 if (!art)
518 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 463 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
519 } 464 }
520 465
521 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 466 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
522 } 467 }
523 } /* if cp */ 468 } /* if cp */
524 469
525 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
526 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
527 { 472 {
528 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); 473 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);
529 return 1; 474 return 1;
530 } 475 }
531 476
… …
533 * Rather than have two different blocks with a lot of similar code, 478 * Rather than have two different blocks with a lot of similar code,
534 * just create one object, do all the processing, and then determine 479 * just create one object, do all the processing, and then determine
535 * if that one object should be inserted or if we need to make copies. 480 * if that one object should be inserted or if we need to make copies.
536 */ 481 */
537 tmp = arch_to_object (at); 482 tmp = arch_to_object (at);
538
539 if (settings.real_wiz == FALSE)
540 SET_FLAG (tmp, FLAG_WAS_WIZ);
541 483
542 if (set_magic) 484 if (set_magic)
543 set_abs_magic (tmp, magic); 485 set_abs_magic (tmp, magic);
544 486
545 if (art) 487 if (art)
… …
625 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 567 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
626 568
627 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
628 } 570 }
629 571
630 if (at->clone.nrof) 572 if (at->nrof)
631 { 573 {
632 if (at_spell) 574 if (at_spell)
633 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
634 576
635 tmp->x = op->x; 577 tmp->x = op->x;
636 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
637 580
638 if (set_nrof) 581 if (set_nrof)
639 tmp->nrof = nrof; 582 tmp->nrof = nrof;
640 583
641 tmp->map = op->map; 584 op->insert (tmp);
642
643 tmp = insert_ob_in_ob (tmp, op);
644 esrv_send_item (op, tmp);
645 585
646 /* Let's put this created item on stack so dm can access it easily. */ 586 /* Let's put this created item on stack so dm can access it easily. */
647 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
648 588
649 return 1; 589 return 1;
650 } 590 }
651 else 591 else
652 { 592 {
653 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
654 { 594 {
655 archetype *atmp;
656 object *prev = 0, *head = 0; 595 object *prev = 0, *head = 0;
657 596
658 for (atmp = at; atmp; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
659 { 598 {
660 object *dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
661 600
662 if (at_spell) 601 if (at_spell)
663 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
670 { 609 {
671 head = dup; 610 head = dup;
672 tmp->copy_to (dup); 611 tmp->copy_to (dup);
673 } 612 }
674 613
675 if (settings.real_wiz == FALSE)
676 SET_FLAG (dup, FLAG_WAS_WIZ);
677
678 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
679 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
680 dup->map = op->map; 616 dup->map = op->map;
681 617
682 if (head != dup) 618 if (head != dup)
683 { 619 {
684 dup->head = head; 620 dup->head = head;
… …
694 int size_x = 0; 630 int size_x = 0;
695 int size_y = 0; 631 int size_y = 0;
696 632
697 while (check) 633 while (check)
698 { 634 {
699 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
700 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
701 check = check->more; 637 check = check->more;
702 } 638 }
703 639
704 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 640 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
705 { 641 {
… …
731 /* Wonder if we really want to push all of these, but since 667 /* Wonder if we really want to push all of these, but since
732 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
733 */ 669 */
734 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
735 671
736 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
737 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
738
739 esrv_send_item (op, head);
740 } 674 }
741 675
742 /* free the one we used to copy */ 676 /* free the one we used to copy */
743 tmp->destroy (); 677 tmp->destroy ();
744 } 678 }
… …
751 */ 685 */
752 686
753int 687int
754command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
755{ 689{
690 int i;
756 object *tmp; 691 object *tmp;
757 int i;
758 692
759 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
760 { 694 {
761 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
762 return 0; 696 return 1;
763 }
764
765 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
766 { 697 }
767 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
768 return 1;
769 }
770 698
771 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
772 return 1; 701 return 1;
773} 702}
774 703
775/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
776 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
797 free (dump); 726 free (dump);
798 727
799 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
800 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
801 730
802 return 1;
803}
804
805/**
806 * When DM is possessing a monster, flip aggression on and off, to allow
807 * better motion.
808 */
809int
810command_mon_aggr (object *op, char *params)
811{
812 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
813 {
814 op->enemy = NULL;
815 SET_FLAG (op, FLAG_UNAGGRESSIVE);
816 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
817 }
818 else
819 {
820 CLEAR_FLAG (op, FLAG_FRIENDLY);
821 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
822 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
823 }
824
825 return 1;
826}
827
828/** DM can possess a monster. Basically, this tricks the client into thinking
829 * a given monster, is actually the player it controls. This allows a DM
830 * to inhabit a monster's body, and run around the game with it.
831 * This function is severely broken - it has tons of hardcoded values,
832 */
833int
834command_possess (object *op, char *params)
835{
836 object *victim, *curinv, *nextinv;
837 player *pl;
838 int i;
839 char buf[MAX_BUF];
840
841 victim = NULL;
842 if (params != NULL)
843 {
844 if (sscanf (params, "%d", &i))
845 victim = find_object (i);
846 else if (sscanf (params, "%s", buf))
847 victim = find_object_name (buf);
848 }
849 if (victim == NULL)
850 {
851 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
852 return 1;
853 }
854
855 if (victim == op)
856 {
857 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
858 return 1;
859 }
860
861 /* clear out the old inventory */
862 curinv = op->inv;
863 while (curinv != NULL)
864 {
865 nextinv = curinv->below;
866 esrv_del_item (op->contr, curinv->count);
867 curinv = nextinv;
868 }
869
870 /* make the switch */
871 pl = op->contr;
872 victim->contr = pl;
873 pl->ob = victim;
874 victim->type = PLAYER;
875 SET_FLAG (victim, FLAG_WIZ);
876
877 /* send the inventory to the client */
878 curinv = victim->inv;
879 while (curinv != NULL)
880 {
881 nextinv = curinv->below;
882 esrv_send_item (victim, curinv);
883 curinv = nextinv;
884 }
885 /* basic patchup */
886 /* The use of hard coded values is terrible. Note
887 * that really, to be fair, this shouldn't get changed at
888 * all - if you are possessing a kobold, you should have the
889 * same limitations. As it is, as more body locations are added,
890 * this will give this player more locations than perhaps
891 * they should be allowed.
892 */
893 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
894 if (i == 1 || i == 6 || i == 8 || i == 9)
895 victim->body_info[i] = 2;
896 else
897 victim->body_info[i] = 1;
898
899 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
900 esrv_send_inventory (victim, victim);
901
902 victim->update_stats ();
903
904 do_some_living (victim);
905 return 1; 731 return 1;
906} 732}
907 733
908int 734int
909command_patch (object *op, char *params) 735command_patch (object *op, char *params)
… …
924 return 1; 750 return 1;
925 } 751 }
926 752
927 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
928 arg2++; 754 arg2++;
929 if (settings.real_wiz == FALSE) 755
930 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
931 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
932 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 757 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
933 else 758 else
934 {
935 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 759 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
936 }
937 760
938 return 1; 761 return 1;
939} 762}
940 763
941int 764int
… …
1004 */ 827 */
1005int 828int
1006command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
1007{ 830{
1008 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
1009 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1010 object *skillob = NULL; 834 object *skillob = NULL;
1011 835
1012 skill[0] = '\0'; 836 skill[0] = '\0';
1013 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 837 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2))
1014 { 838 {
1015 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 839 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1016 return 1; 840 return 1;
1017 } 841 }
1018 842
… …
1035 } 859 }
1036 860
1037 pl->ob->stats.exp += i; 861 pl->ob->stats.exp += i;
1038 calc_perm_exp (pl->ob); 862 calc_perm_exp (pl->ob);
1039 player_lvl_adj (pl->ob, NULL); 863 player_lvl_adj (pl->ob, NULL);
1040
1041 if (settings.real_wiz == FALSE)
1042 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1043 864
1044 return 1; 865 return 1;
1045 } 866 }
1046 867
1047 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
… …
1123 944
1124 for_all_players (pl) 945 for_all_players (pl)
1125 { 946 {
1126 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (pl->ob->name, thing))
1127 { 948 {
1128 if (settings.real_wiz == FALSE)
1129 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1130 if (!strcmp ("str", thing2))
1131 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 949 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1132 if (!strcmp ("dex", thing2))
1133 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 950 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1134 if (!strcmp ("con", thing2))
1135 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 951 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1136 if (!strcmp ("wis", thing2))
1137 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 952 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1138 if (!strcmp ("cha", thing2))
1139 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 953 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1140 if (!strcmp ("int", thing2))
1141 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 954 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1142 if (!strcmp ("pow", thing2))
1143 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 955 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
956
1144 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1145 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 pl->ob->update_stats (); 959 pl->ob->update_stats ();
1147 return 1; 960 return 1;
1148 } 961 }
… …
1152 return 1; 965 return 1;
1153} 966}
1154 967
1155int 968int
1156command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1157{ /* 'noadm' is alias */ 970{ /* 'nodm' is alias */
1158 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1159 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1160 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1161 974
1162 if (settings.real_wiz == TRUE)
1163 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1164 if (op->contr->hidden) 975 if (op->contr->hidden)
1165 { 976 {
1166 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 977 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1167 op->map->players++; 978 op->map->players++;
1168 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 979 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1230 } 1041 }
1231 1042
1232 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1043 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1233 { 1044 {
1234 SET_FLAG (op, FLAG_WIZ); 1045 SET_FLAG (op, FLAG_WIZ);
1235 SET_FLAG (op, FLAG_WAS_WIZ);
1236 SET_FLAG (op, FLAG_WIZPASS); 1046 SET_FLAG (op, FLAG_WIZPASS);
1237 SET_FLAG (op, FLAG_WIZCAST); 1047 SET_FLAG (op, FLAG_WIZCAST);
1048
1238 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1049 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1239 /* 1050 /*
1240 * Remove setting flying here - that won't work, because next 1051 * Remove setting flying here - that won't work, because next
1241 * fix_player() is called that will get cleared - proper solution 1052 * fix_player() is called that will get cleared - proper solution
1242 * is probably something like a wiz_force which gives that and any 1053 * is probably something like a wiz_force which gives that and any
1243 * other desired abilities. 1054 * other desired abilities.
1244 */ 1055 */
1245 clear_los (op); 1056 op->contr->clear_los (0);
1246 op->contr->write_buf[0] = '\0'; 1057 op->contr->write_buf[0] = '\0';
1247 1058
1248 if (!silent) 1059 if (!silent)
1249 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1060 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1250 1061
… …
1277command_invisible (object *op, char *params) 1088command_invisible (object *op, char *params)
1278{ 1089{
1279 if (op) 1090 if (op)
1280 { 1091 {
1281 op->invisible += 100; 1092 op->invisible += 100;
1282 update_object (op, UP_OBJ_FACE); 1093 update_object (op, UP_OBJ_CHANGE);
1283 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1284 } 1095 }
1285 1096
1286 return 0; 1097 return 0;
1287} 1098}
… …
1299 * name than other "spell_xxx" archetypes and would always conflict. 1110 * name than other "spell_xxx" archetypes and would always conflict.
1300 */ 1111 */
1301static object * 1112static object *
1302get_spell_by_name (object *op, const char *spell_name) 1113get_spell_by_name (object *op, const char *spell_name)
1303{ 1114{
1304 archetype *ar; 1115 archetype *at;
1305 archetype *found; 1116 archetype *found;
1306 int conflict_found; 1117 int conflict_found;
1307 size_t spell_name_length; 1118 size_t spell_name_length;
1308 1119
1309 /* First check for full name matches. */ 1120 /* First check for full name matches. */
1310 conflict_found = 0; 1121 conflict_found = 0;
1311 found = NULL; 1122 found = NULL;
1312 for (ar = first_archetype; ar != NULL; ar = ar->next) 1123 for_all_archetypes (at)
1313 { 1124 {
1314 if (ar->clone.type != SPELL) 1125 if (at->type != SPELL)
1315 continue; 1126 continue;
1316 1127
1317 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1128 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1318 continue; 1129 continue;
1319 1130
1320 if (strcmp (ar->clone.name, spell_name) != 0) 1131 if (strcmp (at->object::name, spell_name) != 0)
1321 continue; 1132 continue;
1322 1133
1323 if (found != NULL) 1134 if (found != NULL)
1324 { 1135 {
1325 if (!conflict_found) 1136 if (!conflict_found)
1326 { 1137 {
1327 conflict_found = 1; 1138 conflict_found = 1;
1328 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1139 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1329 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1140 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1330 } 1141 }
1142
1331 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1143 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1332 continue; 1144 continue;
1333 } 1145 }
1334 1146
1335 found = ar; 1147 found = at;
1336 } 1148 }
1337 1149
1338 /* No match if more more than one archetype matches. */ 1150 /* No match if more more than one archetype matches. */
1339 if (conflict_found) 1151 if (conflict_found)
1340 return NULL; 1152 return NULL;
… …
1345 1157
1346 /* No full match found: now check for partial matches. */ 1158 /* No full match found: now check for partial matches. */
1347 spell_name_length = strlen (spell_name); 1159 spell_name_length = strlen (spell_name);
1348 conflict_found = 0; 1160 conflict_found = 0;
1349 found = NULL; 1161 found = NULL;
1350 for (ar = first_archetype; ar != NULL; ar = ar->next) 1162 for_all_archetypes (at)
1351 { 1163 {
1352 if (ar->clone.type != SPELL) 1164 if (at->type != SPELL)
1353 continue; 1165 continue;
1354 1166
1355 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1167 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1356 continue; 1168 continue;
1357 1169
1358 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1170 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1359 continue; 1171 continue;
1360 1172
1361 if (found != NULL) 1173 if (found != NULL)
1362 { 1174 {
1363 if (!conflict_found) 1175 if (!conflict_found)
1364 { 1176 {
1365 conflict_found = 1; 1177 conflict_found = 1;
1366 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1178 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1367 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1179 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1368 } 1180 }
1369 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1181 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1370 continue; 1182 continue;
1371 } 1183 }
1372 1184
1373 found = ar; 1185 found = at;
1374 } 1186 }
1375 1187
1376 /* No match if more more than one archetype matches. */ 1188 /* No match if more more than one archetype matches. */
1377 if (conflict_found) 1189 if (conflict_found)
1378 return NULL; 1190 return NULL;
… …
1443 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1255 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1444 return 0; 1256 return 0;
1445 } 1257 }
1446 1258
1447 do_forget_spell (op, spell->name); 1259 do_forget_spell (op, spell->name);
1448 return 1;
1449}
1450
1451/**
1452 * Lists all plugins currently loaded with their IDs and full names.
1453 */
1454int
1455command_listplugins (object *op, char *params)
1456{
1457 plugins_display_list (op);
1458 return 1;
1459}
1460
1461/**
1462 * Loads the given plugin. The DM specifies the name of the library to load (no
1463 * pathname is needed). Do not ever attempt to load the same plugin more than
1464 * once at a time, or bad things could happen.
1465 */
1466int
1467command_loadplugin (object *op, char *params)
1468{
1469 char buf[MAX_BUF];
1470
1471 if (params == NULL)
1472 {
1473 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1474 return 1;
1475 }
1476
1477 strcpy (buf, LIBDIR);
1478 strcat (buf, "/plugins/");
1479 strcat (buf, params);
1480 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1481 if (plugins_init_plugin (buf) == 0)
1482 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1483 else
1484 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1485 return 1;
1486}
1487
1488/**
1489 * Unloads the given plugin. The DM specified the ID of the library to unload.
1490 * Note that some things may behave strangely if the correct plugins are not
1491 * loaded.
1492 */
1493int
1494command_unloadplugin (object *op, char *params)
1495{
1496 if (params == NULL)
1497 {
1498 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1499 return 1;
1500 }
1501
1502 if (plugins_remove_plugin (params) == 0)
1503 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1504 else
1505 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1506 return 1; 1260 return 1;
1507} 1261}
1508 1262
1509/** 1263/**
1510 * A players wants to become DM and hide. 1264 * A players wants to become DM and hide.
… …
1831 return 0; 1585 return 0;
1832 } 1586 }
1833 1587
1834 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1588 if (!QUERY_FLAG (right, FLAG_REMOVED))
1835 right->remove (); 1589 right->remove ();
1590
1836 inserted = insert_ob_in_ob (right, left); 1591 insert_ob_in_ob (right, left);
1837 if (left->type == PLAYER)
1838 if (inserted == right)
1839 esrv_send_item (left, right);
1840 else
1841 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1842 1592
1843 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1593 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1844 1594
1845 return 0; 1595 return 0;
1846 1596

Diff Legend

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