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.39 by pippijn, Fri Mar 2 15:04:35 2007 UTC vs.
Revision 1.67 by root, Thu Jan 1 16:05:13 2009 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.
… …
821 return 1; 750 return 1;
822 } 751 }
823 752
824 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
825 arg2++; 754 arg2++;
826 if (settings.real_wiz == FALSE) 755
827 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
828 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
829 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);
830 else 758 else
831 {
832 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);
833 }
834 760
835 return 1; 761 return 1;
836} 762}
837 763
838int 764int
… …
901 */ 827 */
902int 828int
903command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
904{ 830{
905 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
906 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
907 object *skillob = NULL; 834 object *skillob = NULL;
908 835
909 skill[0] = '\0'; 836 skill[0] = '\0';
910 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))
911 { 838 {
912 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>].");
913 return 1; 840 return 1;
914 } 841 }
915 842
… …
933 860
934 pl->ob->stats.exp += i; 861 pl->ob->stats.exp += i;
935 calc_perm_exp (pl->ob); 862 calc_perm_exp (pl->ob);
936 player_lvl_adj (pl->ob, NULL); 863 player_lvl_adj (pl->ob, NULL);
937 864
938 if (settings.real_wiz == FALSE)
939 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
940
941 return 1; 865 return 1;
942 } 866 }
943 867
944 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
945 return 1; 869 return 1;
… …
965 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
966 return 1; 890 return 1;
967 } 891 }
968 892
969 for_all_players (pl) 893 for_all_players (pl)
970 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
971 { 895 {
972 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 896 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
973 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
974 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 898 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
975 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1018 return 1; 942 return 1;
1019 } 943 }
1020 944
1021 for_all_players (pl) 945 for_all_players (pl)
1022 { 946 {
1023 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
1024 { 948 {
1025 if (settings.real_wiz == FALSE)
1026 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1027 if (!strcmp ("str", thing2))
1028 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;
1029 if (!strcmp ("dex", thing2))
1030 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;
1031 if (!strcmp ("con", thing2))
1032 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;
1033 if (!strcmp ("wis", thing2))
1034 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;
1035 if (!strcmp ("cha", thing2))
1036 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;
1037 if (!strcmp ("int", thing2))
1038 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;
1039 if (!strcmp ("pow", thing2))
1040 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
1041 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1042 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1043 pl->ob->update_stats (); 959 pl->ob->update_stats ();
1044 return 1; 960 return 1;
1045 } 961 }
… …
1053command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1054{ /* 'nodm' is alias */ 970{ /* 'nodm' is alias */
1055 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1056 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1057 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1058
1059 if (settings.real_wiz == TRUE)
1060 CLEAR_FLAG (op, FLAG_WAS_WIZ); 974 CLEAR_FLAG (op, FLAG_WIZLOOK);
975 op->contr->do_los = 1;
976
1061 if (op->contr->hidden) 977 if (op->contr->hidden)
1062 { 978 {
1063 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 979 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1064 op->map->players++; 980 op->map->players++;
1065 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 981 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1066 op->contr->hidden = 0; 982 op->contr->hidden = 0;
1067 op->invisible = 1; 983 op->invisible = 1;
1068 } 984 }
1069 else 985 else
1070 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 986 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
987
1071 return 1; 988 return 1;
1072} 989}
1073 990
1074/** 991/**
1075 * object *op is trying to become dm. 992 * object *op is trying to become dm.
… …
1127 } 1044 }
1128 1045
1129 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1130 { 1047 {
1131 SET_FLAG (op, FLAG_WIZ); 1048 SET_FLAG (op, FLAG_WIZ);
1132 SET_FLAG (op, FLAG_WAS_WIZ);
1133 SET_FLAG (op, FLAG_WIZPASS); 1049 SET_FLAG (op, FLAG_WIZPASS);
1134 SET_FLAG (op, FLAG_WIZCAST); 1050 SET_FLAG (op, FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK);
1052 op->contr->do_los = 1;
1053
1135 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1054 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1136 /*
1137 * Remove setting flying here - that won't work, because next
1138 * fix_player() is called that will get cleared - proper solution
1139 * is probably something like a wiz_force which gives that and any
1140 * other desired abilities.
1141 */
1142 clear_los (op);
1143 op->contr->write_buf[0] = '\0'; 1055 op->contr->write_buf[0] = '\0';
1144 1056
1145 if (!silent) 1057 if (!silent)
1146 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1058 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1147 1059
… …
1174command_invisible (object *op, char *params) 1086command_invisible (object *op, char *params)
1175{ 1087{
1176 if (op) 1088 if (op)
1177 { 1089 {
1178 op->invisible += 100; 1090 op->invisible += 100;
1179 update_object (op, UP_OBJ_FACE); 1091 update_object (op, UP_OBJ_CHANGE);
1180 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1181 } 1093 }
1182 1094
1183 return 0; 1095 return 0;
1184} 1096}
… …
1187 * Returns spell object (from archetypes) by name. 1099 * Returns spell object (from archetypes) by name.
1188 * Returns NULL if 0 or more than one spell matches. 1100 * Returns NULL if 0 or more than one spell matches.
1189 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1190 * 1102 *
1191 * op is the player issuing the command. 1103 * op is the player issuing the command.
1192 *
1193 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1194 * anymore (but may still be present in some player's inventories and thus
1195 * cannot be removed). We have to ignore them here since they have the same
1196 * name than other "spell_xxx" archetypes and would always conflict.
1197 */ 1104 */
1198static object * 1105static object *
1199get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1200{ 1107{
1201 archetype *ar; 1108 archetype *at;
1202 archetype *found; 1109 archetype *found;
1203 int conflict_found; 1110 int conflict_found;
1204 size_t spell_name_length; 1111 size_t spell_name_length;
1205 1112
1206 /* First check for full name matches. */ 1113 /* First check for full name matches. */
1207 conflict_found = 0; 1114 conflict_found = 0;
1208 found = NULL; 1115 found = NULL;
1209 for (ar = first_archetype; ar != NULL; ar = ar->next) 1116 for_all_archetypes (at)
1210 { 1117 {
1211 if (ar->clone.type != SPELL) 1118 if (at->type != SPELL)
1212 continue; 1119 continue;
1213 1120
1214 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1121 if (at->object::name != spell_name)
1215 continue; 1122 continue;
1216 1123
1217 if (strcmp (ar->clone.name, spell_name) != 0)
1218 continue;
1219
1220 if (found != NULL) 1124 if (found)
1221 { 1125 {
1222 if (!conflict_found) 1126 if (!conflict_found)
1223 { 1127 {
1224 conflict_found = 1; 1128 conflict_found = 1;
1225 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1129 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1226 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1227 } 1131 }
1132
1228 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1229 continue; 1134 continue;
1230 } 1135 }
1231 1136
1232 found = ar; 1137 found = at;
1233 } 1138 }
1234 1139
1235 /* No match if more more than one archetype matches. */ 1140 /* No match if more more than one archetype matches. */
1236 if (conflict_found) 1141 if (conflict_found)
1237 return NULL; 1142 return NULL;
… …
1242 1147
1243 /* No full match found: now check for partial matches. */ 1148 /* No full match found: now check for partial matches. */
1244 spell_name_length = strlen (spell_name); 1149 spell_name_length = strlen (spell_name);
1245 conflict_found = 0; 1150 conflict_found = 0;
1246 found = NULL; 1151 found = NULL;
1247 for (ar = first_archetype; ar != NULL; ar = ar->next) 1152 for_all_archetypes (at)
1248 { 1153 {
1249 if (ar->clone.type != SPELL) 1154 if (at->type != SPELL)
1250 continue; 1155 continue;
1251 1156
1252 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1157 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1253 continue; 1158 continue;
1254 1159
1255 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1160 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1256 continue; 1161 continue;
1257 1162
1258 if (found != NULL) 1163 if (found != NULL)
1259 { 1164 {
1260 if (!conflict_found) 1165 if (!conflict_found)
1261 { 1166 {
1262 conflict_found = 1; 1167 conflict_found = 1;
1263 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1168 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", &spell_name);
1264 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1169 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1265 } 1170 }
1266 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1267 continue; 1172 continue;
1268 } 1173 }
1269 1174
1270 found = ar; 1175 found = at;
1271 } 1176 }
1272 1177
1273 /* No match if more more than one archetype matches. */ 1178 /* No match if more more than one archetype matches. */
1274 if (conflict_found) 1179 if (conflict_found)
1275 return NULL; 1180 return NULL;
… …
1277 /* Return if exactly one archetype matches. */ 1182 /* Return if exactly one archetype matches. */
1278 if (found != NULL) 1183 if (found != NULL)
1279 return arch_to_object (found); 1184 return arch_to_object (found);
1280 1185
1281 /* No spell found: just print an error message. */ 1186 /* No spell found: just print an error message. */
1282 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1187 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", &spell_name);
1283 return NULL; 1188 return NULL;
1284} 1189}
1285 1190
1286static int 1191static int
1287command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
… …
1340 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1341 return 0; 1246 return 0;
1342 } 1247 }
1343 1248
1344 do_forget_spell (op, spell->name); 1249 do_forget_spell (op, spell->name);
1345 return 1;
1346}
1347
1348/**
1349 * Lists all plugins currently loaded with their IDs and full names.
1350 */
1351int
1352command_listplugins (object *op, char *params)
1353{
1354 plugins_display_list (op);
1355 return 1;
1356}
1357
1358/**
1359 * Loads the given plugin. The DM specifies the name of the library to load (no
1360 * pathname is needed). Do not ever attempt to load the same plugin more than
1361 * once at a time, or bad things could happen.
1362 */
1363int
1364command_loadplugin (object *op, char *params)
1365{
1366 char buf[MAX_BUF];
1367
1368 if (params == NULL)
1369 {
1370 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1371 return 1;
1372 }
1373
1374 strcpy (buf, LIBDIR);
1375 strcat (buf, "/plugins/");
1376 strcat (buf, params);
1377 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1378 if (plugins_init_plugin (buf) == 0)
1379 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1380 else
1381 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1382 return 1;
1383}
1384
1385/**
1386 * Unloads the given plugin. The DM specified the ID of the library to unload.
1387 * Note that some things may behave strangely if the correct plugins are not
1388 * loaded.
1389 */
1390int
1391command_unloadplugin (object *op, char *params)
1392{
1393 if (params == NULL)
1394 {
1395 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1396 return 1;
1397 }
1398
1399 if (plugins_remove_plugin (params) == 0)
1400 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1401 else
1402 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1403 return 1; 1250 return 1;
1404} 1251}
1405 1252
1406/** 1253/**
1407 * A players wants to become DM and hide. 1254 * A players wants to become DM and hide.
… …
1728 return 0; 1575 return 0;
1729 } 1576 }
1730 1577
1731 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1578 if (!QUERY_FLAG (right, FLAG_REMOVED))
1732 right->remove (); 1579 right->remove ();
1580
1733 inserted = insert_ob_in_ob (right, left); 1581 insert_ob_in_ob (right, left);
1734 if (left->type == PLAYER)
1735 if (inserted == right)
1736 esrv_send_item (left, right);
1737 else
1738 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1739 1582
1740 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1741 1584
1742 return 0; 1585 return 0;
1743 1586

Diff Legend

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