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.18 by pippijn, Sat Dec 9 17:28:37 2006 UTC vs.
Revision 1.72 by root, Mon Oct 12 14:00:59 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 (©) 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 it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * 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 Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 26#include <sproto.h>
27#endif
28#include <spells.h> 27#include <spells.h>
29#include <treasure.h> 28#include <treasure.h>
30#include <skills.h> 29#include <skills.h>
31 30
32/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 57 if (pl->ob == op)
68 { 58 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) 63 if (pl->ns->state != ST_PLAYING)
73 { 64 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 66 return NULL;
67 }
68
69 return pl;
76 } 70 }
71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
77 return pl; 73 return 0;
78} 74}
79 75
80/** 76/**
81 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
90 op->contr->hidden = 0; 86 op->contr->hidden = 0;
91 op->invisible = 1; 87 op->invisible = 1;
92 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
93 op->map->players++; 89 op->map->players++;
94 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
91
95 if (!silent_dm) 92 if (!silent_dm)
96 {
97 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
98 }
99 } 94 }
100 else 95 else
101 { 96 {
102 op->contr->hidden = 1; 97 op->contr->hidden = 1;
103 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
104 op->map->players--; 99 op->map->players--;
100
105 if (!silent_dm) 101 if (!silent_dm)
106 {
107 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
108 } 103
109 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 104 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); 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
111 } 106 }
112} 107}
113 108
… …
177 172
178 become_follower (ob, god); 173 become_follower (ob, god);
179 return 1; 174 return 1;
180} 175}
181 176
182/** 177// 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 178int
233command_kick (object *op, char *params) 179command_kick (object *op, char *params)
234{ 180{
235 for (player *pl = first_player; pl; pl = pl->next) 181 for_all_players (pl)
236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
237 { 183 {
238 object *op = pl->ob; 184 object *plop = pl->ob;
239 185
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
241 { 187 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 188 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"); 189 plop->contr->killer = op;
244 } 190 }
245 191
246 pl->socket.status = Ns_Dead; 192 pl->ns->destroy ();
247 } 193 }
248 194
249 return 1; 195 return 1;
250} 196}
251 197
198//TODO
199#if 0
252int 200int
253command_save_overlay (object *op, char *params) 201command_save_overlay (object *op, char *params)
254{ 202{
255 if (!op) 203 if (!op)
256 return 0; 204 return 0;
… …
267 215
268 ready_map_name (op->map->path, 0); 216 ready_map_name (op->map->path, 0);
269 217
270 return 1; 218 return 1;
271} 219}
272 220#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 221
287int 222int
288command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
289{ 224{
290 int ticks; 225 int ticks;
… …
326 object *dummy; 261 object *dummy;
327 player *pl; 262 player *pl;
328 263
329 if (!op) 264 if (!op)
330 return 0; 265 return 0;
266
331 if (params == NULL) 267 if (params == NULL)
332 { 268 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 270 return 1;
335 } 271 }
272
336 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
337 if (!pl) 274 if (!pl)
338 return 1; 275 return 1;
276
339 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 278 if (!dummy)
341 { 279 {
342 /* we have nowhere to send the prisoner.... */ 280 /* 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"); 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
344 return 0; 282 return 0;
345 } 283 }
346 enter_exit (pl->ob, dummy); 284
347 free_object (dummy); 285 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
286 dummy->destroy ();
287
348 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 288 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 289 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 290 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
351 return 1; 291 return 1;
352} 292}
… …
376 { 316 {
377 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 317 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
378 return 1; 318 return 1;
379 } 319 }
380 320
381 dummy = get_object (); 321 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 free_object (dummy);
387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 322 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 323 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 324
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 = get_object ();
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 free_object (dummy);
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; 325 return 1;
435} 326}
436 327
437/** 328/**
438 * This function is a real mess, because we're stucking getting 329 * This function is a real mess, because we're stucking getting
… …
528 * we also set up spell_name which is only 419 * we also set up spell_name which is only
529 * the first word. 420 * the first word.
530 */ 421 */
531 422
532 at_spell = archetype::find (cp); 423 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 424 if (!at_spell || at_spell->type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 425 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 426 if (!at_spell || at_spell->type != SPELL)
536 { 427 {
537 strcpy (spell_name, cp); 428 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 429 fsp = strchr (spell_name, ' ');
539 if (fsp) 430 if (fsp)
540 { 431 {
541 *fsp = 0; 432 *fsp = 0;
542 fsp++; 433 fsp++;
543 at_spell = archetype::find (spell_name); 434 at_spell = archetype::find (spell_name);
544 435
545 /* Got a spell, update the first string pointer */ 436 /* Got a spell, update the first string pointer */
546 if (at_spell && at_spell->clone.type == SPELL) 437 if (at_spell && at_spell->type == SPELL)
547 bp2 = cp + strlen (spell_name) + 1; 438 bp2 = cp + strlen (spell_name) + 1;
548 else 439 else
549 at_spell = NULL; 440 at_spell = NULL;
550 } 441 }
551 } 442 }
… …
553 /* OK - we didn't find a spell - presume the 'of' 444 /* OK - we didn't find a spell - presume the 'of'
554 * in this case means its an artifact. 445 * in this case means its an artifact.
555 */ 446 */
556 if (!at_spell) 447 if (!at_spell)
557 { 448 {
558 if (find_artifactlist (at->clone.type) == NULL) 449 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); 450 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
560 else 451 else
561 { 452 {
562 art = find_artifactlist (at->clone.type)->items; 453 art = find_artifactlist (at->type)->items;
563 454
564 do 455 while (art)
565 { 456 {
566 if (!strcmp (art->item->name, cp)) 457 if (!strcmp (&art->item->name, cp))
567 break; 458 break;
459
568 art = art->next; 460 art = art->next;
569 } 461 }
570 while (art != NULL);
571 462
572 if (!art) 463 if (!art)
573 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 464 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
574 } 465 }
575 466
576 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 467 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
577 } 468 }
578 } /* if cp */ 469 } /* if cp */
579 470
580 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 471 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
581 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 472 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
582 { 473 {
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); 474 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; 475 return 1;
585 } 476 }
586 477
… …
588 * Rather than have two different blocks with a lot of similar code, 479 * Rather than have two different blocks with a lot of similar code,
589 * just create one object, do all the processing, and then determine 480 * 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. 481 * if that one object should be inserted or if we need to make copies.
591 */ 482 */
592 tmp = arch_to_object (at); 483 tmp = arch_to_object (at);
593
594 if (settings.real_wiz == FALSE)
595 SET_FLAG (tmp, FLAG_WAS_WIZ);
596 484
597 if (set_magic) 485 if (set_magic)
598 set_abs_magic (tmp, magic); 486 set_abs_magic (tmp, magic);
599 487
600 if (art) 488 if (art)
… …
680 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 568 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
681 569
682 bp2 = bp3 + 1; 570 bp2 = bp3 + 1;
683 } 571 }
684 572
685 if (at->clone.nrof) 573 if (at->nrof)
686 { 574 {
687 if (at_spell) 575 if (at_spell)
688 insert_ob_in_ob (arch_to_object (at_spell), tmp); 576 tmp->insert (arch_to_object (at_spell));
689 577
690 tmp->x = op->x; 578 tmp->x = op->x;
691 tmp->y = op->y; 579 tmp->y = op->y;
580 tmp->map = op->map;
692 581
693 if (set_nrof) 582 if (set_nrof)
694 tmp->nrof = nrof; 583 tmp->nrof = nrof;
695 584
696 tmp->map = op->map; 585 op->insert (tmp);
697
698 tmp = insert_ob_in_ob (tmp, op);
699 esrv_send_item (op, tmp);
700 586
701 /* Let's put this created item on stack so dm can access it easily. */ 587 /* Let's put this created item on stack so dm can access it easily. */
702 dm_stack_push (op->contr, tmp->count); 588 dm_stack_push (op->contr, tmp->count);
703 589
704 return 1; 590 return 1;
705 } 591 }
706 else 592 else
707 { 593 {
708 for (i = 0; i < (set_nrof ? nrof : 1); i++) 594 for (i = 0; i < (set_nrof ? nrof : 1); i++)
709 { 595 {
710 archetype *atmp;
711 object *prev = 0, *head = 0; 596 object *prev = 0, *head = 0;
712 597
713 for (atmp = at; atmp; atmp = atmp->more) 598 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
714 { 599 {
715 object *dup = arch_to_object (atmp); 600 object *dup = arch_to_object (atmp);
716 601
717 if (at_spell) 602 if (at_spell)
718 insert_ob_in_ob (arch_to_object (at_spell), dup); 603 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
722 * so just copying it over should be fine. 607 * so just copying it over should be fine.
723 */ 608 */
724 if (!head) 609 if (!head)
725 { 610 {
726 head = dup; 611 head = dup;
727 copy_object (tmp, dup); 612 tmp->copy_to (dup);
728 } 613 }
729 614
730 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ);
732
733 dup->x = op->x + dup->arch->clone.x; 615 dup->x = op->x + dup->arch->x;
734 dup->y = op->y + dup->arch->clone.y; 616 dup->y = op->y + dup->arch->y;
735 dup->map = op->map; 617 dup->map = op->map;
736 618
737 if (head != dup) 619 if (head != dup)
738 { 620 {
739 dup->head = head; 621 dup->head = head;
… …
749 int size_x = 0; 631 int size_x = 0;
750 int size_y = 0; 632 int size_y = 0;
751 633
752 while (check) 634 while (check)
753 { 635 {
754 size_x = MAX (size_x, check->arch->clone.x); 636 size_x = MAX (size_x, check->arch->x);
755 size_y = MAX (size_y, check->arch->clone.y); 637 size_y = MAX (size_y, check->arch->y);
756 check = check->more; 638 check = check->more;
757 } 639 }
758 640
759 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 641 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
760 { 642 {
761 if (head->x < size_x || head->y < size_y) 643 if (head->x < size_x || head->y < size_y)
762 { 644 {
763 dm_stack_pop (op->contr); 645 dm_stack_pop (op->contr);
764 free_object (head); 646 head->destroy ();
765 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 647 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
766 free_object (tmp); 648 tmp->destroy ();
767 return 1; 649 return 1;
768 } 650 }
769 651
770 check = head; 652 check = head;
771 653
… …
786 /* Wonder if we really want to push all of these, but since 668 /* Wonder if we really want to push all of these, but since
787 * things like rods have nrof 0, we want to cover those. 669 * things like rods have nrof 0, we want to cover those.
788 */ 670 */
789 dm_stack_push (op->contr, head->count); 671 dm_stack_push (op->contr, head->count);
790 672
791 if (at->clone.randomitems != NULL && !at_spell) 673 if (at->randomitems && !at_spell)
792 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 674 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
793
794 esrv_send_item (op, head);
795 } 675 }
796 676
797 /* free the one we used to copy */ 677 /* free the one we used to copy */
798 free_object (tmp); 678 tmp->destroy ();
799 } 679 }
800 680
801 return 1; 681 return 1;
802} 682}
803 683
… …
806 */ 686 */
807 687
808int 688int
809command_inventory (object *op, char *params) 689command_inventory (object *op, char *params)
810{ 690{
691 int i;
811 object *tmp; 692 object *tmp;
812 int i;
813 693
814 if (!params) 694 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
815 { 695 {
816 inventory (op, NULL); 696 op->contr->failmsg ("Inventory of what object (nr)?");
817 return 0; 697 return 1;
818 }
819
820 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
821 { 698 }
822 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
823 return 1;
824 }
825 699
826 inventory (op, tmp); 700 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
701
827 return 1; 702 return 1;
828} 703}
829 704
830/* just show player's their skills for now. Dm's can 705/* just show player's their skills for now. Dm's can
831 * already see skills w/ inventory command - b.t. 706 * already see skills w/ inventory command - b.t.
… …
852 free (dump); 727 free (dump);
853 728
854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 729 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 730 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
856 731
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; 732 return 1;
961} 733}
962 734
963int 735int
964command_patch (object *op, char *params) 736command_patch (object *op, char *params)
… …
979 return 1; 751 return 1;
980 } 752 }
981 753
982 if ((arg2 = strchr (arg, ' '))) 754 if ((arg2 = strchr (arg, ' ')))
983 arg2++; 755 arg2++;
984 if (settings.real_wiz == FALSE) 756
985 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
986 if (set_variable (tmp, arg) == -1) 757 if (set_variable (tmp, arg) == -1)
987 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 758 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
988 else 759 else
989 {
990 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 760 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
991 }
992 761
993 return 1; 762 return 1;
994} 763}
995 764
996int 765int
… …
1023 dm_stack_pop (op->contr); 792 dm_stack_pop (op->contr);
1024 793
1025 /* Always work on the head - otherwise object will get in odd state */ 794 /* Always work on the head - otherwise object will get in odd state */
1026 if (tmp->head) 795 if (tmp->head)
1027 tmp = tmp->head; 796 tmp = tmp->head;
1028 remove_ob (tmp); 797 tmp->remove ();
1029 return 1; 798 return 1;
1030} 799}
1031 800
1032int 801int
1033command_free (object *op, char *params) 802command_free (object *op, char *params)
… …
1045 814
1046 if (from != STACK_FROM_STACK) 815 if (from != STACK_FROM_STACK)
1047 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 816 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1048 dm_stack_pop (op->contr); 817 dm_stack_pop (op->contr);
1049 818
1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1051 {
1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1053 remove_ob (tmp);
1054 }
1055
1056 if (tmp->head) 819 if (tmp->head)
1057 tmp = tmp->head; 820 tmp = tmp->head;
1058 free_object (tmp); 821
822 tmp->destroy ();
1059 return 1; 823 return 1;
1060} 824}
1061 825
1062/** 826/**
1063 * This adds exp to a player. We now allow adding to a specific skill. 827 * This adds exp to a player. We now allow adding to a specific skill.
1064 */ 828 */
1065int 829int
1066command_addexp (object *op, char *params) 830command_addexp (object *op, char *params)
1067{ 831{
1068 char buf[MAX_BUF], skill[MAX_BUF]; 832 char buf[MAX_BUF], skill[MAX_BUF];
1069 int i, q; 833 int q;
834 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1070 object *skillob = NULL; 835 object *skillob = NULL;
1071 player *pl;
1072 836
1073 skill[0] = '\0'; 837 skill[0] = '\0';
1074 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 838 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2))
1075 { 839 {
1076 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 840 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1077 return 1; 841 return 1;
1078 } 842 }
1079 843
1080 for (pl = first_player; pl != NULL; pl = pl->next) 844 for_all_players (pl)
1081 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 845 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1082 break;
1083
1084 if (pl == NULL)
1085 { 846 {
1086 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1087 return 1;
1088 }
1089
1090 if (q >= 3) 847 if (q >= 3)
1091 { 848 {
1092 skillob = find_skill_by_name (pl->ob, skill); 849 skillob = find_skill_by_name (pl->ob, skill);
1093 if (!skillob) 850 if (!skillob)
1094 { 851 {
1095 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 852 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
853 return 1;
854 }
855
856 i = check_exp_adjust (skillob, i);
857 skillob->stats.exp += i;
858 calc_perm_exp (skillob);
859 player_lvl_adj (pl->ob, skillob);
860 }
861
862 pl->ob->stats.exp += i;
863 calc_perm_exp (pl->ob);
864 player_lvl_adj (pl->ob, NULL);
865
1096 return 1; 866 return 1;
1097 } 867 }
1098 868
1099 i = check_exp_adjust (skillob, i); 869 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1100 skillob->stats.exp += i;
1101 calc_perm_exp (skillob);
1102 player_lvl_adj (pl->ob, skillob);
1103 }
1104
1105 pl->ob->stats.exp += i;
1106 calc_perm_exp (pl->ob);
1107 player_lvl_adj (pl->ob, NULL);
1108
1109 if (settings.real_wiz == FALSE)
1110 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1111 return 1; 870 return 1;
1112} 871}
1113 872
1114/**************************************************************************/ 873/**************************************************************************/
1115 874
… …
1121 880
1122int 881int
1123command_stats (object *op, char *params) 882command_stats (object *op, char *params)
1124{ 883{
1125 char thing[20]; 884 char thing[20];
1126 player *pl;
1127 char buf[MAX_BUF]; 885 char buf[MAX_BUF];
1128 886
1129 thing[0] = '\0'; 887 thing[0] = '\0';
1130 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 888 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1131 { 889 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 890 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1133 return 1; 891 return 1;
1134 } 892 }
1135 893
1136 for (pl = first_player; pl != NULL; pl = pl->next) 894 for_all_players (pl)
1137 if (!strcmp (pl->ob->name, thing)) 895 if (!strcmp (&pl->ob->name, thing))
1138 { 896 {
1139 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 897 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1140 new_draw_info (NDI_UNIQUE, 0, op, buf); 898 new_draw_info (NDI_UNIQUE, 0, op, buf);
1141 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 899 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 900 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 901 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 902 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 903 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 904 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 905 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 906 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 907 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 908 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 909 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 910 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 break; 911 return 1;
1154 } 912 }
1155 if (pl == NULL) 913
1156 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 914 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1157 return 1; 915 return 1;
1158} 916}
1159 917
1160int 918int
1161command_abil (object *op, char *params) 919command_abil (object *op, char *params)
1162{ 920{
1163 char thing[20], thing2[20]; 921 char thing[20], thing2[20];
1164 int iii; 922 int iii;
1165 player *pl;
1166 char buf[MAX_BUF]; 923 char buf[MAX_BUF];
1167 924
1168 iii = 0; 925 iii = 0;
1169 thing[0] = '\0'; 926 thing[0] = '\0';
1170 thing2[0] = '\0'; 927 thing2[0] = '\0';
… …
1184 { 941 {
1185 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 942 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1186 return 1; 943 return 1;
1187 } 944 }
1188 945
1189 for (pl = first_player; pl != NULL; pl = pl->next) 946 for_all_players (pl)
1190 { 947 {
1191 if (!strcmp (pl->ob->name, thing)) 948 if (!strcmp (&pl->ob->name, thing))
1192 { 949 {
1193 if (settings.real_wiz == FALSE)
1194 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1195 if (!strcmp ("str", thing2))
1196 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 950 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1197 if (!strcmp ("dex", thing2))
1198 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 951 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1199 if (!strcmp ("con", thing2))
1200 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 952 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1201 if (!strcmp ("wis", thing2))
1202 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 953 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1203 if (!strcmp ("cha", thing2))
1204 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 954 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1205 if (!strcmp ("int", thing2))
1206 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 955 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1207 if (!strcmp ("pow", thing2))
1208 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 956 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
957
1209 sprintf (buf, "%s has been altered.", &pl->ob->name); 958 sprintf (buf, "%s has been altered.", &pl->ob->name);
1210 new_draw_info (NDI_UNIQUE, 0, op, buf); 959 new_draw_info (NDI_UNIQUE, 0, op, buf);
1211 fix_player (pl->ob); 960 pl->ob->update_stats ();
1212 return 1; 961 return 1;
1213 } 962 }
1214 } 963 }
1215 964
1216 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 965 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1217 return 1; 966 return 1;
1218} 967}
1219 968
1220int 969int
1221command_reset (object *op, char *params)
1222{
1223 maptile *m;
1224 object *dummy = NULL, *tmp = NULL;
1225
1226 if (params == NULL)
1227 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1229 return 1;
1230 }
1231
1232 if (strcmp (params, ".") == 0)
1233 params = op->map->path;
1234
1235 m = has_been_loaded (params);
1236 if (m == NULL)
1237 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1239 return 1;
1240 }
1241
1242 if (m->in_memory != MAP_SWAPPED)
1243 {
1244 if (m->in_memory != MAP_IN_MEMORY)
1245 {
1246 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1247 return 0;
1248 }
1249
1250 /*
1251 * Only attempt to remove the player that is doing the reset, and not other
1252 * players or wiz's.
1253 */
1254 if (op->map == m)
1255 {
1256 dummy = get_object ();
1257 dummy->map = NULL;
1258 EXIT_X (dummy) = op->x;
1259 EXIT_Y (dummy) = op->y;
1260 EXIT_PATH (dummy) = op->map->path;
1261 remove_ob (op);
1262 op->map = NULL;
1263 tmp = op;
1264 }
1265 swap_map (m);
1266 }
1267
1268 if (m->in_memory == MAP_SWAPPED)
1269 {
1270 LOG (llevDebug, "Resetting map %s.\n", m->path);
1271
1272 /* setting this effectively causes an immediate reload */
1273 m->reset_time = 1;
1274 flush_old_maps ();
1275 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1276 if (tmp)
1277 {
1278 enter_exit (tmp, dummy);
1279 free_object (dummy);
1280 }
1281 return 1;
1282 }
1283 else
1284 {
1285 player *pl;
1286 int playercount = 0;
1287
1288 /* Need to re-insert player if swap failed for some reason */
1289 if (tmp)
1290 {
1291 insert_ob_in_map (op, m, NULL, 0);
1292 free_object (dummy);
1293 }
1294
1295 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1296 for (pl = first_player; pl != NULL; pl = pl->next)
1297 {
1298 if (pl->ob->map == m && pl->ob != op)
1299 {
1300 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1301 playercount++;
1302 }
1303 }
1304 if (!playercount)
1305 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1306 return 1;
1307 }
1308}
1309
1310int
1311command_nowiz (object *op, char *params) 970command_nowiz (object *op, char *params)
1312{ /* 'noadm' is alias */ 971{ /* 'nodm' is alias */
1313 CLEAR_FLAG (op, FLAG_WIZ); 972 CLEAR_FLAG (op, FLAG_WIZ);
1314 CLEAR_FLAG (op, FLAG_WIZPASS); 973 CLEAR_FLAG (op, FLAG_WIZPASS);
1315 CLEAR_FLAG (op, FLAG_WIZCAST); 974 CLEAR_FLAG (op, FLAG_WIZCAST);
1316
1317 if (settings.real_wiz == TRUE)
1318 CLEAR_FLAG (op, FLAG_WAS_WIZ); 975 CLEAR_FLAG (op, FLAG_WIZLOOK);
976 op->contr->do_los = 1;
977
1319 if (op->contr->hidden) 978 if (op->contr->hidden)
1320 { 979 {
1321 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 980 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1322 op->map->players++; 981 op->map->players++;
1323 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 982 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1324 op->contr->hidden = 0; 983 op->contr->hidden = 0;
1325 op->invisible = 1; 984 op->invisible = 1;
1326 } 985 }
1327 else 986 else
1328 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 987 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
988
1329 return 1; 989 return 1;
1330} 990}
1331 991
1332/** 992/**
1333 * object *op is trying to become dm. 993 * object *op is trying to become dm.
… …
1382 { 1042 {
1383 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1043 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1384 return 0; 1044 return 0;
1385 } 1045 }
1386 1046
1387 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1047 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1388 { 1048 {
1389 SET_FLAG (op, FLAG_WIZ); 1049 SET_FLAG (op, FLAG_WIZ);
1390 SET_FLAG (op, FLAG_WAS_WIZ);
1391 SET_FLAG (op, FLAG_WIZPASS); 1050 SET_FLAG (op, FLAG_WIZPASS);
1392 SET_FLAG (op, FLAG_WIZCAST); 1051 SET_FLAG (op, FLAG_WIZCAST);
1052 SET_FLAG (op, FLAG_WIZLOOK);
1053 op->contr->do_los = 1;
1054
1393 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1055 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1394 /*
1395 * Remove setting flying here - that won't work, because next
1396 * fix_player() is called that will get cleared - proper solution
1397 * is probably something like a wiz_force which gives that and any
1398 * other desired abilities.
1399 */
1400 clear_los (op);
1401 op->contr->write_buf[0] = '\0'; 1056 op->contr->write_buf[0] = '\0';
1402 1057
1403 if (!silent) 1058 if (!silent)
1404 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1059 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1405 1060
… …
1432command_invisible (object *op, char *params) 1087command_invisible (object *op, char *params)
1433{ 1088{
1434 if (op) 1089 if (op)
1435 { 1090 {
1436 op->invisible += 100; 1091 op->invisible += 100;
1437 update_object (op, UP_OBJ_FACE); 1092 update_object (op, UP_OBJ_CHANGE);
1438 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1093 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1439 } 1094 }
1440 1095
1441 return 0; 1096 return 0;
1442} 1097}
… …
1445 * Returns spell object (from archetypes) by name. 1100 * Returns spell object (from archetypes) by name.
1446 * Returns NULL if 0 or more than one spell matches. 1101 * Returns NULL if 0 or more than one spell matches.
1447 * Used for wizard's learn spell/prayer. 1102 * Used for wizard's learn spell/prayer.
1448 * 1103 *
1449 * op is the player issuing the command. 1104 * op is the player issuing the command.
1450 *
1451 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1452 * anymore (but may still be present in some player's inventories and thus
1453 * cannot be removed). We have to ignore them here since they have the same
1454 * name than other "spell_xxx" archetypes and would always conflict.
1455 */ 1105 */
1456static object * 1106static object *
1457get_spell_by_name (object *op, const char *spell_name) 1107get_spell_by_name (object *op, shstr_cmp spell_name)
1458{ 1108{
1459 archetype *ar; 1109 /* First check for full name matches. */
1110 int conflict_found = 0;
1460 archetype *found; 1111 archetype *found;
1461 int conflict_found; 1112 for_all_archetypes (at)
1462 size_t spell_name_length;
1463
1464 /* First check for full name matches. */
1465 conflict_found = 0;
1466 found = NULL;
1467 for (ar = first_archetype; ar != NULL; ar = ar->next)
1468 { 1113 {
1469 if (ar->clone.type != SPELL) 1114 if (at->type != SPELL)
1470 continue; 1115 continue;
1471 1116
1472 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1117 if (at->object::name != spell_name)
1473 continue; 1118 continue;
1474 1119
1475 if (strcmp (ar->clone.name, spell_name) != 0)
1476 continue;
1477
1478 if (found != NULL) 1120 if (found)
1479 { 1121 {
1480 if (!conflict_found) 1122 if (!conflict_found)
1481 { 1123 {
1482 conflict_found = 1; 1124 conflict_found = 1;
1483 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1125 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1484 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1126 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1485 } 1127 }
1128
1486 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1129 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1487 continue; 1130 return 0;
1488 } 1131 }
1489 1132
1490 found = ar; 1133 found = at;
1491 } 1134 }
1492
1493 /* No match if more more than one archetype matches. */
1494 if (conflict_found)
1495 return NULL;
1496 1135
1497 /* Return if exactly one archetype matches. */ 1136 /* Return if exactly one archetype matches. */
1498 if (found != NULL) 1137 if (found)
1499 return arch_to_object (found); 1138 return arch_to_object (found);
1500 1139
1501 /* No full match found: now check for partial matches. */
1502 spell_name_length = strlen (spell_name);
1503 conflict_found = 0;
1504 found = NULL;
1505 for (ar = first_archetype; ar != NULL; ar = ar->next)
1506 {
1507 if (ar->clone.type != SPELL)
1508 continue;
1509
1510 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1511 continue;
1512
1513 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1514 continue;
1515
1516 if (found != NULL)
1517 {
1518 if (!conflict_found)
1519 {
1520 conflict_found = 1;
1521 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1522 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1523 }
1524 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1525 continue;
1526 }
1527
1528 found = ar;
1529 }
1530
1531 /* No match if more more than one archetype matches. */
1532 if (conflict_found)
1533 return NULL;
1534
1535 /* Return if exactly one archetype matches. */
1536 if (found != NULL)
1537 return arch_to_object (found);
1538
1539 /* No spell found: just print an error message. */ 1140 /* No spell found: just print an error message. */
1540 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1141 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1142
1541 return NULL; 1143 return 0;
1542} 1144}
1543 1145
1544static int 1146static int
1545command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1147command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1546{ 1148{
… …
1563 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1165 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1564 return 0; 1166 return 0;
1565 } 1167 }
1566 1168
1567 do_learn_spell (op, tmp, special_prayer); 1169 do_learn_spell (op, tmp, special_prayer);
1568 free_object (tmp); 1170 tmp->destroy ();
1569 return 1; 1171 return 1;
1570} 1172}
1571 1173
1572int 1174int
1573command_learn_spell (object *op, char *params) 1175command_learn_spell (object *op, char *params)
… …
1598 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1200 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1599 return 0; 1201 return 0;
1600 } 1202 }
1601 1203
1602 do_forget_spell (op, spell->name); 1204 do_forget_spell (op, spell->name);
1603 return 1;
1604}
1605
1606/**
1607 * Lists all plugins currently loaded with their IDs and full names.
1608 */
1609int
1610command_listplugins (object *op, char *params)
1611{
1612 plugins_display_list (op);
1613 return 1;
1614}
1615
1616/**
1617 * Loads the given plugin. The DM specifies the name of the library to load (no
1618 * pathname is needed). Do not ever attempt to load the same plugin more than
1619 * once at a time, or bad things could happen.
1620 */
1621int
1622command_loadplugin (object *op, char *params)
1623{
1624 char buf[MAX_BUF];
1625
1626 if (params == NULL)
1627 {
1628 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1629 return 1;
1630 }
1631
1632 strcpy (buf, LIBDIR);
1633 strcat (buf, "/plugins/");
1634 strcat (buf, params);
1635 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1636 if (plugins_init_plugin (buf) == 0)
1637 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1638 else
1639 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1640 return 1;
1641}
1642
1643/**
1644 * Unloads the given plugin. The DM specified the ID of the library to unload.
1645 * Note that some things may behave strangely if the correct plugins are not
1646 * loaded.
1647 */
1648int
1649command_unloadplugin (object *op, char *params)
1650{
1651 if (params == NULL)
1652 {
1653 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1654 return 1;
1655 }
1656
1657 if (plugins_remove_plugin (params) == 0)
1658 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1659 else
1660 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1661 return 1; 1205 return 1;
1662} 1206}
1663 1207
1664/** 1208/**
1665 * A players wants to become DM and hide. 1209 * A players wants to become DM and hide.
… …
1985 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1529 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1986 return 0; 1530 return 0;
1987 } 1531 }
1988 1532
1989 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1533 if (!QUERY_FLAG (right, FLAG_REMOVED))
1990 remove_ob (right); 1534 right->remove ();
1535
1991 inserted = insert_ob_in_ob (right, left); 1536 insert_ob_in_ob (right, left);
1992 if (left->type == PLAYER)
1993 if (inserted == right)
1994 esrv_send_item (left, right);
1995 else
1996 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1997 1537
1998 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1538 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1999 1539
2000 return 0; 1540 return 0;
2001 1541

Diff Legend

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