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.16 by root, Tue Nov 7 16:30:55 2006 UTC vs.
Revision 1.48 by root, Tue Jun 5 13:05:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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 *op = pl->ob;
239 185
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, 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.", &op->name);
243 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
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 struct pl *pl;
277
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1;
282 }
283
284 cleanup ();
285 /* not reached */
286 return 1;
287}
288 221
289int 222int
290command_freeze (object *op, char *params) 223command_freeze (object *op, char *params)
291{ 224{
292 int ticks; 225 int ticks;
… …
328 object *dummy; 261 object *dummy;
329 player *pl; 262 player *pl;
330 263
331 if (!op) 264 if (!op)
332 return 0; 265 return 0;
266
333 if (params == NULL) 267 if (params == NULL)
334 { 268 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 270 return 1;
337 } 271 }
272
338 pl = get_other_player_from_name (op, params); 273 pl = get_other_player_from_name (op, params);
339 if (!pl) 274 if (!pl)
340 return 1; 275 return 1;
276
341 dummy = get_jail_exit (pl->ob); 277 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 278 if (!dummy)
343 { 279 {
344 /* we have nowhere to send the prisoner.... */ 280 /* we have nowhere to send the prisoner.... */
345 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");
346 return 0; 282 return 0;
347 } 283 }
348 enter_exit (pl->ob, dummy); 284
349 free_object (dummy); 285 pl->ob->enter_exit (dummy);
286 dummy->destroy ();
350 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.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 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);
353 return 1; 290 return 1;
354} 291}
… …
378 { 315 {
379 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.");
380 return 1; 317 return 1;
381 } 318 }
382 319
383 dummy = get_object (); 320 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
388 free_object (dummy); 325 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 328
392 return 1;
393}
394
395/**
396 * Teleport next to target player.
397 */
398
399/* mids 01/16/2002 */
400int
401command_teleport (object *op, char *params)
402{
403 int i;
404 object *dummy;
405 player *pl;
406
407 if (!op)
408 return 0;
409
410 if (params == NULL)
411 {
412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
413 return 1;
414 }
415
416 pl = get_other_player_from_name (op, params);
417 if (!pl)
418 return 1;
419
420 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
421 if (i == -1)
422 {
423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
424 return 1;
425 }
426
427 dummy = get_object ();
428 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy);
432 free_object (dummy);
433 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 329 return 1;
437} 330}
438 331
439/** 332/**
440 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
… …
530 * we also set up spell_name which is only 423 * we also set up spell_name which is only
531 * the first word. 424 * the first word.
532 */ 425 */
533 426
534 at_spell = archetype::find (cp); 427 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 429 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 430 if (!at_spell || at_spell->type != SPELL)
538 { 431 {
539 strcpy (spell_name, cp); 432 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
541 if (fsp) 434 if (fsp)
542 { 435 {
543 *fsp = 0; 436 *fsp = 0;
544 fsp++; 437 fsp++;
545 at_spell = archetype::find (spell_name); 438 at_spell = archetype::find (spell_name);
546 439
547 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
548 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->type == SPELL)
549 bp2 = cp + strlen (spell_name) + 1; 442 bp2 = cp + strlen (spell_name) + 1;
550 else 443 else
551 at_spell = NULL; 444 at_spell = NULL;
552 } 445 }
553 } 446 }
… …
555 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
556 * in this case means its an artifact. 449 * in this case means its an artifact.
557 */ 450 */
558 if (!at_spell) 451 if (!at_spell)
559 { 452 {
560 if (find_artifactlist (at->clone.type) == NULL) 453 if (find_artifactlist (at->type) == NULL)
561 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
562 else 455 else
563 { 456 {
564 art = find_artifactlist (at->clone.type)->items; 457 art = find_artifactlist (at->type)->items;
565 458
566 do 459 while (art)
567 { 460 {
568 if (!strcmp (art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
569 break; 462 break;
463
570 art = art->next; 464 art = art->next;
571 } 465 }
572 while (art != NULL);
573 466
574 if (!art) 467 if (!art)
575 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
576 } 469 }
577 470
578 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 471 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
579 } 472 }
580 } /* if cp */ 473 } /* if cp */
581 474
582 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 475 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
583 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 476 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
584 { 477 {
585 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); 478 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
586 return 1; 479 return 1;
587 } 480 }
588 481
… …
590 * Rather than have two different blocks with a lot of similar code, 483 * Rather than have two different blocks with a lot of similar code,
591 * just create one object, do all the processing, and then determine 484 * just create one object, do all the processing, and then determine
592 * if that one object should be inserted or if we need to make copies. 485 * if that one object should be inserted or if we need to make copies.
593 */ 486 */
594 tmp = arch_to_object (at); 487 tmp = arch_to_object (at);
595
596 if (settings.real_wiz == FALSE)
597 SET_FLAG (tmp, FLAG_WAS_WIZ);
598 488
599 if (set_magic) 489 if (set_magic)
600 set_abs_magic (tmp, magic); 490 set_abs_magic (tmp, magic);
601 491
602 if (art) 492 if (art)
… …
682 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 572 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
683 573
684 bp2 = bp3 + 1; 574 bp2 = bp3 + 1;
685 } 575 }
686 576
687 if (at->clone.nrof) 577 if (at->nrof)
688 { 578 {
689 if (at_spell) 579 if (at_spell)
690 insert_ob_in_ob (arch_to_object (at_spell), tmp); 580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
691 581
692 tmp->x = op->x; 582 tmp->x = op->x;
… …
707 } 597 }
708 else 598 else
709 { 599 {
710 for (i = 0; i < (set_nrof ? nrof : 1); i++) 600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
711 { 601 {
712 archetype *atmp;
713 object *prev = 0, *head = 0; 602 object *prev = 0, *head = 0;
714 603
715 for (atmp = at; atmp; atmp = atmp->more) 604 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
716 { 605 {
717 object *dup = arch_to_object (atmp); 606 object *dup = arch_to_object (atmp);
718 607
719 if (at_spell) 608 if (at_spell)
720 insert_ob_in_ob (arch_to_object (at_spell), dup); 609 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
724 * so just copying it over should be fine. 613 * so just copying it over should be fine.
725 */ 614 */
726 if (!head) 615 if (!head)
727 { 616 {
728 head = dup; 617 head = dup;
729 copy_object (tmp, dup); 618 tmp->copy_to (dup);
730 } 619 }
731 620
732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ);
734
735 dup->x = op->x + dup->arch->clone.x; 621 dup->x = op->x + dup->arch->x;
736 dup->y = op->y + dup->arch->clone.y; 622 dup->y = op->y + dup->arch->y;
737 dup->map = op->map; 623 dup->map = op->map;
738 624
739 if (head != dup) 625 if (head != dup)
740 { 626 {
741 dup->head = head; 627 dup->head = head;
… …
751 int size_x = 0; 637 int size_x = 0;
752 int size_y = 0; 638 int size_y = 0;
753 639
754 while (check) 640 while (check)
755 { 641 {
756 size_x = MAX (size_x, check->arch->clone.x); 642 size_x = MAX (size_x, check->arch->x);
757 size_y = MAX (size_y, check->arch->clone.y); 643 size_y = MAX (size_y, check->arch->y);
758 check = check->more; 644 check = check->more;
759 } 645 }
760 646
761 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 647 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
762 { 648 {
763 if (head->x < size_x || head->y < size_y) 649 if (head->x < size_x || head->y < size_y)
764 { 650 {
765 dm_stack_pop (op->contr); 651 dm_stack_pop (op->contr);
766 free_object (head); 652 head->destroy ();
767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 653 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
768 free_object (tmp); 654 tmp->destroy ();
769 return 1; 655 return 1;
770 } 656 }
771 657
772 check = head; 658 check = head;
773 659
… …
788 /* Wonder if we really want to push all of these, but since 674 /* Wonder if we really want to push all of these, but since
789 * things like rods have nrof 0, we want to cover those. 675 * things like rods have nrof 0, we want to cover those.
790 */ 676 */
791 dm_stack_push (op->contr, head->count); 677 dm_stack_push (op->contr, head->count);
792 678
793 if (at->clone.randomitems != NULL && !at_spell) 679 if (at->randomitems != NULL && !at_spell)
794 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
795 681
796 esrv_send_item (op, head); 682 esrv_send_item (op, head);
797 } 683 }
798 684
799 /* free the one we used to copy */ 685 /* free the one we used to copy */
800 free_object (tmp); 686 tmp->destroy ();
801 } 687 }
802 688
803 return 1; 689 return 1;
804} 690}
805 691
… …
854 free (dump); 740 free (dump);
855 741
856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 742 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 743 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858 744
859 return 1;
860}
861
862/**
863 * When DM is possessing a monster, flip aggression on and off, to allow
864 * better motion.
865 */
866int
867command_mon_aggr (object *op, char *params)
868{
869 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
870 {
871 op->enemy = NULL;
872 SET_FLAG (op, FLAG_UNAGGRESSIVE);
873 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
874 }
875 else
876 {
877 CLEAR_FLAG (op, FLAG_FRIENDLY);
878 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
879 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
880 }
881
882 return 1;
883}
884
885/** DM can possess a monster. Basically, this tricks the client into thinking
886 * a given monster, is actually the player it controls. This allows a DM
887 * to inhabit a monster's body, and run around the game with it.
888 * This function is severely broken - it has tons of hardcoded values,
889 */
890int
891command_possess (object *op, char *params)
892{
893 object *victim, *curinv, *nextinv;
894 player *pl;
895 int i;
896 char buf[MAX_BUF];
897
898 victim = NULL;
899 if (params != NULL)
900 {
901 if (sscanf (params, "%d", &i))
902 victim = find_object (i);
903 else if (sscanf (params, "%s", buf))
904 victim = find_object_name (buf);
905 }
906 if (victim == NULL)
907 {
908 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
909 return 1;
910 }
911
912 if (victim == op)
913 {
914 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
915 return 1;
916 }
917
918 /* clear out the old inventory */
919 curinv = op->inv;
920 while (curinv != NULL)
921 {
922 nextinv = curinv->below;
923 esrv_del_item (op->contr, curinv->count);
924 curinv = nextinv;
925 }
926
927 /* make the switch */
928 pl = op->contr;
929 victim->contr = pl;
930 pl->ob = victim;
931 victim->type = PLAYER;
932 SET_FLAG (victim, FLAG_WIZ);
933
934 /* send the inventory to the client */
935 curinv = victim->inv;
936 while (curinv != NULL)
937 {
938 nextinv = curinv->below;
939 esrv_send_item (victim, curinv);
940 curinv = nextinv;
941 }
942 /* basic patchup */
943 /* The use of hard coded values is terrible. Note
944 * that really, to be fair, this shouldn't get changed at
945 * all - if you are possessing a kobold, you should have the
946 * same limitations. As it is, as more body locations are added,
947 * this will give this player more locations than perhaps
948 * they should be allowed.
949 */
950 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
951 if (i == 1 || i == 6 || i == 8 || i == 9)
952 victim->body_info[i] = 2;
953 else
954 victim->body_info[i] = 1;
955
956 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
957 esrv_send_inventory (victim, victim);
958
959 fix_player (victim);
960
961 do_some_living (victim);
962 return 1; 745 return 1;
963} 746}
964 747
965int 748int
966command_patch (object *op, char *params) 749command_patch (object *op, char *params)
… …
981 return 1; 764 return 1;
982 } 765 }
983 766
984 if ((arg2 = strchr (arg, ' '))) 767 if ((arg2 = strchr (arg, ' ')))
985 arg2++; 768 arg2++;
986 if (settings.real_wiz == FALSE) 769
987 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
988 if (set_variable (tmp, arg) == -1) 770 if (set_variable (tmp, arg) == -1)
989 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 771 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
990 else 772 else
991 {
992 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 773 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
993 }
994 774
995 return 1; 775 return 1;
996} 776}
997 777
998int 778int
… …
1025 dm_stack_pop (op->contr); 805 dm_stack_pop (op->contr);
1026 806
1027 /* Always work on the head - otherwise object will get in odd state */ 807 /* Always work on the head - otherwise object will get in odd state */
1028 if (tmp->head) 808 if (tmp->head)
1029 tmp = tmp->head; 809 tmp = tmp->head;
1030 remove_ob (tmp); 810 tmp->remove ();
1031 return 1; 811 return 1;
1032} 812}
1033 813
1034int 814int
1035command_free (object *op, char *params) 815command_free (object *op, char *params)
… …
1047 827
1048 if (from != STACK_FROM_STACK) 828 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 829 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 830 dm_stack_pop (op->contr);
1051 831
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 {
1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1055 remove_ob (tmp);
1056 }
1057
1058 if (tmp->head) 832 if (tmp->head)
1059 tmp = tmp->head; 833 tmp = tmp->head;
1060 free_object (tmp); 834
835 tmp->destroy ();
1061 return 1; 836 return 1;
1062} 837}
1063 838
1064/** 839/**
1065 * This adds exp to a player. We now allow adding to a specific skill. 840 * This adds exp to a player. We now allow adding to a specific skill.
… …
1068command_addexp (object *op, char *params) 843command_addexp (object *op, char *params)
1069{ 844{
1070 char buf[MAX_BUF], skill[MAX_BUF]; 845 char buf[MAX_BUF], skill[MAX_BUF];
1071 int i, q; 846 int i, q;
1072 object *skillob = NULL; 847 object *skillob = NULL;
1073 player *pl;
1074 848
1075 skill[0] = '\0'; 849 skill[0] = '\0';
1076 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 850 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1077 { 851 {
1078 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 852 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1079 return 1; 853 return 1;
1080 } 854 }
1081 855
1082 for (pl = first_player; pl != NULL; pl = pl->next) 856 for_all_players (pl)
1083 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 857 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1084 break;
1085
1086 if (pl == NULL)
1087 { 858 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1089 return 1;
1090 }
1091
1092 if (q >= 3) 859 if (q >= 3)
1093 { 860 {
1094 skillob = find_skill_by_name (pl->ob, skill); 861 skillob = find_skill_by_name (pl->ob, skill);
1095 if (!skillob) 862 if (!skillob)
1096 { 863 {
1097 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 864 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
865 return 1;
866 }
867
868 i = check_exp_adjust (skillob, i);
869 skillob->stats.exp += i;
870 calc_perm_exp (skillob);
871 player_lvl_adj (pl->ob, skillob);
872 }
873
874 pl->ob->stats.exp += i;
875 calc_perm_exp (pl->ob);
876 player_lvl_adj (pl->ob, NULL);
877
1098 return 1; 878 return 1;
1099 } 879 }
1100 880
1101 i = check_exp_adjust (skillob, i); 881 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1102 skillob->stats.exp += i;
1103 calc_perm_exp (skillob);
1104 player_lvl_adj (pl->ob, skillob);
1105 }
1106
1107 pl->ob->stats.exp += i;
1108 calc_perm_exp (pl->ob);
1109 player_lvl_adj (pl->ob, NULL);
1110
1111 if (settings.real_wiz == FALSE)
1112 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1113 return 1; 882 return 1;
1114} 883}
1115 884
1116/**************************************************************************/ 885/**************************************************************************/
1117 886
… …
1123 892
1124int 893int
1125command_stats (object *op, char *params) 894command_stats (object *op, char *params)
1126{ 895{
1127 char thing[20]; 896 char thing[20];
1128 player *pl;
1129 char buf[MAX_BUF]; 897 char buf[MAX_BUF];
1130 898
1131 thing[0] = '\0'; 899 thing[0] = '\0';
1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 900 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1133 { 901 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 902 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1135 return 1; 903 return 1;
1136 } 904 }
1137 905
1138 for (pl = first_player; pl != NULL; pl = pl->next) 906 for_all_players (pl)
1139 if (!strcmp (pl->ob->name, thing)) 907 if (!strcmp (pl->ob->name, thing))
1140 { 908 {
1141 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 909 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 910 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 911 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1144 new_draw_info (NDI_UNIQUE, 0, op, buf); 912 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 913 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 914 new_draw_info (NDI_UNIQUE, 0, op, buf);
1147 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 915 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 916 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 917 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 918 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 919 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 920 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 921 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1154 new_draw_info (NDI_UNIQUE, 0, op, buf); 922 new_draw_info (NDI_UNIQUE, 0, op, buf);
1155 break; 923 return 1;
1156 } 924 }
1157 if (pl == NULL) 925
1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 926 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1159 return 1; 927 return 1;
1160} 928}
1161 929
1162int 930int
1163command_abil (object *op, char *params) 931command_abil (object *op, char *params)
1164{ 932{
1165 char thing[20], thing2[20]; 933 char thing[20], thing2[20];
1166 int iii; 934 int iii;
1167 player *pl;
1168 char buf[MAX_BUF]; 935 char buf[MAX_BUF];
1169 936
1170 iii = 0; 937 iii = 0;
1171 thing[0] = '\0'; 938 thing[0] = '\0';
1172 thing2[0] = '\0'; 939 thing2[0] = '\0';
… …
1186 { 953 {
1187 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 954 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1188 return 1; 955 return 1;
1189 } 956 }
1190 957
1191 for (pl = first_player; pl != NULL; pl = pl->next) 958 for_all_players (pl)
1192 { 959 {
1193 if (!strcmp (pl->ob->name, thing)) 960 if (!strcmp (pl->ob->name, thing))
1194 { 961 {
1195 if (settings.real_wiz == FALSE)
1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1197 if (!strcmp ("str", thing2))
1198 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 962 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1199 if (!strcmp ("dex", thing2))
1200 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 963 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1201 if (!strcmp ("con", thing2))
1202 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 964 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1203 if (!strcmp ("wis", thing2))
1204 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 965 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1205 if (!strcmp ("cha", thing2))
1206 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 966 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1207 if (!strcmp ("int", thing2))
1208 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 967 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1209 if (!strcmp ("pow", thing2))
1210 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 968 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
969
1211 sprintf (buf, "%s has been altered.", &pl->ob->name); 970 sprintf (buf, "%s has been altered.", &pl->ob->name);
1212 new_draw_info (NDI_UNIQUE, 0, op, buf); 971 new_draw_info (NDI_UNIQUE, 0, op, buf);
1213 fix_player (pl->ob); 972 pl->ob->update_stats ();
1214 return 1; 973 return 1;
1215 } 974 }
1216 } 975 }
1217 976
1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 977 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1219 return 1; 978 return 1;
1220} 979}
1221 980
1222int 981int
1223command_reset (object *op, char *params)
1224{
1225 maptile *m;
1226 object *dummy = NULL, *tmp = NULL;
1227
1228 if (params == NULL)
1229 {
1230 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1231 return 1;
1232 }
1233
1234 if (strcmp (params, ".") == 0)
1235 params = op->map->path;
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 = get_object ();
1258 dummy->map = NULL;
1259 EXIT_X (dummy) = op->x;
1260 EXIT_Y (dummy) = op->y;
1261 EXIT_PATH (dummy) = op->map->path;
1262 remove_ob (op);
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 if (tmp)
1278 {
1279 enter_exit (tmp, dummy);
1280 free_object (dummy);
1281 }
1282 return 1;
1283 }
1284 else
1285 {
1286 player *pl;
1287 int playercount = 0;
1288
1289 /* Need to re-insert player if swap failed for some reason */
1290 if (tmp)
1291 {
1292 insert_ob_in_map (op, m, NULL, 0);
1293 free_object (dummy);
1294 }
1295
1296 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1297 for (pl = first_player; pl != NULL; pl = pl->next)
1298 {
1299 if (pl->ob->map == m && pl->ob != op)
1300 {
1301 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1302 playercount++;
1303 }
1304 }
1305 if (!playercount)
1306 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1307 return 1;
1308 }
1309}
1310
1311int
1312command_nowiz (object *op, char *params) 982command_nowiz (object *op, char *params)
1313{ /* 'noadm' is alias */ 983{ /* 'nodm' is alias */
1314 CLEAR_FLAG (op, FLAG_WIZ); 984 CLEAR_FLAG (op, FLAG_WIZ);
1315 CLEAR_FLAG (op, FLAG_WIZPASS); 985 CLEAR_FLAG (op, FLAG_WIZPASS);
1316 CLEAR_FLAG (op, FLAG_WIZCAST); 986 CLEAR_FLAG (op, FLAG_WIZCAST);
1317 987
1318 if (settings.real_wiz == TRUE)
1319 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1320 if (op->contr->hidden) 988 if (op->contr->hidden)
1321 { 989 {
1322 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 990 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1323 op->map->players++; 991 op->map->players++;
1324 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 992 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
… …
1383 { 1051 {
1384 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1052 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1385 return 0; 1053 return 0;
1386 } 1054 }
1387 1055
1388 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1389 { 1057 {
1390 SET_FLAG (op, FLAG_WIZ); 1058 SET_FLAG (op, FLAG_WIZ);
1391 SET_FLAG (op, FLAG_WAS_WIZ);
1392 SET_FLAG (op, FLAG_WIZPASS); 1059 SET_FLAG (op, FLAG_WIZPASS);
1393 SET_FLAG (op, FLAG_WIZCAST); 1060 SET_FLAG (op, FLAG_WIZCAST);
1061
1394 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1062 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1395 /* 1063 /*
1396 * Remove setting flying here - that won't work, because next 1064 * Remove setting flying here - that won't work, because next
1397 * fix_player() is called that will get cleared - proper solution 1065 * fix_player() is called that will get cleared - proper solution
1398 * is probably something like a wiz_force which gives that and any 1066 * is probably something like a wiz_force which gives that and any
1399 * other desired abilities. 1067 * other desired abilities.
1400 */ 1068 */
1401 clear_los (op); 1069 clear_los (op->contr);
1402 op->contr->write_buf[0] = '\0'; 1070 op->contr->write_buf[0] = '\0';
1403 1071
1404 if (!silent) 1072 if (!silent)
1405 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1073 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1406 1074
… …
1433command_invisible (object *op, char *params) 1101command_invisible (object *op, char *params)
1434{ 1102{
1435 if (op) 1103 if (op)
1436 { 1104 {
1437 op->invisible += 100; 1105 op->invisible += 100;
1438 update_object (op, UP_OBJ_FACE); 1106 update_object (op, UP_OBJ_CHANGE);
1439 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1107 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1440 } 1108 }
1441 1109
1442 return 0; 1110 return 0;
1443} 1111}
… …
1455 * name than other "spell_xxx" archetypes and would always conflict. 1123 * name than other "spell_xxx" archetypes and would always conflict.
1456 */ 1124 */
1457static object * 1125static object *
1458get_spell_by_name (object *op, const char *spell_name) 1126get_spell_by_name (object *op, const char *spell_name)
1459{ 1127{
1460 archetype *ar; 1128 archetype *at;
1461 archetype *found; 1129 archetype *found;
1462 int conflict_found; 1130 int conflict_found;
1463 size_t spell_name_length; 1131 size_t spell_name_length;
1464 1132
1465 /* First check for full name matches. */ 1133 /* First check for full name matches. */
1466 conflict_found = 0; 1134 conflict_found = 0;
1467 found = NULL; 1135 found = NULL;
1468 for (ar = first_archetype; ar != NULL; ar = ar->next) 1136 for_all_archetypes (at)
1469 { 1137 {
1470 if (ar->clone.type != SPELL) 1138 if (at->type != SPELL)
1471 continue; 1139 continue;
1472 1140
1473 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1141 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1474 continue; 1142 continue;
1475 1143
1476 if (strcmp (ar->clone.name, spell_name) != 0) 1144 if (strcmp (at->object::name, spell_name) != 0)
1477 continue; 1145 continue;
1478 1146
1479 if (found != NULL) 1147 if (found != NULL)
1480 { 1148 {
1481 if (!conflict_found) 1149 if (!conflict_found)
1482 { 1150 {
1483 conflict_found = 1; 1151 conflict_found = 1;
1484 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1152 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1485 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1486 } 1154 }
1155
1487 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1488 continue; 1157 continue;
1489 } 1158 }
1490 1159
1491 found = ar; 1160 found = at;
1492 } 1161 }
1493 1162
1494 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1495 if (conflict_found) 1164 if (conflict_found)
1496 return NULL; 1165 return NULL;
… …
1501 1170
1502 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1503 spell_name_length = strlen (spell_name); 1172 spell_name_length = strlen (spell_name);
1504 conflict_found = 0; 1173 conflict_found = 0;
1505 found = NULL; 1174 found = NULL;
1506 for (ar = first_archetype; ar != NULL; ar = ar->next) 1175 for_all_archetypes (at)
1507 { 1176 {
1508 if (ar->clone.type != SPELL) 1177 if (at->type != SPELL)
1509 continue; 1178 continue;
1510 1179
1511 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (at->archname, "spelldirect_", 12) == 0)
1512 continue; 1181 continue;
1513 1182
1514 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (at->object::name, spell_name, spell_name_length) != 0)
1515 continue; 1184 continue;
1516 1185
1517 if (found != NULL) 1186 if (found != NULL)
1518 { 1187 {
1519 if (!conflict_found) 1188 if (!conflict_found)
1520 { 1189 {
1521 conflict_found = 1; 1190 conflict_found = 1;
1522 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1191 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1523 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1192 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1524 } 1193 }
1525 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1194 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1526 continue; 1195 continue;
1527 } 1196 }
1528 1197
1529 found = ar; 1198 found = at;
1530 } 1199 }
1531 1200
1532 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1533 if (conflict_found) 1202 if (conflict_found)
1534 return NULL; 1203 return NULL;
… …
1564 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1233 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1565 return 0; 1234 return 0;
1566 } 1235 }
1567 1236
1568 do_learn_spell (op, tmp, special_prayer); 1237 do_learn_spell (op, tmp, special_prayer);
1569 free_object (tmp); 1238 tmp->destroy ();
1570 return 1; 1239 return 1;
1571} 1240}
1572 1241
1573int 1242int
1574command_learn_spell (object *op, char *params) 1243command_learn_spell (object *op, char *params)
… …
1986 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1655 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1987 return 0; 1656 return 0;
1988 } 1657 }
1989 1658
1990 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1659 if (!QUERY_FLAG (right, FLAG_REMOVED))
1991 remove_ob (right); 1660 right->remove ();
1992 inserted = insert_ob_in_ob (right, left); 1661 inserted = insert_ob_in_ob (right, left);
1993 if (left->type == PLAYER) 1662 if (left->type == PLAYER)
1994 if (inserted == right) 1663 if (inserted == right)
1995 esrv_send_item (left, right); 1664 esrv_send_item (left, right);
1996 else 1665 else

Diff Legend

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