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.46 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.67 by root, Thu Jan 1 16:05:13 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <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
… …
280 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
281 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");
282 return 0; 281 return 0;
283 } 282 }
284 283
285 pl->ob->enter_exit (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
286 dummy->destroy (); 285 dummy->destroy ();
286
287 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.");
288 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
289 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);
290 return 1; 290 return 1;
291} 291}
… …
315 { 315 {
316 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.");
317 return 1; 317 return 1;
318 } 318 }
319 319
320 dummy = object::create (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
321 EXIT_PATH (dummy) = op->map->path;
322 EXIT_X (dummy) = op->x + freearr_x[i];
323 EXIT_Y (dummy) = op->y + freearr_y[i];
324 pl->ob->enter_exit (dummy);
325 dummy->destroy ();
326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
327 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
328 323
329 return 1; 324 return 1;
330} 325}
… …
423 * we also set up spell_name which is only 418 * we also set up spell_name which is only
424 * the first word. 419 * the first word.
425 */ 420 */
426 421
427 at_spell = archetype::find (cp); 422 at_spell = archetype::find (cp);
428 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
429 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
430 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
431 { 426 {
432 assign (spell_name, cp); 427 assign (spell_name, cp);
433 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
434 if (fsp) 429 if (fsp)
435 { 430 {
436 *fsp = 0; 431 *fsp = 0;
437 fsp++; 432 fsp++;
438 at_spell = archetype::find (spell_name); 433 at_spell = archetype::find (spell_name);
439 434
440 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
441 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
442 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
443 else 438 else
444 at_spell = NULL; 439 at_spell = NULL;
445 } 440 }
446 } 441 }
… …
448 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
449 * in this case means its an artifact. 444 * in this case means its an artifact.
450 */ 445 */
451 if (!at_spell) 446 if (!at_spell)
452 { 447 {
453 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
454 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);
455 else 450 else
456 { 451 {
457 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
458 453
459 while (art) 454 while (art)
460 { 455 {
461 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (&art->item->name, cp))
462 break; 457 break;
463 458
464 art = art->next; 459 art = art->next;
465 } 460 }
466 461
467 if (!art) 462 if (!art)
468 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);
469 } 464 }
470 465
471 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);
472 } 467 }
473 } /* if cp */ 468 } /* if cp */
474 469
475 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
476 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
477 { 472 {
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); 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);
479 return 1; 474 return 1;
480 } 475 }
481 476
… …
572 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);
573 568
574 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
575 } 570 }
576 571
577 if (at->clone.nrof) 572 if (at->nrof)
578 { 573 {
579 if (at_spell) 574 if (at_spell)
580 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
581 576
582 tmp->x = op->x; 577 tmp->x = op->x;
583 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
584 580
585 if (set_nrof) 581 if (set_nrof)
586 tmp->nrof = nrof; 582 tmp->nrof = nrof;
587 583
588 tmp->map = op->map; 584 op->insert (tmp);
589
590 tmp = insert_ob_in_ob (tmp, op);
591 esrv_send_item (op, tmp);
592 585
593 /* 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. */
594 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
595 588
596 return 1; 589 return 1;
597 } 590 }
598 else 591 else
599 { 592 {
600 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
601 { 594 {
602 archetype *atmp;
603 object *prev = 0, *head = 0; 595 object *prev = 0, *head = 0;
604 596
605 for (atmp = at; atmp; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
606 { 598 {
607 object *dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
608 600
609 if (at_spell) 601 if (at_spell)
610 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
617 { 609 {
618 head = dup; 610 head = dup;
619 tmp->copy_to (dup); 611 tmp->copy_to (dup);
620 } 612 }
621 613
622 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
623 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
624 dup->map = op->map; 616 dup->map = op->map;
625 617
626 if (head != dup) 618 if (head != dup)
627 { 619 {
628 dup->head = head; 620 dup->head = head;
… …
638 int size_x = 0; 630 int size_x = 0;
639 int size_y = 0; 631 int size_y = 0;
640 632
641 while (check) 633 while (check)
642 { 634 {
643 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
644 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
645 check = check->more; 637 check = check->more;
646 } 638 }
647 639
648 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))
649 { 641 {
… …
675 /* 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
676 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
677 */ 669 */
678 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
679 671
680 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
681 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
682
683 esrv_send_item (op, head);
684 } 674 }
685 675
686 /* free the one we used to copy */ 676 /* free the one we used to copy */
687 tmp->destroy (); 677 tmp->destroy ();
688 } 678 }
… …
695 */ 685 */
696 686
697int 687int
698command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
699{ 689{
690 int i;
700 object *tmp; 691 object *tmp;
701 int i;
702 692
703 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
704 { 694 {
705 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
706 return 0; 696 return 1;
707 }
708
709 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
710 { 697 }
711 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
712 return 1;
713 }
714 698
715 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
716 return 1; 701 return 1;
717} 702}
718 703
719/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
720 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
842 */ 827 */
843int 828int
844command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
845{ 830{
846 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
847 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
848 object *skillob = NULL; 834 object *skillob = NULL;
849 835
850 skill[0] = '\0'; 836 skill[0] = '\0';
851 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))
852 { 838 {
853 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>].");
854 return 1; 840 return 1;
855 } 841 }
856 842
… …
903 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
904 return 1; 890 return 1;
905 } 891 }
906 892
907 for_all_players (pl) 893 for_all_players (pl)
908 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
909 { 895 {
910 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);
911 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
912 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);
913 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
956 return 1; 942 return 1;
957 } 943 }
958 944
959 for_all_players (pl) 945 for_all_players (pl)
960 { 946 {
961 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
962 { 948 {
963 if (!strcmp ("str", thing2)) 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;
964 if (!strcmp ("dex", thing2)) 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;
965 if (!strcmp ("con", thing2)) 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;
966 if (!strcmp ("wis", thing2)) 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;
… …
983command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
984{ /* 'nodm' is alias */ 970{ /* 'nodm' is alias */
985 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
986 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
987 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
974 CLEAR_FLAG (op, FLAG_WIZLOOK);
975 op->contr->do_los = 1;
988 976
989 if (op->contr->hidden) 977 if (op->contr->hidden)
990 { 978 {
991 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");
992 op->map->players++; 980 op->map->players++;
… …
994 op->contr->hidden = 0; 982 op->contr->hidden = 0;
995 op->invisible = 1; 983 op->invisible = 1;
996 } 984 }
997 else 985 else
998 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
999 return 1; 988 return 1;
1000} 989}
1001 990
1002/** 991/**
1003 * object *op is trying to become dm. 992 * object *op is trying to become dm.
… …
1057 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1058 { 1047 {
1059 SET_FLAG (op, FLAG_WIZ); 1048 SET_FLAG (op, FLAG_WIZ);
1060 SET_FLAG (op, FLAG_WIZPASS); 1049 SET_FLAG (op, FLAG_WIZPASS);
1061 SET_FLAG (op, FLAG_WIZCAST); 1050 SET_FLAG (op, FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK);
1052 op->contr->do_los = 1;
1062 1053
1063 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!");
1064 /*
1065 * Remove setting flying here - that won't work, because next
1066 * fix_player() is called that will get cleared - proper solution
1067 * is probably something like a wiz_force which gives that and any
1068 * other desired abilities.
1069 */
1070 clear_los (op->contr);
1071 op->contr->write_buf[0] = '\0'; 1055 op->contr->write_buf[0] = '\0';
1072 1056
1073 if (!silent) 1057 if (!silent)
1074 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!");
1075 1059
… …
1115 * Returns spell object (from archetypes) by name. 1099 * Returns spell object (from archetypes) by name.
1116 * Returns NULL if 0 or more than one spell matches. 1100 * Returns NULL if 0 or more than one spell matches.
1117 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1118 * 1102 *
1119 * op is the player issuing the command. 1103 * op is the player issuing the command.
1120 *
1121 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1122 * anymore (but may still be present in some player's inventories and thus
1123 * cannot be removed). We have to ignore them here since they have the same
1124 * name than other "spell_xxx" archetypes and would always conflict.
1125 */ 1104 */
1126static object * 1105static object *
1127get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1128{ 1107{
1129 archetype *at; 1108 archetype *at;
1130 archetype *found; 1109 archetype *found;
1131 int conflict_found; 1110 int conflict_found;
1132 size_t spell_name_length; 1111 size_t spell_name_length;
1133 1112
1134 /* First check for full name matches. */ 1113 /* First check for full name matches. */
1135 conflict_found = 0; 1114 conflict_found = 0;
1136 found = NULL; 1115 found = NULL;
1137 for (at = first_archetype; at != NULL; at = at->next) 1116 for_all_archetypes (at)
1138 { 1117 {
1139 if (at->clone.type != SPELL) 1118 if (at->type != SPELL)
1140 continue; 1119 continue;
1141 1120
1142 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1121 if (at->object::name != spell_name)
1143 continue; 1122 continue;
1144 1123
1145 if (strcmp (at->clone.name, spell_name) != 0)
1146 continue;
1147
1148 if (found != NULL) 1124 if (found)
1149 { 1125 {
1150 if (!conflict_found) 1126 if (!conflict_found)
1151 { 1127 {
1152 conflict_found = 1; 1128 conflict_found = 1;
1153 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);
1154 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1155 } 1131 }
1156 1132
1157 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1158 continue; 1134 continue;
… …
1171 1147
1172 /* No full match found: now check for partial matches. */ 1148 /* No full match found: now check for partial matches. */
1173 spell_name_length = strlen (spell_name); 1149 spell_name_length = strlen (spell_name);
1174 conflict_found = 0; 1150 conflict_found = 0;
1175 found = NULL; 1151 found = NULL;
1176 for (at = first_archetype; at != NULL; at = at->next) 1152 for_all_archetypes (at)
1177 { 1153 {
1178 if (at->clone.type != SPELL) 1154 if (at->type != SPELL)
1179 continue; 1155 continue;
1180 1156
1181 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1157 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1182 continue; 1158 continue;
1183 1159
1184 if (strncmp (at->clone.name, spell_name, spell_name_length) != 0) 1160 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1185 continue; 1161 continue;
1186 1162
1187 if (found != NULL) 1163 if (found != NULL)
1188 { 1164 {
1189 if (!conflict_found) 1165 if (!conflict_found)
1190 { 1166 {
1191 conflict_found = 1; 1167 conflict_found = 1;
1192 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);
1193 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);
1194 } 1170 }
1195 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->clone.name); 1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1196 continue; 1172 continue;
1197 } 1173 }
1198 1174
1199 found = at; 1175 found = at;
1200 } 1176 }
… …
1206 /* Return if exactly one archetype matches. */ 1182 /* Return if exactly one archetype matches. */
1207 if (found != NULL) 1183 if (found != NULL)
1208 return arch_to_object (found); 1184 return arch_to_object (found);
1209 1185
1210 /* No spell found: just print an error message. */ 1186 /* No spell found: just print an error message. */
1211 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);
1212 return NULL; 1188 return NULL;
1213} 1189}
1214 1190
1215static int 1191static int
1216command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
… …
1269 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);
1270 return 0; 1246 return 0;
1271 } 1247 }
1272 1248
1273 do_forget_spell (op, spell->name); 1249 do_forget_spell (op, spell->name);
1274 return 1;
1275}
1276
1277/**
1278 * Lists all plugins currently loaded with their IDs and full names.
1279 */
1280int
1281command_listplugins (object *op, char *params)
1282{
1283 plugins_display_list (op);
1284 return 1;
1285}
1286
1287/**
1288 * Loads the given plugin. The DM specifies the name of the library to load (no
1289 * pathname is needed). Do not ever attempt to load the same plugin more than
1290 * once at a time, or bad things could happen.
1291 */
1292int
1293command_loadplugin (object *op, char *params)
1294{
1295 char buf[MAX_BUF];
1296
1297 if (params == NULL)
1298 {
1299 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1300 return 1;
1301 }
1302
1303 strcpy (buf, LIBDIR);
1304 strcat (buf, "/plugins/");
1305 strcat (buf, params);
1306 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1307 if (plugins_init_plugin (buf) == 0)
1308 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1309 else
1310 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1311 return 1;
1312}
1313
1314/**
1315 * Unloads the given plugin. The DM specified the ID of the library to unload.
1316 * Note that some things may behave strangely if the correct plugins are not
1317 * loaded.
1318 */
1319int
1320command_unloadplugin (object *op, char *params)
1321{
1322 if (params == NULL)
1323 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1325 return 1;
1326 }
1327
1328 if (plugins_remove_plugin (params) == 0)
1329 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1330 else
1331 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1332 return 1; 1250 return 1;
1333} 1251}
1334 1252
1335/** 1253/**
1336 * A players wants to become DM and hide. 1254 * A players wants to become DM and hide.
… …
1657 return 0; 1575 return 0;
1658 } 1576 }
1659 1577
1660 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1578 if (!QUERY_FLAG (right, FLAG_REMOVED))
1661 right->remove (); 1579 right->remove ();
1580
1662 inserted = insert_ob_in_ob (right, left); 1581 insert_ob_in_ob (right, left);
1663 if (left->type == PLAYER)
1664 if (inserted == right)
1665 esrv_send_item (left, right);
1666 else
1667 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1668 1582
1669 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));
1670 1584
1671 return 0; 1585 return 0;
1672 1586

Diff Legend

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