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.44 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.87 by root, Tue Jan 3 11:25:36 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <spells.h> 27#include <spells.h>
… …
34/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
35#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
36#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
39
40 39
41/** 40/**
42 * Enough of the DM functions seem to need this that I broke 41 * Enough of the DM functions seem to need this that I broke
43 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
44 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
… …
71 70
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
73 return 0; 72 return 0;
74} 73}
75 74
75static void
76dm_stack_pop (player *pl)
77{
78 if (!pl->stack_items || !pl->stack_position)
79 {
80 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
81 return;
82 }
83
84 pl->stack_position--;
85 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
86}
87
88/**
89 * Get current stack top item for player.
90 * Returns NULL if no stacked item.
91 * If stacked item disappeared (freed), remove it.
92 *
93 * Ryo, august 2004
94 */
95static object *
96dm_stack_peek (player *pl)
97{
98 object *ob;
99
100 if (!pl->stack_position)
101 {
102 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
103 return NULL;
104 }
105
106 ob = find_object (pl->stack_items[pl->stack_position - 1]);
107 if (!ob)
108 {
109 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
110 dm_stack_pop (pl);
111 return NULL;
112 }
113
114 return ob;
115}
116
117/**
118 * Push specified item on player stack.
119 * Inform player of position.
120 * Initializes variables if needed.
121 */
122void
123dm_stack_push (player *pl, tag_t item)
124{
125 if (!pl->stack_items)
126 {
127 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
128 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
129 }
130
131 if (pl->stack_position == STACK_SIZE)
132 {
133 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
134 return;
135 }
136
137 pl->stack_items[pl->stack_position] = item;
138 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
139 pl->stack_position++;
140}
141
142/**
143 * Checks 'params' for object code.
144 *
145 * Can be:
146 * * empty => get current object stack top for player
147 * * number => get item with that tag, stack it for future use
148 * * $number => get specified stack item
149 * * "me" => player himself
150 *
151 * At function exit, params points to first non-object char
152 *
153 * 'from', if not NULL, contains at exit:
154 * * STACK_FROM_NONE => object not found
155 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
156 * * STACK_FROM_STACK => item from somewhere in the stack
157 * * STACK_FROM_NUMBER => item by number, pushed on stack
158 *
159 * Ryo, august 2004
160 */
161static object *
162get_dm_object (player *pl, char **params, int *from)
163{
164 int item_tag, item_position;
165 object *ob;
166
167 if (!pl)
168 return NULL;
169
170 if (!params || !*params || **params == '\0')
171 {
172 if (from)
173 *from = STACK_FROM_TOP;
174 /* No parameter => get stack item */
175 return dm_stack_peek (pl);
176 }
177
178 /* Let's clean white spaces */
179 while (**params == ' ')
180 (*params)++;
181
182 /* Next case: number => item tag */
183 if (sscanf (*params, "%d", &item_tag))
184 {
185 /* Move parameter to next item */
186 while (isdigit (**params))
187 (*params)++;
188
189 /* And skip blanks, too */
190 while (**params == ' ')
191 (*params)++;
192
193 /* Get item */
194 ob = find_object (item_tag);
195 if (!ob)
196 {
197 if (from)
198 *from = STACK_FROM_NONE;
199 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
200 return NULL;
201 }
202
203 /* Got one, let's push it on stack */
204 dm_stack_push (pl, item_tag);
205 if (from)
206 *from = STACK_FROM_NUMBER;
207 return ob;
208 }
209
210 /* Next case: $number => stack item */
211 if (sscanf (*params, "$%d", &item_position))
212 {
213 /* Move parameter to next item */
214 (*params)++;
215
216 while (isdigit (**params))
217 (*params)++;
218 while (**params == ' ')
219 (*params)++;
220
221 if (item_position >= pl->stack_position)
222 {
223 if (from)
224 *from = STACK_FROM_NONE;
225 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
226 return NULL;
227 }
228
229 ob = find_object (pl->stack_items[item_position]);
230 if (!ob)
231 {
232 if (from)
233 *from = STACK_FROM_NONE;
234 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
235 return NULL;
236 }
237
238 if (from)
239 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
240 return ob;
241 }
242
243 /* Next case: 'me' => return pl->ob */
244 if (!strncmp (*params, "me", 2))
245 {
246 if (from)
247 *from = STACK_FROM_NUMBER;
248 dm_stack_push (pl, pl->ob->count);
249
250 /* Skip to next token */
251 (*params) += 2;
252 while (**params == ' ')
253 (*params)++;
254
255 return pl->ob;
256 }
257
258 /* Last case: get stack top */
259 if (from)
260 *from = STACK_FROM_TOP;
261 return dm_stack_peek (pl);
262}
263
76/** 264/**
77 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 266 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
79 * else they just think someone left/entered. 267 * else they just think someone left/entered.
80 */ 268 */
81void 269static void
82do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
83{ 271{
84 if (op->contr->hidden) 272 if (op->contr->hidden)
85 { 273 {
86 op->contr->hidden = 0; 274 op->contr->hidden = 0;
… …
168 { 356 {
169 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 357 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
170 return 1; 358 return 1;
171 } 359 }
172 360
173 become_follower (ob, god); 361 ob->become_follower (god);
174 return 1;
175}
176
177// TODO: Rewrite banish in perl and get rid of the following two functions
178int
179command_kick (object *op, char *params)
180{
181 for_all_players (pl)
182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
183 {
184 object *op = pl->ob;
185
186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
187 {
188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
189 strcpy (op->contr->killer, "kicked");
190 }
191
192 pl->ns->destroy ();
193 }
194
195 return 1;
196}
197
198//TODO
199#if 0
200int
201command_save_overlay (object *op, char *params)
202{
203 if (!op)
204 return 0;
205
206 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
207 {
208 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
209 return 1; 362 return 1;
210 }
211
212 new_save_map (op->map, 2);
213 new_save_map (op->map, 0);
214 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
215
216 ready_map_name (op->map->path, 0);
217
218 return 1;
219} 363}
220#endif
221 364
222int 365int
223command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
224{ 367{
225 int ticks; 368 int ticks;
… …
280 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 424 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
282 return 0; 425 return 0;
283 } 426 }
284 427
285 pl->ob->enter_exit (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
286 dummy->destroy (); 429 dummy->destroy ();
430
287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 431 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
288 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 433 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
290 return 1; 434 return 1;
291} 435}
… …
308 452
309 pl = get_other_player_from_name (op, params); 453 pl = get_other_player_from_name (op, params);
310 if (!pl) 454 if (!pl)
311 return 1; 455 return 1;
312 456
313 i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 457 maptile *m = op->map;
458 sint16 nx = op->x;
459 sint16 ny = op->y;
460
461 i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
314 if (i == -1) 462 if (i == -1)
315 { 463 {
316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 464 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
317 return 1; 465 return 1;
318 } 466 }
319 467
320 dummy = object::create (); 468 nx += freearr_x [i];
321 EXIT_PATH (dummy) = op->map->path; 469 ny += freearr_y [i];
322 EXIT_X (dummy) = op->x + freearr_x[i]; 470
323 EXIT_Y (dummy) = op->y + freearr_y[i]; 471 if (!xy_normalise (m, nx, ny))
324 pl->ob->enter_exit (dummy); 472 {
325 dummy->destroy (); 473 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
474 return 1;
475 }
476
477 pl->ob->player_goto (m->path, nx, ny);
326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 478 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
327 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 479 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
328 480
329 return 1; 481 return 1;
330} 482}
… …
423 * we also set up spell_name which is only 575 * we also set up spell_name which is only
424 * the first word. 576 * the first word.
425 */ 577 */
426 578
427 at_spell = archetype::find (cp); 579 at_spell = archetype::find (cp);
428 if (!at_spell || at_spell->clone.type != SPELL) 580 if (!at_spell || at_spell->type != SPELL)
429 at_spell = find_archetype_by_object_name (cp); 581 at_spell = find_archetype_by_object_name (cp);
430 if (!at_spell || at_spell->clone.type != SPELL) 582 if (!at_spell || at_spell->type != SPELL)
431 { 583 {
432 assign (spell_name, cp); 584 assign (spell_name, cp);
433 fsp = strchr (spell_name, ' '); 585 fsp = strchr (spell_name, ' ');
434 if (fsp) 586 if (fsp)
435 { 587 {
436 *fsp = 0; 588 *fsp = 0;
437 fsp++; 589 fsp++;
438 at_spell = archetype::find (spell_name); 590 at_spell = archetype::find (spell_name);
439 591
440 /* Got a spell, update the first string pointer */ 592 /* Got a spell, update the first string pointer */
441 if (at_spell && at_spell->clone.type == SPELL) 593 if (at_spell && at_spell->type == SPELL)
442 bp2 = cp + strlen (spell_name) + 1; 594 bp2 = cp + strlen (spell_name) + 1;
443 else 595 else
444 at_spell = NULL; 596 at_spell = NULL;
445 } 597 }
446 } 598 }
… …
448 /* OK - we didn't find a spell - presume the 'of' 600 /* OK - we didn't find a spell - presume the 'of'
449 * in this case means its an artifact. 601 * in this case means its an artifact.
450 */ 602 */
451 if (!at_spell) 603 if (!at_spell)
452 { 604 {
453 if (find_artifactlist (at->clone.type) == NULL) 605 if (find_artifactlist (at->type) == NULL)
454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 606 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
455 else 607 else
456 { 608 {
457 art = find_artifactlist (at->clone.type)->items; 609 art = find_artifactlist (at->type)->items;
458 610
459 while (art) 611 while (art)
460 { 612 {
461 if (!strcmp (art->item->name, cp)) 613 if (!strcmp (&art->item->name, cp))
462 break; 614 break;
463 615
464 art = art->next; 616 art = art->next;
465 } 617 }
466 618
467 if (!art) 619 if (!art)
468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 620 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
469 } 621 }
470 622
471 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 623 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
472 } 624 }
473 } /* if cp */ 625 } /* if cp */
474 626
475 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 627 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
476 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 628 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
477 { 629 {
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); 630 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
479 return 1; 631 return 1;
480 } 632 }
481 633
482 /* 634 /*
483 * Rather than have two different blocks with a lot of similar code, 635 * Rather than have two different blocks with a lot of similar code,
484 * just create one object, do all the processing, and then determine 636 * just create one object, do all the processing, and then determine
485 * if that one object should be inserted or if we need to make copies. 637 * if that one object should be inserted or if we need to make copies.
486 */ 638 */
487 tmp = arch_to_object (at); 639 tmp = at->instance ();
488 640
489 if (set_magic) 641 if (set_magic)
490 set_abs_magic (tmp, magic); 642 set_abs_magic (tmp, magic);
491 643
492 if (art) 644 if (art)
493 give_artifact_abilities (tmp, art->item); 645 give_artifact_abilities (tmp, art->item);
494 646
495 if (need_identify (tmp)) 647 if (tmp->need_identify ())
496 { 648 {
497 SET_FLAG (tmp, FLAG_IDENTIFIED); 649 tmp->set_flag (FLAG_IDENTIFIED);
498 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 650 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
499 } 651 }
500 652
501 /* 653 /*
502 * This entire block here tries to find variable pairings, 654 * This entire block here tries to find variable pairings,
503 * eg, 'hp 4' or the like. The mess here is that values 655 * eg, 'hp 4' or the like. The mess here is that values
… …
572 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 724 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
573 725
574 bp2 = bp3 + 1; 726 bp2 = bp3 + 1;
575 } 727 }
576 728
577 if (at->clone.nrof) 729 if (at->nrof)
578 { 730 {
579 if (at_spell) 731 if (at_spell)
580 insert_ob_in_ob (arch_to_object (at_spell), tmp); 732 tmp->insert (at_spell->instance ());
581 733
582 tmp->x = op->x; 734 tmp->x = op->x;
583 tmp->y = op->y; 735 tmp->y = op->y;
736 tmp->map = op->map;
584 737
585 if (set_nrof) 738 if (set_nrof)
586 tmp->nrof = nrof; 739 tmp->nrof = nrof;
587 740
588 tmp->map = op->map; 741 op->insert (tmp);
589
590 tmp = insert_ob_in_ob (tmp, op);
591 esrv_send_item (op, tmp);
592 742
593 /* Let's put this created item on stack so dm can access it easily. */ 743 /* Let's put this created item on stack so dm can access it easily. */
594 dm_stack_push (op->contr, tmp->count); 744 dm_stack_push (op->contr, tmp->count);
595 745
596 return 1; 746 return 1;
597 } 747 }
598 else 748 else
599 { 749 {
600 for (i = 0; i < (set_nrof ? nrof : 1); i++) 750 for (i = 0; i < (set_nrof ? nrof : 1); i++)
601 { 751 {
602 archetype *atmp;
603 object *prev = 0, *head = 0; 752 object *prev = 0, *head = 0;
604 753
605 for (atmp = at; atmp; atmp = atmp->more) 754 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
606 { 755 {
607 object *dup = arch_to_object (atmp); 756 object *dup = atmp->instance ();
608 757
609 if (at_spell) 758 if (at_spell)
610 insert_ob_in_ob (arch_to_object (at_spell), dup); 759 insert_ob_in_ob (at_spell->instance (), dup);
611 760
612 /* 761 /*
613 * The head is what contains all the important bits, 762 * The head is what contains all the important bits,
614 * so just copying it over should be fine. 763 * so just copying it over should be fine.
615 */ 764 */
… …
617 { 766 {
618 head = dup; 767 head = dup;
619 tmp->copy_to (dup); 768 tmp->copy_to (dup);
620 } 769 }
621 770
622 dup->x = op->x + dup->arch->clone.x; 771 dup->x = op->x + dup->arch->x;
623 dup->y = op->y + dup->arch->clone.y; 772 dup->y = op->y + dup->arch->y;
624 dup->map = op->map; 773 dup->map = op->map;
625 774
626 if (head != dup) 775 if (head != dup)
627 { 776 {
628 dup->head = head; 777 dup->head = head;
… …
630 } 779 }
631 780
632 prev = dup; 781 prev = dup;
633 } 782 }
634 783
635 if (QUERY_FLAG (head, FLAG_ALIVE)) 784 if (head->flag [FLAG_ALIVE])
636 { 785 {
637 object *check = head; 786 object *check = head;
638 int size_x = 0; 787 int size_x = 0;
639 int size_y = 0; 788 int size_y = 0;
640 789
641 while (check) 790 while (check)
642 { 791 {
643 size_x = MAX (size_x, check->arch->clone.x); 792 size_x = max (size_x, check->arch->x);
644 size_y = MAX (size_y, check->arch->clone.y); 793 size_y = max (size_y, check->arch->y);
645 check = check->more; 794 check = check->more;
646 } 795 }
647 796
648 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 797 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
649 { 798 {
… …
675 /* Wonder if we really want to push all of these, but since 824 /* Wonder if we really want to push all of these, but since
676 * things like rods have nrof 0, we want to cover those. 825 * things like rods have nrof 0, we want to cover those.
677 */ 826 */
678 dm_stack_push (op->contr, head->count); 827 dm_stack_push (op->contr, head->count);
679 828
680 if (at->clone.randomitems != NULL && !at_spell) 829 if (at->randomitems && !at_spell)
681 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 830 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
682
683 esrv_send_item (op, head);
684 } 831 }
685 832
686 /* free the one we used to copy */ 833 /* free the one we used to copy */
687 tmp->destroy (); 834 tmp->destroy ();
688 } 835 }
… …
695 */ 842 */
696 843
697int 844int
698command_inventory (object *op, char *params) 845command_inventory (object *op, char *params)
699{ 846{
847 int i;
700 object *tmp; 848 object *tmp;
701 int i;
702 849
703 if (!params) 850 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
704 { 851 {
705 inventory (op, NULL); 852 op->contr->failmsg ("Inventory of what object (nr)?");
706 return 0; 853 return 1;
707 }
708
709 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
710 { 854 }
711 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
712 return 1;
713 }
714 855
715 inventory (op, tmp); 856 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
857
716 return 1; 858 return 1;
717} 859}
718 860
719/* just show player's their skills for now. Dm's can 861/* just show player's their skills for now. Dm's can
720 * already see skills w/ inventory command - b.t. 862 * already see skills w/ inventory command - b.t.
… …
738 880
739 char *dump = dump_object (tmp); 881 char *dump = dump_object (tmp);
740 new_draw_info (NDI_UNIQUE, 0, op, dump); 882 new_draw_info (NDI_UNIQUE, 0, op, dump);
741 free (dump); 883 free (dump);
742 884
743 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 885 if (tmp->flag [FLAG_OBJ_ORIGINAL])
744 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 886 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
745 887
746 return 1; 888 return 1;
747} 889}
748 890
… …
793 { 935 {
794 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 936 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
795 return 1; 937 return 1;
796 } 938 }
797 939
798 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 940 if (tmp->flag [FLAG_REMOVED])
799 { 941 {
800 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 942 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
801 return 1; 943 return 1;
802 } 944 }
803 945
… …
842 */ 984 */
843int 985int
844command_addexp (object *op, char *params) 986command_addexp (object *op, char *params)
845{ 987{
846 char buf[MAX_BUF], skill[MAX_BUF]; 988 char buf[MAX_BUF], skill[MAX_BUF];
847 int i, q; 989 int q;
990 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
848 object *skillob = NULL; 991 object *skillob = NULL;
849 992
850 skill[0] = '\0'; 993 skill[0] = '\0';
851 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 994 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
852 { 995 {
853 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 996 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
854 return 1; 997 return 1;
855 } 998 }
856 999
… …
903 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1046 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
904 return 1; 1047 return 1;
905 } 1048 }
906 1049
907 for_all_players (pl) 1050 for_all_players (pl)
908 if (!strcmp (pl->ob->name, thing)) 1051 if (!strcmp (&pl->ob->name, thing))
909 { 1052 {
910 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1053 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
911 new_draw_info (NDI_UNIQUE, 0, op, buf); 1054 new_draw_info (NDI_UNIQUE, 0, op, buf);
912 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1055 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
913 new_draw_info (NDI_UNIQUE, 0, op, buf); 1056 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
956 return 1; 1099 return 1;
957 } 1100 }
958 1101
959 for_all_players (pl) 1102 for_all_players (pl)
960 { 1103 {
961 if (!strcmp (pl->ob->name, thing)) 1104 if (!strcmp (&pl->ob->name, thing))
962 { 1105 {
963 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 1106 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
964 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 1107 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
965 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 1108 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
966 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 1109 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
… …
980} 1123}
981 1124
982int 1125int
983command_nowiz (object *op, char *params) 1126command_nowiz (object *op, char *params)
984{ /* 'nodm' is alias */ 1127{ /* 'nodm' is alias */
985 CLEAR_FLAG (op, FLAG_WIZ); 1128 op->clr_flag (FLAG_WIZ);
986 CLEAR_FLAG (op, FLAG_WIZPASS); 1129 op->clr_flag (FLAG_WIZPASS);
987 CLEAR_FLAG (op, FLAG_WIZCAST); 1130 op->clr_flag (FLAG_WIZCAST);
1131 op->clr_flag (FLAG_WIZLOOK);
1132 op->contr->do_los = 1;
988 1133
989 if (op->contr->hidden) 1134 if (op->contr->hidden)
990 { 1135 {
991 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1136 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
992 op->map->players++; 1137 op->map->players++;
… …
994 op->contr->hidden = 0; 1139 op->contr->hidden = 0;
995 op->invisible = 1; 1140 op->invisible = 1;
996 } 1141 }
997 else 1142 else
998 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1143 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1144
999 return 1; 1145 return 1;
1000} 1146}
1001 1147
1002/** 1148/**
1003 * object *op is trying to become dm. 1149 * object *op is trying to become dm.
… …
1040 } 1186 }
1041 fclose (dmfile); 1187 fclose (dmfile);
1042 return (0); 1188 return (0);
1043} 1189}
1044 1190
1045int 1191static int
1046do_wizard_dm (object *op, char *params, int silent) 1192do_wizard_dm (object *op, char *params, int silent)
1047{ 1193{
1048 if (!op->contr) 1194 if (!op->contr)
1049 return 0; 1195 return 0;
1050 1196
1051 if (QUERY_FLAG (op, FLAG_WIZ)) 1197 if (op->flag [FLAG_WIZ])
1052 { 1198 {
1053 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1199 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1054 return 0; 1200 return 0;
1055 } 1201 }
1056 1202
1057 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1203 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1058 { 1204 {
1059 SET_FLAG (op, FLAG_WIZ); 1205 op->set_flag (FLAG_WIZ);
1060 SET_FLAG (op, FLAG_WIZPASS); 1206 op->set_flag (FLAG_WIZPASS);
1061 SET_FLAG (op, FLAG_WIZCAST); 1207 op->set_flag (FLAG_WIZCAST);
1208 op->set_flag (FLAG_WIZLOOK);
1209 op->contr->do_los = 1;
1062 1210
1063 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1211 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1064 /*
1065 * Remove setting flying here - that won't work, because next
1066 * fix_player() is called that will get cleared - proper solution
1067 * is probably something like a wiz_force which gives that and any
1068 * other desired abilities.
1069 */
1070 clear_los (op);
1071 op->contr->write_buf[0] = '\0'; 1212 op->contr->write_buf[0] = '\0';
1072 1213
1073 if (!silent) 1214 if (!silent)
1074 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1215 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1075 1216
… …
1115 * Returns spell object (from archetypes) by name. 1256 * Returns spell object (from archetypes) by name.
1116 * Returns NULL if 0 or more than one spell matches. 1257 * Returns NULL if 0 or more than one spell matches.
1117 * Used for wizard's learn spell/prayer. 1258 * Used for wizard's learn spell/prayer.
1118 * 1259 *
1119 * op is the player issuing the command. 1260 * op is the player issuing the command.
1120 *
1121 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1122 * anymore (but may still be present in some player's inventories and thus
1123 * cannot be removed). We have to ignore them here since they have the same
1124 * name than other "spell_xxx" archetypes and would always conflict.
1125 */ 1261 */
1126static object * 1262static object *
1127get_spell_by_name (object *op, const char *spell_name) 1263get_spell_by_name (object *op, shstr_cmp spell_name)
1128{ 1264{
1129 archetype *ar;
1130 archetype *found;
1131 int conflict_found;
1132 size_t spell_name_length;
1133
1134 /* First check for full name matches. */ 1265 /* First check for full name matches. */
1135 conflict_found = 0; 1266 int conflict_found = 0;
1136 found = NULL; 1267 archetype *found = 0;
1137 for (ar = first_archetype; ar != NULL; ar = ar->next) 1268
1269 for_all_archetypes (at)
1138 { 1270 {
1139 if (ar->clone.type != SPELL) 1271 if (at->type != SPELL)
1140 continue; 1272 continue;
1141 1273
1142 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1274 if (at->object::name != spell_name)
1143 continue; 1275 continue;
1144 1276
1145 if (strcmp (ar->clone.name, spell_name) != 0)
1146 continue;
1147
1148 if (found != NULL) 1277 if (found)
1149 { 1278 {
1150 if (!conflict_found) 1279 if (!conflict_found)
1151 { 1280 {
1152 conflict_found = 1; 1281 conflict_found = 1;
1153 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1154 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1283 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1155 } 1284 }
1285
1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1286 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1157 continue; 1287 return 0;
1158 } 1288 }
1159 1289
1160 found = ar; 1290 found = at;
1161 } 1291 }
1162
1163 /* No match if more more than one archetype matches. */
1164 if (conflict_found)
1165 return NULL;
1166 1292
1167 /* Return if exactly one archetype matches. */ 1293 /* Return if exactly one archetype matches. */
1168 if (found != NULL) 1294 if (found)
1169 return arch_to_object (found); 1295 return found->instance ();
1170
1171 /* No full match found: now check for partial matches. */
1172 spell_name_length = strlen (spell_name);
1173 conflict_found = 0;
1174 found = NULL;
1175 for (ar = first_archetype; ar != NULL; ar = ar->next)
1176 {
1177 if (ar->clone.type != SPELL)
1178 continue;
1179
1180 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1181 continue;
1182
1183 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1184 continue;
1185
1186 if (found != NULL)
1187 {
1188 if (!conflict_found)
1189 {
1190 conflict_found = 1;
1191 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1192 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1193 }
1194 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1195 continue;
1196 }
1197
1198 found = ar;
1199 }
1200
1201 /* No match if more more than one archetype matches. */
1202 if (conflict_found)
1203 return NULL;
1204
1205 /* Return if exactly one archetype matches. */
1206 if (found != NULL)
1207 return arch_to_object (found);
1208 1296
1209 /* No spell found: just print an error message. */ 1297 /* No spell found: just print an error message. */
1210 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1298 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1299
1211 return NULL; 1300 return 0;
1212} 1301}
1213 1302
1214static int 1303static int
1215command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1304command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1216{ 1305{
… …
1268 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1357 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1269 return 0; 1358 return 0;
1270 } 1359 }
1271 1360
1272 do_forget_spell (op, spell->name); 1361 do_forget_spell (op, spell->name);
1273 return 1;
1274}
1275
1276/**
1277 * Lists all plugins currently loaded with their IDs and full names.
1278 */
1279int
1280command_listplugins (object *op, char *params)
1281{
1282 plugins_display_list (op);
1283 return 1;
1284}
1285
1286/**
1287 * Loads the given plugin. The DM specifies the name of the library to load (no
1288 * pathname is needed). Do not ever attempt to load the same plugin more than
1289 * once at a time, or bad things could happen.
1290 */
1291int
1292command_loadplugin (object *op, char *params)
1293{
1294 char buf[MAX_BUF];
1295
1296 if (params == NULL)
1297 {
1298 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1299 return 1;
1300 }
1301
1302 strcpy (buf, LIBDIR);
1303 strcat (buf, "/plugins/");
1304 strcat (buf, params);
1305 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1306 if (plugins_init_plugin (buf) == 0)
1307 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1308 else
1309 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1310 return 1;
1311}
1312
1313/**
1314 * Unloads the given plugin. The DM specified the ID of the library to unload.
1315 * Note that some things may behave strangely if the correct plugins are not
1316 * loaded.
1317 */
1318int
1319command_unloadplugin (object *op, char *params)
1320{
1321 if (params == NULL)
1322 {
1323 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1324 return 1;
1325 }
1326
1327 if (plugins_remove_plugin (params) == 0)
1328 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1329 else
1330 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1331 return 1; 1362 return 1;
1332} 1363}
1333 1364
1334/** 1365/**
1335 * A players wants to become DM and hide. 1366 * A players wants to become DM and hide.
… …
1343 return 0; 1374 return 0;
1344 1375
1345 do_wizard_hide (op, 1); 1376 do_wizard_hide (op, 1);
1346 1377
1347 return 1; 1378 return 1;
1348}
1349
1350void
1351dm_stack_pop (player *pl)
1352{
1353 if (!pl->stack_items || !pl->stack_position)
1354 {
1355 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1356 return;
1357 }
1358
1359 pl->stack_position--;
1360 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1361}
1362
1363/**
1364 * Get current stack top item for player.
1365 * Returns NULL if no stacked item.
1366 * If stacked item disappeared (freed), remove it.
1367 *
1368 * Ryo, august 2004
1369 */
1370object *
1371dm_stack_peek (player *pl)
1372{
1373 object *ob;
1374
1375 if (!pl->stack_position)
1376 {
1377 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1378 return NULL;
1379 }
1380
1381 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1382 if (!ob)
1383 {
1384 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1385 dm_stack_pop (pl);
1386 return NULL;
1387 }
1388
1389 return ob;
1390}
1391
1392/**
1393 * Push specified item on player stack.
1394 * Inform player of position.
1395 * Initializes variables if needed.
1396 */
1397void
1398dm_stack_push (player *pl, tag_t item)
1399{
1400 if (!pl->stack_items)
1401 {
1402 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1403 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1404 }
1405
1406 if (pl->stack_position == STACK_SIZE)
1407 {
1408 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1409 return;
1410 }
1411
1412 pl->stack_items[pl->stack_position] = item;
1413 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1414 pl->stack_position++;
1415}
1416
1417/**
1418 * Checks 'params' for object code.
1419 *
1420 * Can be:
1421 * * empty => get current object stack top for player
1422 * * number => get item with that tag, stack it for future use
1423 * * $number => get specified stack item
1424 * * "me" => player himself
1425 *
1426 * At function exit, params points to first non-object char
1427 *
1428 * 'from', if not NULL, contains at exit:
1429 * * STACK_FROM_NONE => object not found
1430 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1431 * * STACK_FROM_STACK => item from somewhere in the stack
1432 * * STACK_FROM_NUMBER => item by number, pushed on stack
1433 *
1434 * Ryo, august 2004
1435 */
1436object *
1437get_dm_object (player *pl, char **params, int *from)
1438{
1439 int item_tag, item_position;
1440 object *ob;
1441
1442 if (!pl)
1443 return NULL;
1444
1445 if (!params || !*params || **params == '\0')
1446 {
1447 if (from)
1448 *from = STACK_FROM_TOP;
1449 /* No parameter => get stack item */
1450 return dm_stack_peek (pl);
1451 }
1452
1453 /* Let's clean white spaces */
1454 while (**params == ' ')
1455 (*params)++;
1456
1457 /* Next case: number => item tag */
1458 if (sscanf (*params, "%d", &item_tag))
1459 {
1460 /* Move parameter to next item */
1461 while (isdigit (**params))
1462 (*params)++;
1463
1464 /* And skip blanks, too */
1465 while (**params == ' ')
1466 (*params)++;
1467
1468 /* Get item */
1469 ob = find_object (item_tag);
1470 if (!ob)
1471 {
1472 if (from)
1473 *from = STACK_FROM_NONE;
1474 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1475 return NULL;
1476 }
1477
1478 /* Got one, let's push it on stack */
1479 dm_stack_push (pl, item_tag);
1480 if (from)
1481 *from = STACK_FROM_NUMBER;
1482 return ob;
1483 }
1484
1485 /* Next case: $number => stack item */
1486 if (sscanf (*params, "$%d", &item_position))
1487 {
1488 /* Move parameter to next item */
1489 (*params)++;
1490
1491 while (isdigit (**params))
1492 (*params)++;
1493 while (**params == ' ')
1494 (*params)++;
1495
1496 if (item_position >= pl->stack_position)
1497 {
1498 if (from)
1499 *from = STACK_FROM_NONE;
1500 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1501 return NULL;
1502 }
1503
1504 ob = find_object (pl->stack_items[item_position]);
1505 if (!ob)
1506 {
1507 if (from)
1508 *from = STACK_FROM_NONE;
1509 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1510 return NULL;
1511 }
1512
1513 if (from)
1514 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1515 return ob;
1516 }
1517
1518 /* Next case: 'me' => return pl->ob */
1519 if (!strncmp (*params, "me", 2))
1520 {
1521 if (from)
1522 *from = STACK_FROM_NUMBER;
1523 dm_stack_push (pl, pl->ob->count);
1524
1525 /* Skip to next token */
1526 (*params) += 2;
1527 while (**params == ' ')
1528 (*params)++;
1529
1530 return pl->ob;
1531 }
1532
1533 /* Last case: get stack top */
1534 if (from)
1535 *from = STACK_FROM_TOP;
1536 return dm_stack_peek (pl);
1537} 1379}
1538 1380
1539/** 1381/**
1540 * Pop the stack top. 1382 * Pop the stack top.
1541 */ 1383 */
… …
1601} 1443}
1602 1444
1603int 1445int
1604command_insert_into (object *op, char *params) 1446command_insert_into (object *op, char *params)
1605{ 1447{
1606 object *left, *right, *inserted; 1448 object *left, *right;
1607 int left_from, right_from; 1449 int left_from, right_from;
1608 1450
1609 left = get_dm_object (op->contr, &params, &left_from); 1451 left = get_dm_object (op->contr, &params, &left_from);
1610 if (!left) 1452 if (!left)
1611 { 1453 {
… …
1654 { 1496 {
1655 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1497 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1656 return 0; 1498 return 0;
1657 } 1499 }
1658 1500
1659 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1501 if (!right->flag [FLAG_REMOVED])
1660 right->remove (); 1502 right->remove ();
1503
1661 inserted = insert_ob_in_ob (right, left); 1504 object *inserted = insert_ob_in_ob (right, left);
1662 if (left->type == PLAYER)
1663 if (inserted == right)
1664 esrv_send_item (left, right);
1665 else
1666 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1667 1505
1668 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1506 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1669 1507
1670 return 0; 1508 return 0;
1671 1509

Diff Legend

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