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.37 by pippijn, Fri Mar 2 13:32:52 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
… …
266 ready_map_name (op->map->path, 0); 215 ready_map_name (op->map->path, 0);
267 216
268 return 1; 217 return 1;
269} 218}
270#endif 219#endif
271
272int
273command_shutdown (object *op, char *params)
274{
275 if (op && !QUERY_FLAG (op, FLAG_WIZ))
276 {
277 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
278 return 1;
279 }
280
281 cleanup ("dm initiated shutdown", 0);
282
283 /* not reached */
284 return 1;
285}
286 220
287int 221int
288command_freeze (object *op, char *params) 222command_freeze (object *op, char *params)
289{ 223{
290 int ticks; 224 int ticks;
… …
345 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
346 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");
347 return 0; 281 return 0;
348 } 282 }
349 283
350 pl->ob->enter_exit (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
351 dummy->destroy (); 285 dummy->destroy ();
286
352 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.");
353 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
354 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);
355 return 1; 290 return 1;
356} 291}
… …
380 { 315 {
381 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.");
382 return 1; 317 return 1;
383 } 318 }
384 319
385 dummy = object::create (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
386 EXIT_PATH (dummy) = op->map->path;
387 EXIT_X (dummy) = op->x + freearr_x[i];
388 EXIT_Y (dummy) = op->y + freearr_y[i];
389 pl->ob->enter_exit (dummy);
390 dummy->destroy ();
391 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
392 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
393 323
394 return 1; 324 return 1;
395} 325}
… …
488 * we also set up spell_name which is only 418 * we also set up spell_name which is only
489 * the first word. 419 * the first word.
490 */ 420 */
491 421
492 at_spell = archetype::find (cp); 422 at_spell = archetype::find (cp);
493 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
494 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
495 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
496 { 426 {
497 assign (spell_name, cp); 427 assign (spell_name, cp);
498 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
499 if (fsp) 429 if (fsp)
500 { 430 {
501 *fsp = 0; 431 *fsp = 0;
502 fsp++; 432 fsp++;
503 at_spell = archetype::find (spell_name); 433 at_spell = archetype::find (spell_name);
504 434
505 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
506 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
507 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
508 else 438 else
509 at_spell = NULL; 439 at_spell = NULL;
510 } 440 }
511 } 441 }
… …
513 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
514 * in this case means its an artifact. 444 * in this case means its an artifact.
515 */ 445 */
516 if (!at_spell) 446 if (!at_spell)
517 { 447 {
518 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
519 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 449 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
520 else 450 else
521 { 451 {
522 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
523 453
524 do 454 while (art)
525 { 455 {
526 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (&art->item->name, cp))
527 break; 457 break;
458
528 art = art->next; 459 art = art->next;
529 } 460 }
530 while (art != NULL);
531 461
532 if (!art) 462 if (!art)
533 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);
534 } 464 }
535 465
536 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);
537 } 467 }
538 } /* if cp */ 468 } /* if cp */
539 469
540 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
541 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
542 { 472 {
543 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 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);
544 return 1; 474 return 1;
545 } 475 }
546 476
… …
548 * 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,
549 * just create one object, do all the processing, and then determine 479 * just create one object, do all the processing, and then determine
550 * if that one object should be inserted or if we need to make copies. 480 * if that one object should be inserted or if we need to make copies.
551 */ 481 */
552 tmp = arch_to_object (at); 482 tmp = arch_to_object (at);
553
554 if (settings.real_wiz == FALSE)
555 SET_FLAG (tmp, FLAG_WAS_WIZ);
556 483
557 if (set_magic) 484 if (set_magic)
558 set_abs_magic (tmp, magic); 485 set_abs_magic (tmp, magic);
559 486
560 if (art) 487 if (art)
… …
640 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);
641 568
642 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
643 } 570 }
644 571
645 if (at->clone.nrof) 572 if (at->nrof)
646 { 573 {
647 if (at_spell) 574 if (at_spell)
648 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
649 576
650 tmp->x = op->x; 577 tmp->x = op->x;
651 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
652 580
653 if (set_nrof) 581 if (set_nrof)
654 tmp->nrof = nrof; 582 tmp->nrof = nrof;
655 583
656 tmp->map = op->map; 584 op->insert (tmp);
657
658 tmp = insert_ob_in_ob (tmp, op);
659 esrv_send_item (op, tmp);
660 585
661 /* 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. */
662 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
663 588
664 return 1; 589 return 1;
665 } 590 }
666 else 591 else
667 { 592 {
668 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
669 { 594 {
670 archetype *atmp;
671 object *prev = 0, *head = 0; 595 object *prev = 0, *head = 0;
672 596
673 for (atmp = at; atmp; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
674 { 598 {
675 object *dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
676 600
677 if (at_spell) 601 if (at_spell)
678 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
685 { 609 {
686 head = dup; 610 head = dup;
687 tmp->copy_to (dup); 611 tmp->copy_to (dup);
688 } 612 }
689 613
690 if (settings.real_wiz == FALSE)
691 SET_FLAG (dup, FLAG_WAS_WIZ);
692
693 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
694 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
695 dup->map = op->map; 616 dup->map = op->map;
696 617
697 if (head != dup) 618 if (head != dup)
698 { 619 {
699 dup->head = head; 620 dup->head = head;
… …
709 int size_x = 0; 630 int size_x = 0;
710 int size_y = 0; 631 int size_y = 0;
711 632
712 while (check) 633 while (check)
713 { 634 {
714 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
715 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
716 check = check->more; 637 check = check->more;
717 } 638 }
718 639
719 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))
720 { 641 {
… …
746 /* 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
747 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
748 */ 669 */
749 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
750 671
751 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
752 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
753
754 esrv_send_item (op, head);
755 } 674 }
756 675
757 /* free the one we used to copy */ 676 /* free the one we used to copy */
758 tmp->destroy (); 677 tmp->destroy ();
759 } 678 }
… …
766 */ 685 */
767 686
768int 687int
769command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
770{ 689{
690 int i;
771 object *tmp; 691 object *tmp;
772 int i;
773 692
774 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
775 { 694 {
776 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
777 return 0; 696 return 1;
778 }
779
780 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
781 { 697 }
782 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
783 return 1;
784 }
785 698
786 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
787 return 1; 701 return 1;
788} 702}
789 703
790/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
791 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
812 free (dump); 726 free (dump);
813 727
814 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
815 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
816 730
817 return 1;
818}
819
820/**
821 * When DM is possessing a monster, flip aggression on and off, to allow
822 * better motion.
823 */
824int
825command_mon_aggr (object *op, char *params)
826{
827 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
828 {
829 op->enemy = NULL;
830 SET_FLAG (op, FLAG_UNAGGRESSIVE);
831 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
832 }
833 else
834 {
835 CLEAR_FLAG (op, FLAG_FRIENDLY);
836 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
837 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
838 }
839
840 return 1;
841}
842
843/** DM can possess a monster. Basically, this tricks the client into thinking
844 * a given monster, is actually the player it controls. This allows a DM
845 * to inhabit a monster's body, and run around the game with it.
846 * This function is severely broken - it has tons of hardcoded values,
847 */
848int
849command_possess (object *op, char *params)
850{
851 object *victim, *curinv, *nextinv;
852 player *pl;
853 int i;
854 char buf[MAX_BUF];
855
856 victim = NULL;
857 if (params != NULL)
858 {
859 if (sscanf (params, "%d", &i))
860 victim = find_object (i);
861 else if (sscanf (params, "%s", buf))
862 victim = find_object_name (buf);
863 }
864 if (victim == NULL)
865 {
866 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
867 return 1;
868 }
869
870 if (victim == op)
871 {
872 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
873 return 1;
874 }
875
876 /* clear out the old inventory */
877 curinv = op->inv;
878 while (curinv != NULL)
879 {
880 nextinv = curinv->below;
881 esrv_del_item (op->contr, curinv->count);
882 curinv = nextinv;
883 }
884
885 /* make the switch */
886 pl = op->contr;
887 victim->contr = pl;
888 pl->ob = victim;
889 victim->type = PLAYER;
890 SET_FLAG (victim, FLAG_WIZ);
891
892 /* send the inventory to the client */
893 curinv = victim->inv;
894 while (curinv != NULL)
895 {
896 nextinv = curinv->below;
897 esrv_send_item (victim, curinv);
898 curinv = nextinv;
899 }
900 /* basic patchup */
901 /* The use of hard coded values is terrible. Note
902 * that really, to be fair, this shouldn't get changed at
903 * all - if you are possessing a kobold, you should have the
904 * same limitations. As it is, as more body locations are added,
905 * this will give this player more locations than perhaps
906 * they should be allowed.
907 */
908 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
909 if (i == 1 || i == 6 || i == 8 || i == 9)
910 victim->body_info[i] = 2;
911 else
912 victim->body_info[i] = 1;
913
914 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
915 esrv_send_inventory (victim, victim);
916
917 victim->update_stats ();
918
919 do_some_living (victim);
920 return 1; 731 return 1;
921} 732}
922 733
923int 734int
924command_patch (object *op, char *params) 735command_patch (object *op, char *params)
… …
939 return 1; 750 return 1;
940 } 751 }
941 752
942 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
943 arg2++; 754 arg2++;
944 if (settings.real_wiz == FALSE) 755
945 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
946 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
947 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);
948 else 758 else
949 {
950 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);
951 }
952 760
953 return 1; 761 return 1;
954} 762}
955 763
956int 764int
… …
1019 */ 827 */
1020int 828int
1021command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
1022{ 830{
1023 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
1024 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1025 object *skillob = NULL; 834 object *skillob = NULL;
1026 835
1027 skill[0] = '\0'; 836 skill[0] = '\0';
1028 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))
1029 { 838 {
1030 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>].");
1031 return 1; 840 return 1;
1032 } 841 }
1033 842
… …
1051 860
1052 pl->ob->stats.exp += i; 861 pl->ob->stats.exp += i;
1053 calc_perm_exp (pl->ob); 862 calc_perm_exp (pl->ob);
1054 player_lvl_adj (pl->ob, NULL); 863 player_lvl_adj (pl->ob, NULL);
1055 864
1056 if (settings.real_wiz == FALSE)
1057 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1058
1059 return 1; 865 return 1;
1060 } 866 }
1061 867
1062 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1063 return 1; 869 return 1;
… …
1083 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1084 return 1; 890 return 1;
1085 } 891 }
1086 892
1087 for_all_players (pl) 893 for_all_players (pl)
1088 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
1089 { 895 {
1090 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);
1091 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
1092 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);
1093 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1136 return 1; 942 return 1;
1137 } 943 }
1138 944
1139 for_all_players (pl) 945 for_all_players (pl)
1140 { 946 {
1141 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
1142 { 948 {
1143 if (settings.real_wiz == FALSE)
1144 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1145 if (!strcmp ("str", thing2))
1146 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;
1147 if (!strcmp ("dex", thing2))
1148 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;
1149 if (!strcmp ("con", thing2))
1150 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;
1151 if (!strcmp ("wis", thing2))
1152 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;
1153 if (!strcmp ("cha", thing2))
1154 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;
1155 if (!strcmp ("int", thing2))
1156 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;
1157 if (!strcmp ("pow", thing2))
1158 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
1159 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1160 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1161 pl->ob->update_stats (); 959 pl->ob->update_stats ();
1162 return 1; 960 return 1;
1163 } 961 }
… …
1167 return 1; 965 return 1;
1168} 966}
1169 967
1170int 968int
1171command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1172{ /* 'noadm' is alias */ 970{ /* 'nodm' is alias */
1173 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1174 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1175 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1176
1177 if (settings.real_wiz == TRUE)
1178 CLEAR_FLAG (op, FLAG_WAS_WIZ); 974 CLEAR_FLAG (op, FLAG_WIZLOOK);
975 op->contr->do_los = 1;
976
1179 if (op->contr->hidden) 977 if (op->contr->hidden)
1180 { 978 {
1181 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");
1182 op->map->players++; 980 op->map->players++;
1183 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);
1184 op->contr->hidden = 0; 982 op->contr->hidden = 0;
1185 op->invisible = 1; 983 op->invisible = 1;
1186 } 984 }
1187 else 985 else
1188 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
1189 return 1; 988 return 1;
1190} 989}
1191 990
1192/** 991/**
1193 * object *op is trying to become dm. 992 * object *op is trying to become dm.
… …
1245 } 1044 }
1246 1045
1247 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1248 { 1047 {
1249 SET_FLAG (op, FLAG_WIZ); 1048 SET_FLAG (op, FLAG_WIZ);
1250 SET_FLAG (op, FLAG_WAS_WIZ);
1251 SET_FLAG (op, FLAG_WIZPASS); 1049 SET_FLAG (op, FLAG_WIZPASS);
1252 SET_FLAG (op, FLAG_WIZCAST); 1050 SET_FLAG (op, FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK);
1052 op->contr->do_los = 1;
1053
1253 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!");
1254 /*
1255 * Remove setting flying here - that won't work, because next
1256 * fix_player() is called that will get cleared - proper solution
1257 * is probably something like a wiz_force which gives that and any
1258 * other desired abilities.
1259 */
1260 clear_los (op);
1261 op->contr->write_buf[0] = '\0'; 1055 op->contr->write_buf[0] = '\0';
1262 1056
1263 if (!silent) 1057 if (!silent)
1264 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!");
1265 1059
… …
1292command_invisible (object *op, char *params) 1086command_invisible (object *op, char *params)
1293{ 1087{
1294 if (op) 1088 if (op)
1295 { 1089 {
1296 op->invisible += 100; 1090 op->invisible += 100;
1297 update_object (op, UP_OBJ_FACE); 1091 update_object (op, UP_OBJ_CHANGE);
1298 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1299 } 1093 }
1300 1094
1301 return 0; 1095 return 0;
1302} 1096}
… …
1305 * Returns spell object (from archetypes) by name. 1099 * Returns spell object (from archetypes) by name.
1306 * Returns NULL if 0 or more than one spell matches. 1100 * Returns NULL if 0 or more than one spell matches.
1307 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1308 * 1102 *
1309 * op is the player issuing the command. 1103 * op is the player issuing the command.
1310 *
1311 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1312 * anymore (but may still be present in some player's inventories and thus
1313 * cannot be removed). We have to ignore them here since they have the same
1314 * name than other "spell_xxx" archetypes and would always conflict.
1315 */ 1104 */
1316static object * 1105static object *
1317get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1318{ 1107{
1319 archetype *ar; 1108 archetype *at;
1320 archetype *found; 1109 archetype *found;
1321 int conflict_found; 1110 int conflict_found;
1322 size_t spell_name_length; 1111 size_t spell_name_length;
1323 1112
1324 /* First check for full name matches. */ 1113 /* First check for full name matches. */
1325 conflict_found = 0; 1114 conflict_found = 0;
1326 found = NULL; 1115 found = NULL;
1327 for (ar = first_archetype; ar != NULL; ar = ar->next) 1116 for_all_archetypes (at)
1328 { 1117 {
1329 if (ar->clone.type != SPELL) 1118 if (at->type != SPELL)
1330 continue; 1119 continue;
1331 1120
1332 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1121 if (at->object::name != spell_name)
1333 continue; 1122 continue;
1334 1123
1335 if (strcmp (ar->clone.name, spell_name) != 0)
1336 continue;
1337
1338 if (found != NULL) 1124 if (found)
1339 { 1125 {
1340 if (!conflict_found) 1126 if (!conflict_found)
1341 { 1127 {
1342 conflict_found = 1; 1128 conflict_found = 1;
1343 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);
1344 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1345 } 1131 }
1132
1346 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1347 continue; 1134 continue;
1348 } 1135 }
1349 1136
1350 found = ar; 1137 found = at;
1351 } 1138 }
1352 1139
1353 /* No match if more more than one archetype matches. */ 1140 /* No match if more more than one archetype matches. */
1354 if (conflict_found) 1141 if (conflict_found)
1355 return NULL; 1142 return NULL;
… …
1360 1147
1361 /* No full match found: now check for partial matches. */ 1148 /* No full match found: now check for partial matches. */
1362 spell_name_length = strlen (spell_name); 1149 spell_name_length = strlen (spell_name);
1363 conflict_found = 0; 1150 conflict_found = 0;
1364 found = NULL; 1151 found = NULL;
1365 for (ar = first_archetype; ar != NULL; ar = ar->next) 1152 for_all_archetypes (at)
1366 { 1153 {
1367 if (ar->clone.type != SPELL) 1154 if (at->type != SPELL)
1368 continue; 1155 continue;
1369 1156
1370 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1157 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1371 continue; 1158 continue;
1372 1159
1373 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1160 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1374 continue; 1161 continue;
1375 1162
1376 if (found != NULL) 1163 if (found != NULL)
1377 { 1164 {
1378 if (!conflict_found) 1165 if (!conflict_found)
1379 { 1166 {
1380 conflict_found = 1; 1167 conflict_found = 1;
1381 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);
1382 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);
1383 } 1170 }
1384 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);
1385 continue; 1172 continue;
1386 } 1173 }
1387 1174
1388 found = ar; 1175 found = at;
1389 } 1176 }
1390 1177
1391 /* No match if more more than one archetype matches. */ 1178 /* No match if more more than one archetype matches. */
1392 if (conflict_found) 1179 if (conflict_found)
1393 return NULL; 1180 return NULL;
… …
1395 /* Return if exactly one archetype matches. */ 1182 /* Return if exactly one archetype matches. */
1396 if (found != NULL) 1183 if (found != NULL)
1397 return arch_to_object (found); 1184 return arch_to_object (found);
1398 1185
1399 /* No spell found: just print an error message. */ 1186 /* No spell found: just print an error message. */
1400 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);
1401 return NULL; 1188 return NULL;
1402} 1189}
1403 1190
1404static int 1191static int
1405command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
… …
1458 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);
1459 return 0; 1246 return 0;
1460 } 1247 }
1461 1248
1462 do_forget_spell (op, spell->name); 1249 do_forget_spell (op, spell->name);
1463 return 1;
1464}
1465
1466/**
1467 * Lists all plugins currently loaded with their IDs and full names.
1468 */
1469int
1470command_listplugins (object *op, char *params)
1471{
1472 plugins_display_list (op);
1473 return 1;
1474}
1475
1476/**
1477 * Loads the given plugin. The DM specifies the name of the library to load (no
1478 * pathname is needed). Do not ever attempt to load the same plugin more than
1479 * once at a time, or bad things could happen.
1480 */
1481int
1482command_loadplugin (object *op, char *params)
1483{
1484 char buf[MAX_BUF];
1485
1486 if (params == NULL)
1487 {
1488 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1489 return 1;
1490 }
1491
1492 strcpy (buf, LIBDIR);
1493 strcat (buf, "/plugins/");
1494 strcat (buf, params);
1495 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1496 if (plugins_init_plugin (buf) == 0)
1497 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1498 else
1499 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1500 return 1;
1501}
1502
1503/**
1504 * Unloads the given plugin. The DM specified the ID of the library to unload.
1505 * Note that some things may behave strangely if the correct plugins are not
1506 * loaded.
1507 */
1508int
1509command_unloadplugin (object *op, char *params)
1510{
1511 if (params == NULL)
1512 {
1513 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1514 return 1;
1515 }
1516
1517 if (plugins_remove_plugin (params) == 0)
1518 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1519 else
1520 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1521 return 1; 1250 return 1;
1522} 1251}
1523 1252
1524/** 1253/**
1525 * A players wants to become DM and hide. 1254 * A players wants to become DM and hide.
… …
1846 return 0; 1575 return 0;
1847 } 1576 }
1848 1577
1849 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1578 if (!QUERY_FLAG (right, FLAG_REMOVED))
1850 right->remove (); 1579 right->remove ();
1580
1851 inserted = insert_ob_in_ob (right, left); 1581 insert_ob_in_ob (right, left);
1852 if (left->type == PLAYER)
1853 if (inserted == right)
1854 esrv_send_item (left, right);
1855 else
1856 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1857 1582
1858 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));
1859 1584
1860 return 0; 1585 return 0;
1861 1586

Diff Legend

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