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.24 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.62 by root, Fri Dec 26 10:14:01 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 25#include <sproto.h>
27#endif
28#include <spells.h> 26#include <spells.h>
29#include <treasure.h> 27#include <treasure.h>
30#include <skills.h> 28#include <skills.h>
31 29
32/** Defines for DM item stack **/ 30/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 45 * other player, or NULL otherwise.
48 */ 46 */
49static player * 47static player *
50get_other_player_from_name (object *op, char *name) 48get_other_player_from_name (object *op, char *name)
51{ 49{
52 player *pl;
53
54 if (!name) 50 if (!name)
55 return NULL; 51 return NULL;
56 52
57 for (pl = first_player; pl != NULL; pl = pl->next) 53 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 54 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 55 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 56 if (pl->ob == op)
68 { 57 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 58 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 59 return NULL;
71 } 60 }
61
72 if (pl->state != ST_PLAYING) 62 if (pl->ns->state != ST_PLAYING)
73 { 63 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 64 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 65 return NULL;
66 }
67
68 return pl;
76 } 69 }
70
71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 72 return 0;
78} 73}
79 74
80/** 75/**
81 * Actually hides specified player (obviously a DM). 76 * Actually hides specified player (obviously a DM).
82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 77 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
90 op->contr->hidden = 0; 85 op->contr->hidden = 0;
91 op->invisible = 1; 86 op->invisible = 1;
92 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 87 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
93 op->map->players++; 88 op->map->players++;
94 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 89 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
90
95 if (!silent_dm) 91 if (!silent_dm)
96 {
97 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 92 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
98 }
99 } 93 }
100 else 94 else
101 { 95 {
102 op->contr->hidden = 1; 96 op->contr->hidden = 1;
103 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 97 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
104 op->map->players--; 98 op->map->players--;
99
105 if (!silent_dm) 100 if (!silent_dm)
106 {
107 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 101 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
108 } 102
109 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 103 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
110 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
111 } 105 }
112} 106}
113 107
… …
177 171
178 become_follower (ob, god); 172 become_follower (ob, god);
179 return 1; 173 return 1;
180} 174}
181 175
182/** 176// TODO: Rewrite banish in perl and get rid of the following two functions
183 * Add player's IP to ban_file and kick them off the server
184 * I know most people have dynamic IPs but this is more of a short term
185 * solution if they have to get a new IP to play maybe they'll calm down.
186 * This uses the banish_file in the local directory *not* the ban_file
187 * The action is logged with a ! for easy searching. -tm
188 */
189int
190command_banish (object *op, char *params)
191{
192 player *pl;
193 FILE *banishfile;
194 char buf[MAX_BUF];
195 time_t now;
196
197 if (!params)
198 {
199 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
200 return 1;
201 }
202
203 pl = get_other_player_from_name (op, params);
204 if (!pl)
205 return 1;
206
207 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
208
209 if ((banishfile = fopen (buf, "a")) == NULL)
210 {
211 LOG (llevDebug, "Could not find file banish_file.\n");
212 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
213 return 0;
214 }
215
216 now = time (NULL);
217 /*
218 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code.
220 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket->host, &op->name, ctime (&now));
222 fprintf (banishfile, "*@%s\n", pl->socket->host);
223 fclose (banishfile);
224
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket->host);
226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
227 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
228 command_kick (op, (char *) &pl->ob->name);
229 return 1;
230}
231
232int 177int
233command_kick (object *op, char *params) 178command_kick (object *op, char *params)
234{ 179{
235 for (player *pl = first_player; pl; pl = pl->next) 180 for_all_players (pl)
236 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)))
237 { 182 {
238 object *op = pl->ob; 183 object *plop = pl->ob;
239 184
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
241 { 186 {
242 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);
243 strcpy (op->contr->killer, "kicked"); 188 plop->contr->killer = op;
244 } 189 }
245 190
246 pl->socket->destroy (); 191 pl->ns->destroy ();
247 } 192 }
248 193
249 return 1; 194 return 1;
250} 195}
251 196
197//TODO
198#if 0
252int 199int
253command_save_overlay (object *op, char *params) 200command_save_overlay (object *op, char *params)
254{ 201{
255 if (!op) 202 if (!op)
256 return 0; 203 return 0;
… …
267 214
268 ready_map_name (op->map->path, 0); 215 ready_map_name (op->map->path, 0);
269 216
270 return 1; 217 return 1;
271} 218}
272 219#endif
273int
274command_shutdown (object *op, char *params)
275{
276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
277 {
278 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
279 return 1;
280 }
281
282 cleanup ();
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;
… …
326 object *dummy; 260 object *dummy;
327 player *pl; 261 player *pl;
328 262
329 if (!op) 263 if (!op)
330 return 0; 264 return 0;
265
331 if (params == NULL) 266 if (params == NULL)
332 { 267 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 268 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 269 return 1;
335 } 270 }
271
336 pl = get_other_player_from_name (op, params); 272 pl = get_other_player_from_name (op, params);
337 if (!pl) 273 if (!pl)
338 return 1; 274 return 1;
275
339 dummy = get_jail_exit (pl->ob); 276 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 277 if (!dummy)
341 { 278 {
342 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
343 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");
344 return 0; 281 return 0;
345 } 282 }
346 enter_exit (pl->ob, dummy); 283
284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
347 dummy->destroy (); 285 dummy->destroy ();
286
348 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.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 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);
351 return 1; 290 return 1;
352} 291}
… …
376 { 315 {
377 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.");
378 return 1; 317 return 1;
379 } 318 }
380 319
381 dummy = object::create (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
382 EXIT_PATH (dummy) = op->map->path;
383 EXIT_X (dummy) = op->x + freearr_x[i];
384 EXIT_Y (dummy) = op->y + freearr_y[i];
385 enter_exit (pl->ob, dummy);
386 dummy->destroy ();
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 323
390 return 1;
391}
392
393/**
394 * Teleport next to target player.
395 */
396
397/* mids 01/16/2002 */
398int
399command_teleport (object *op, char *params)
400{
401 int i;
402 object *dummy;
403 player *pl;
404
405 if (!op)
406 return 0;
407
408 if (params == NULL)
409 {
410 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
411 return 1;
412 }
413
414 pl = get_other_player_from_name (op, params);
415 if (!pl)
416 return 1;
417
418 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
419 if (i == -1)
420 {
421 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
422 return 1;
423 }
424
425 dummy = object::create ();
426 EXIT_PATH (dummy) = pl->ob->map->path;
427 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
428 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
429 enter_exit (op, dummy);
430 dummy->destroy ();
431 if (!op->contr->hidden)
432 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
433 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
434 return 1; 324 return 1;
435} 325}
436 326
437/** 327/**
438 * This function is a real mess, because we're stucking getting 328 * This function is a real mess, because we're stucking getting
… …
528 * we also set up spell_name which is only 418 * we also set up spell_name which is only
529 * the first word. 419 * the first word.
530 */ 420 */
531 421
532 at_spell = archetype::find (cp); 422 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 423 if (!at_spell || at_spell->type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 424 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 425 if (!at_spell || at_spell->type != SPELL)
536 { 426 {
537 strcpy (spell_name, cp); 427 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 428 fsp = strchr (spell_name, ' ');
539 if (fsp) 429 if (fsp)
540 { 430 {
541 *fsp = 0; 431 *fsp = 0;
542 fsp++; 432 fsp++;
543 at_spell = archetype::find (spell_name); 433 at_spell = archetype::find (spell_name);
544 434
545 /* Got a spell, update the first string pointer */ 435 /* Got a spell, update the first string pointer */
546 if (at_spell && at_spell->clone.type == SPELL) 436 if (at_spell && at_spell->type == SPELL)
547 bp2 = cp + strlen (spell_name) + 1; 437 bp2 = cp + strlen (spell_name) + 1;
548 else 438 else
549 at_spell = NULL; 439 at_spell = NULL;
550 } 440 }
551 } 441 }
… …
553 /* OK - we didn't find a spell - presume the 'of' 443 /* OK - we didn't find a spell - presume the 'of'
554 * in this case means its an artifact. 444 * in this case means its an artifact.
555 */ 445 */
556 if (!at_spell) 446 if (!at_spell)
557 { 447 {
558 if (find_artifactlist (at->clone.type) == NULL) 448 if (find_artifactlist (at->type) == NULL)
559 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);
560 else 450 else
561 { 451 {
562 art = find_artifactlist (at->clone.type)->items; 452 art = find_artifactlist (at->type)->items;
563 453
564 do 454 while (art)
565 { 455 {
566 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (art->item->name, cp))
567 break; 457 break;
458
568 art = art->next; 459 art = art->next;
569 } 460 }
570 while (art != NULL);
571 461
572 if (!art) 462 if (!art)
573 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);
574 } 464 }
575 465
576 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);
577 } 467 }
578 } /* if cp */ 468 } /* if cp */
579 469
580 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 470 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
581 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 471 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
582 { 472 {
583 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);
584 return 1; 474 return 1;
585 } 475 }
586 476
… …
588 * 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,
589 * just create one object, do all the processing, and then determine 479 * just create one object, do all the processing, and then determine
590 * 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.
591 */ 481 */
592 tmp = arch_to_object (at); 482 tmp = arch_to_object (at);
593
594 if (settings.real_wiz == FALSE)
595 SET_FLAG (tmp, FLAG_WAS_WIZ);
596 483
597 if (set_magic) 484 if (set_magic)
598 set_abs_magic (tmp, magic); 485 set_abs_magic (tmp, magic);
599 486
600 if (art) 487 if (art)
… …
680 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);
681 568
682 bp2 = bp3 + 1; 569 bp2 = bp3 + 1;
683 } 570 }
684 571
685 if (at->clone.nrof) 572 if (at->nrof)
686 { 573 {
687 if (at_spell) 574 if (at_spell)
688 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
689 576
690 tmp->x = op->x; 577 tmp->x = op->x;
691 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
692 580
693 if (set_nrof) 581 if (set_nrof)
694 tmp->nrof = nrof; 582 tmp->nrof = nrof;
695 583
696 tmp->map = op->map; 584 op->insert (tmp);
697
698 tmp = insert_ob_in_ob (tmp, op);
699 esrv_send_item (op, tmp);
700 585
701 /* 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. */
702 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
703 588
704 return 1; 589 return 1;
705 } 590 }
706 else 591 else
707 { 592 {
708 for (i = 0; i < (set_nrof ? nrof : 1); i++) 593 for (i = 0; i < (set_nrof ? nrof : 1); i++)
709 { 594 {
710 archetype *atmp;
711 object *prev = 0, *head = 0; 595 object *prev = 0, *head = 0;
712 596
713 for (atmp = at; atmp; atmp = atmp->more) 597 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
714 { 598 {
715 object *dup = arch_to_object (atmp); 599 object *dup = arch_to_object (atmp);
716 600
717 if (at_spell) 601 if (at_spell)
718 insert_ob_in_ob (arch_to_object (at_spell), dup); 602 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
725 { 609 {
726 head = dup; 610 head = dup;
727 tmp->copy_to (dup); 611 tmp->copy_to (dup);
728 } 612 }
729 613
730 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ);
732
733 dup->x = op->x + dup->arch->clone.x; 614 dup->x = op->x + dup->arch->x;
734 dup->y = op->y + dup->arch->clone.y; 615 dup->y = op->y + dup->arch->y;
735 dup->map = op->map; 616 dup->map = op->map;
736 617
737 if (head != dup) 618 if (head != dup)
738 { 619 {
739 dup->head = head; 620 dup->head = head;
… …
749 int size_x = 0; 630 int size_x = 0;
750 int size_y = 0; 631 int size_y = 0;
751 632
752 while (check) 633 while (check)
753 { 634 {
754 size_x = MAX (size_x, check->arch->clone.x); 635 size_x = MAX (size_x, check->arch->x);
755 size_y = MAX (size_y, check->arch->clone.y); 636 size_y = MAX (size_y, check->arch->y);
756 check = check->more; 637 check = check->more;
757 } 638 }
758 639
759 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))
760 { 641 {
… …
786 /* 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
787 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
788 */ 669 */
789 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
790 671
791 if (at->clone.randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
792 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
793
794 esrv_send_item (op, head);
795 } 674 }
796 675
797 /* free the one we used to copy */ 676 /* free the one we used to copy */
798 tmp->destroy (); 677 tmp->destroy ();
799 } 678 }
… …
806 */ 685 */
807 686
808int 687int
809command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
810{ 689{
690 int i;
811 object *tmp; 691 object *tmp;
812 int i;
813 692
814 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
815 { 694 {
816 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
817 return 0; 696 return 1;
818 }
819
820 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
821 { 697 }
822 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
823 return 1;
824 }
825 698
826 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
827 return 1; 701 return 1;
828} 702}
829 703
830/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
831 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
852 free (dump); 726 free (dump);
853 727
854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 728 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
856 730
857 return 1;
858}
859
860/**
861 * When DM is possessing a monster, flip aggression on and off, to allow
862 * better motion.
863 */
864int
865command_mon_aggr (object *op, char *params)
866{
867 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
868 {
869 op->enemy = NULL;
870 SET_FLAG (op, FLAG_UNAGGRESSIVE);
871 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
872 }
873 else
874 {
875 CLEAR_FLAG (op, FLAG_FRIENDLY);
876 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
877 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
878 }
879
880 return 1;
881}
882
883/** DM can possess a monster. Basically, this tricks the client into thinking
884 * a given monster, is actually the player it controls. This allows a DM
885 * to inhabit a monster's body, and run around the game with it.
886 * This function is severely broken - it has tons of hardcoded values,
887 */
888int
889command_possess (object *op, char *params)
890{
891 object *victim, *curinv, *nextinv;
892 player *pl;
893 int i;
894 char buf[MAX_BUF];
895
896 victim = NULL;
897 if (params != NULL)
898 {
899 if (sscanf (params, "%d", &i))
900 victim = find_object (i);
901 else if (sscanf (params, "%s", buf))
902 victim = find_object_name (buf);
903 }
904 if (victim == NULL)
905 {
906 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
907 return 1;
908 }
909
910 if (victim == op)
911 {
912 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
913 return 1;
914 }
915
916 /* clear out the old inventory */
917 curinv = op->inv;
918 while (curinv != NULL)
919 {
920 nextinv = curinv->below;
921 esrv_del_item (op->contr, curinv->count);
922 curinv = nextinv;
923 }
924
925 /* make the switch */
926 pl = op->contr;
927 victim->contr = pl;
928 pl->ob = victim;
929 victim->type = PLAYER;
930 SET_FLAG (victim, FLAG_WIZ);
931
932 /* send the inventory to the client */
933 curinv = victim->inv;
934 while (curinv != NULL)
935 {
936 nextinv = curinv->below;
937 esrv_send_item (victim, curinv);
938 curinv = nextinv;
939 }
940 /* basic patchup */
941 /* The use of hard coded values is terrible. Note
942 * that really, to be fair, this shouldn't get changed at
943 * all - if you are possessing a kobold, you should have the
944 * same limitations. As it is, as more body locations are added,
945 * this will give this player more locations than perhaps
946 * they should be allowed.
947 */
948 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
949 if (i == 1 || i == 6 || i == 8 || i == 9)
950 victim->body_info[i] = 2;
951 else
952 victim->body_info[i] = 1;
953
954 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
955 esrv_send_inventory (victim, victim);
956
957 fix_player (victim);
958
959 do_some_living (victim);
960 return 1; 731 return 1;
961} 732}
962 733
963int 734int
964command_patch (object *op, char *params) 735command_patch (object *op, char *params)
… …
979 return 1; 750 return 1;
980 } 751 }
981 752
982 if ((arg2 = strchr (arg, ' '))) 753 if ((arg2 = strchr (arg, ' ')))
983 arg2++; 754 arg2++;
984 if (settings.real_wiz == FALSE) 755
985 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
986 if (set_variable (tmp, arg) == -1) 756 if (set_variable (tmp, arg) == -1)
987 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);
988 else 758 else
989 {
990 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);
991 }
992 760
993 return 1; 761 return 1;
994} 762}
995 763
996int 764int
… …
1045 813
1046 if (from != STACK_FROM_STACK) 814 if (from != STACK_FROM_STACK)
1047 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 815 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1048 dm_stack_pop (op->contr); 816 dm_stack_pop (op->contr);
1049 817
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 tmp->remove ();
1054 }
1055
1056 if (tmp->head) 818 if (tmp->head)
1057 tmp = tmp->head; 819 tmp = tmp->head;
1058 820
1059 tmp->destroy (); 821 tmp->destroy ();
1060 return 1; 822 return 1;
… …
1065 */ 827 */
1066int 828int
1067command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
1068{ 830{
1069 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
1070 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1071 object *skillob = NULL; 834 object *skillob = NULL;
1072 player *pl;
1073 835
1074 skill[0] = '\0'; 836 skill[0] = '\0';
1075 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))
1076 { 838 {
1077 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>].");
1078 return 1; 840 return 1;
1079 } 841 }
1080 842
1081 for (pl = first_player; pl != NULL; pl = pl->next) 843 for_all_players (pl)
1082 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 844 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1083 break;
1084
1085 if (pl == NULL)
1086 { 845 {
1087 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1088 return 1;
1089 }
1090
1091 if (q >= 3) 846 if (q >= 3)
1092 { 847 {
1093 skillob = find_skill_by_name (pl->ob, skill); 848 skillob = find_skill_by_name (pl->ob, skill);
1094 if (!skillob) 849 if (!skillob)
1095 { 850 {
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 851 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
852 return 1;
853 }
854
855 i = check_exp_adjust (skillob, i);
856 skillob->stats.exp += i;
857 calc_perm_exp (skillob);
858 player_lvl_adj (pl->ob, skillob);
859 }
860
861 pl->ob->stats.exp += i;
862 calc_perm_exp (pl->ob);
863 player_lvl_adj (pl->ob, NULL);
864
1097 return 1; 865 return 1;
1098 } 866 }
1099 867
1100 i = check_exp_adjust (skillob, i); 868 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1101 skillob->stats.exp += i;
1102 calc_perm_exp (skillob);
1103 player_lvl_adj (pl->ob, skillob);
1104 }
1105
1106 pl->ob->stats.exp += i;
1107 calc_perm_exp (pl->ob);
1108 player_lvl_adj (pl->ob, NULL);
1109
1110 if (settings.real_wiz == FALSE)
1111 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1112 return 1; 869 return 1;
1113} 870}
1114 871
1115/**************************************************************************/ 872/**************************************************************************/
1116 873
… …
1122 879
1123int 880int
1124command_stats (object *op, char *params) 881command_stats (object *op, char *params)
1125{ 882{
1126 char thing[20]; 883 char thing[20];
1127 player *pl;
1128 char buf[MAX_BUF]; 884 char buf[MAX_BUF];
1129 885
1130 thing[0] = '\0'; 886 thing[0] = '\0';
1131 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 887 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1132 { 888 {
1133 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1134 return 1; 890 return 1;
1135 } 891 }
1136 892
1137 for (pl = first_player; pl != NULL; pl = pl->next) 893 for_all_players (pl)
1138 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (pl->ob->name, thing))
1139 { 895 {
1140 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);
1141 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
1142 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);
… …
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 905 new_draw_info (NDI_UNIQUE, 0, op, buf);
1150 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 906 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 907 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 908 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 909 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 break; 910 return 1;
1155 } 911 }
1156 if (pl == NULL) 912
1157 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 913 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1158 return 1; 914 return 1;
1159} 915}
1160 916
1161int 917int
1162command_abil (object *op, char *params) 918command_abil (object *op, char *params)
1163{ 919{
1164 char thing[20], thing2[20]; 920 char thing[20], thing2[20];
1165 int iii; 921 int iii;
1166 player *pl;
1167 char buf[MAX_BUF]; 922 char buf[MAX_BUF];
1168 923
1169 iii = 0; 924 iii = 0;
1170 thing[0] = '\0'; 925 thing[0] = '\0';
1171 thing2[0] = '\0'; 926 thing2[0] = '\0';
… …
1185 { 940 {
1186 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 941 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1187 return 1; 942 return 1;
1188 } 943 }
1189 944
1190 for (pl = first_player; pl != NULL; pl = pl->next) 945 for_all_players (pl)
1191 { 946 {
1192 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (pl->ob->name, thing))
1193 { 948 {
1194 if (settings.real_wiz == FALSE)
1195 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1196 if (!strcmp ("str", thing2))
1197 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;
1198 if (!strcmp ("dex", thing2))
1199 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;
1200 if (!strcmp ("con", thing2))
1201 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;
1202 if (!strcmp ("wis", thing2))
1203 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;
1204 if (!strcmp ("cha", thing2))
1205 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;
1206 if (!strcmp ("int", thing2))
1207 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;
1208 if (!strcmp ("pow", thing2))
1209 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
1210 sprintf (buf, "%s has been altered.", &pl->ob->name); 957 sprintf (buf, "%s has been altered.", &pl->ob->name);
1211 new_draw_info (NDI_UNIQUE, 0, op, buf); 958 new_draw_info (NDI_UNIQUE, 0, op, buf);
1212 fix_player (pl->ob); 959 pl->ob->update_stats ();
1213 return 1; 960 return 1;
1214 } 961 }
1215 } 962 }
1216 963
1217 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 964 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1218 return 1; 965 return 1;
1219} 966}
1220 967
1221int 968int
1222command_reset (object *op, char *params)
1223{
1224 maptile *m;
1225 object *dummy = NULL, *tmp = NULL;
1226
1227 if (params == NULL)
1228 {
1229 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1230 return 1;
1231 }
1232
1233 if (strcmp (params, ".") == 0)
1234 params = op->map->path;
1235
1236 m = has_been_loaded (params);
1237 if (m == NULL)
1238 {
1239 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1240 return 1;
1241 }
1242
1243 if (m->in_memory != MAP_SWAPPED)
1244 {
1245 if (m->in_memory != MAP_IN_MEMORY)
1246 {
1247 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1248 return 0;
1249 }
1250
1251 /*
1252 * Only attempt to remove the player that is doing the reset, and not other
1253 * players or wiz's.
1254 */
1255 if (op->map == m)
1256 {
1257 dummy = object::create ();
1258 dummy->map = NULL;
1259 EXIT_X (dummy) = op->x;
1260 EXIT_Y (dummy) = op->y;
1261 EXIT_PATH (dummy) = op->map->path;
1262 op->remove ();
1263 op->map = NULL;
1264 tmp = op;
1265 }
1266 swap_map (m);
1267 }
1268
1269 if (m->in_memory == MAP_SWAPPED)
1270 {
1271 LOG (llevDebug, "Resetting map %s.\n", m->path);
1272
1273 /* setting this effectively causes an immediate reload */
1274 m->reset_time = 1;
1275 flush_old_maps ();
1276 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1277
1278 if (tmp)
1279 {
1280 enter_exit (tmp, dummy);
1281 dummy->destroy ();
1282 }
1283
1284 return 1;
1285 }
1286 else
1287 {
1288 player *pl;
1289 int playercount = 0;
1290
1291 /* Need to re-insert player if swap failed for some reason */
1292 if (tmp)
1293 {
1294 insert_ob_in_map (op, m, NULL, 0);
1295 dummy->destroy ();
1296 }
1297
1298 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1299 for (pl = first_player; pl != NULL; pl = pl->next)
1300 {
1301 if (pl->ob->map == m && pl->ob != op)
1302 {
1303 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1304 playercount++;
1305 }
1306 }
1307 if (!playercount)
1308 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1309 return 1;
1310 }
1311}
1312
1313int
1314command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
1315{ /* 'noadm' is alias */ 970{ /* 'nodm' is alias */
1316 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
1317 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
1318 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
1319 974
1320 if (settings.real_wiz == TRUE)
1321 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1322 if (op->contr->hidden) 975 if (op->contr->hidden)
1323 { 976 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 977 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1325 op->map->players++; 978 op->map->players++;
1326 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 979 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1385 { 1038 {
1386 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1039 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1387 return 0; 1040 return 0;
1388 } 1041 }
1389 1042
1390 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket->host)) 1043 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1391 { 1044 {
1392 SET_FLAG (op, FLAG_WIZ); 1045 SET_FLAG (op, FLAG_WIZ);
1393 SET_FLAG (op, FLAG_WAS_WIZ);
1394 SET_FLAG (op, FLAG_WIZPASS); 1046 SET_FLAG (op, FLAG_WIZPASS);
1395 SET_FLAG (op, FLAG_WIZCAST); 1047 SET_FLAG (op, FLAG_WIZCAST);
1048 SET_FLAG (op, FLAG_WIZLOOK);
1049
1396 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1050 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1397 /*
1398 * Remove setting flying here - that won't work, because next
1399 * fix_player() is called that will get cleared - proper solution
1400 * is probably something like a wiz_force which gives that and any
1401 * other desired abilities.
1402 */
1403 clear_los (op);
1404 op->contr->write_buf[0] = '\0'; 1051 op->contr->write_buf[0] = '\0';
1405 1052
1406 if (!silent) 1053 if (!silent)
1407 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1054 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1408 1055
… …
1435command_invisible (object *op, char *params) 1082command_invisible (object *op, char *params)
1436{ 1083{
1437 if (op) 1084 if (op)
1438 { 1085 {
1439 op->invisible += 100; 1086 op->invisible += 100;
1440 update_object (op, UP_OBJ_FACE); 1087 update_object (op, UP_OBJ_CHANGE);
1441 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1088 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1442 } 1089 }
1443 1090
1444 return 0; 1091 return 0;
1445} 1092}
… …
1457 * name than other "spell_xxx" archetypes and would always conflict. 1104 * name than other "spell_xxx" archetypes and would always conflict.
1458 */ 1105 */
1459static object * 1106static object *
1460get_spell_by_name (object *op, const char *spell_name) 1107get_spell_by_name (object *op, const char *spell_name)
1461{ 1108{
1462 archetype *ar; 1109 archetype *at;
1463 archetype *found; 1110 archetype *found;
1464 int conflict_found; 1111 int conflict_found;
1465 size_t spell_name_length; 1112 size_t spell_name_length;
1466 1113
1467 /* First check for full name matches. */ 1114 /* First check for full name matches. */
1468 conflict_found = 0; 1115 conflict_found = 0;
1469 found = NULL; 1116 found = NULL;
1470 for (ar = first_archetype; ar != NULL; ar = ar->next) 1117 for_all_archetypes (at)
1471 { 1118 {
1472 if (ar->clone.type != SPELL) 1119 if (at->type != SPELL)
1473 continue; 1120 continue;
1474 1121
1475 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1122 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1476 continue; 1123 continue;
1477 1124
1478 if (strcmp (ar->clone.name, spell_name) != 0) 1125 if (strcmp (at->object::name, spell_name) != 0)
1479 continue; 1126 continue;
1480 1127
1481 if (found != NULL) 1128 if (found != NULL)
1482 { 1129 {
1483 if (!conflict_found) 1130 if (!conflict_found)
1484 { 1131 {
1485 conflict_found = 1; 1132 conflict_found = 1;
1486 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1487 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1134 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1488 } 1135 }
1136
1489 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1137 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1490 continue; 1138 continue;
1491 } 1139 }
1492 1140
1493 found = ar; 1141 found = at;
1494 } 1142 }
1495 1143
1496 /* No match if more more than one archetype matches. */ 1144 /* No match if more more than one archetype matches. */
1497 if (conflict_found) 1145 if (conflict_found)
1498 return NULL; 1146 return NULL;
… …
1503 1151
1504 /* No full match found: now check for partial matches. */ 1152 /* No full match found: now check for partial matches. */
1505 spell_name_length = strlen (spell_name); 1153 spell_name_length = strlen (spell_name);
1506 conflict_found = 0; 1154 conflict_found = 0;
1507 found = NULL; 1155 found = NULL;
1508 for (ar = first_archetype; ar != NULL; ar = ar->next) 1156 for_all_archetypes (at)
1509 { 1157 {
1510 if (ar->clone.type != SPELL) 1158 if (at->type != SPELL)
1511 continue; 1159 continue;
1512 1160
1513 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1161 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1514 continue; 1162 continue;
1515 1163
1516 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1164 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1517 continue; 1165 continue;
1518 1166
1519 if (found != NULL) 1167 if (found != NULL)
1520 { 1168 {
1521 if (!conflict_found) 1169 if (!conflict_found)
1522 { 1170 {
1523 conflict_found = 1; 1171 conflict_found = 1;
1524 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1172 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1525 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1173 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1526 } 1174 }
1527 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1175 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1528 continue; 1176 continue;
1529 } 1177 }
1530 1178
1531 found = ar; 1179 found = at;
1532 } 1180 }
1533 1181
1534 /* No match if more more than one archetype matches. */ 1182 /* No match if more more than one archetype matches. */
1535 if (conflict_found) 1183 if (conflict_found)
1536 return NULL; 1184 return NULL;
… …
1601 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1249 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1602 return 0; 1250 return 0;
1603 } 1251 }
1604 1252
1605 do_forget_spell (op, spell->name); 1253 do_forget_spell (op, spell->name);
1606 return 1;
1607}
1608
1609/**
1610 * Lists all plugins currently loaded with their IDs and full names.
1611 */
1612int
1613command_listplugins (object *op, char *params)
1614{
1615 plugins_display_list (op);
1616 return 1;
1617}
1618
1619/**
1620 * Loads the given plugin. The DM specifies the name of the library to load (no
1621 * pathname is needed). Do not ever attempt to load the same plugin more than
1622 * once at a time, or bad things could happen.
1623 */
1624int
1625command_loadplugin (object *op, char *params)
1626{
1627 char buf[MAX_BUF];
1628
1629 if (params == NULL)
1630 {
1631 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1632 return 1;
1633 }
1634
1635 strcpy (buf, LIBDIR);
1636 strcat (buf, "/plugins/");
1637 strcat (buf, params);
1638 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1639 if (plugins_init_plugin (buf) == 0)
1640 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1641 else
1642 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1643 return 1;
1644}
1645
1646/**
1647 * Unloads the given plugin. The DM specified the ID of the library to unload.
1648 * Note that some things may behave strangely if the correct plugins are not
1649 * loaded.
1650 */
1651int
1652command_unloadplugin (object *op, char *params)
1653{
1654 if (params == NULL)
1655 {
1656 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1657 return 1;
1658 }
1659
1660 if (plugins_remove_plugin (params) == 0)
1661 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1662 else
1663 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1664 return 1; 1254 return 1;
1665} 1255}
1666 1256
1667/** 1257/**
1668 * A players wants to become DM and hide. 1258 * A players wants to become DM and hide.
… …
1989 return 0; 1579 return 0;
1990 } 1580 }
1991 1581
1992 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1582 if (!QUERY_FLAG (right, FLAG_REMOVED))
1993 right->remove (); 1583 right->remove ();
1584
1994 inserted = insert_ob_in_ob (right, left); 1585 insert_ob_in_ob (right, left);
1995 if (left->type == PLAYER)
1996 if (inserted == right)
1997 esrv_send_item (left, right);
1998 else
1999 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2000 1586
2001 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1587 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2002 1588
2003 return 0; 1589 return 0;
2004 1590

Diff Legend

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