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.77 by root, Sat Nov 7 18:30:06 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 **/
… …
36#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
37#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
39#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) */
40 39
41
42/** 40/**
43 * 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
44 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
45 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
46 * prints diagnostics messages, and returns the 44 * prints diagnostics messages, and returns the
47 * other player, or NULL otherwise. 45 * other player, or NULL otherwise.
48 */ 46 */
49static player * 47static player *
50get_other_player_from_name (object *op, char *name) 48get_other_player_from_name (object *op, char *name)
51{ 49{
52 player *pl;
53
54 if (!name) 50 if (!name)
55 return NULL; 51 return NULL;
56 52
57 for (pl = first_player; pl != NULL; pl = pl->next) 53 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 54 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 55 {
56 if (pl->ob == op)
57 {
58 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
59 return NULL;
60 }
61
62 if (pl->ns->state != ST_PLAYING)
63 {
64 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
65 return NULL;
66 }
67
68 return pl;
69 }
70
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
72 return 0;
73}
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!");
64 return NULL; 103 return NULL;
65 } 104 }
66 105
67 if (pl->ob == op) 106 ob = find_object (pl->stack_items[pl->stack_position - 1]);
107 if (!ob)
68 { 108 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 109 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
110 dm_stack_pop (pl);
70 return NULL; 111 return NULL;
71 } 112 }
72 if (pl->state != ST_PLAYING) 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);
73 { 129 }
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 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)
75 return NULL; 168 return NULL;
169
170 if (!params || !*params || **params == '\0')
76 } 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
77 return pl; 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);
78} 262}
79 263
80/** 264/**
81 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
82 * 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,
83 * else they just think someone left/entered. 267 * else they just think someone left/entered.
84 */ 268 */
85void 269static void
86do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
87{ 271{
88 if (op->contr->hidden) 272 if (op->contr->hidden)
89 { 273 {
90 op->contr->hidden = 0; 274 op->contr->hidden = 0;
91 op->invisible = 1; 275 op->invisible = 1;
92 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 276 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
93 op->map->players++; 277 op->map->players++;
94 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 278 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
279
95 if (!silent_dm) 280 if (!silent_dm)
96 {
97 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 281 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
98 }
99 } 282 }
100 else 283 else
101 { 284 {
102 op->contr->hidden = 1; 285 op->contr->hidden = 1;
103 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); 286 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
104 op->map->players--; 287 op->map->players--;
288
105 if (!silent_dm) 289 if (!silent_dm)
106 {
107 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 290 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
108 } 291
109 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 292 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); 293 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
111 } 294 }
112} 295}
113 296
… …
177 360
178 become_follower (ob, god); 361 become_follower (ob, god);
179 return 1; 362 return 1;
180} 363}
181 364
182/**
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
233command_kick (object *op, char *params)
234{
235 for (player *pl = first_player; pl; pl = pl->next)
236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
237 {
238 object *op = pl->ob;
239
240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
241 {
242 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");
244 }
245
246 pl->socket.status = Ns_Dead;
247 }
248
249 return 1;
250}
251
252int
253command_save_overlay (object *op, char *params)
254{
255 if (!op)
256 return 0;
257
258 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
259 {
260 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
261 return 1;
262 }
263
264 new_save_map (op->map, 2);
265 new_save_map (op->map, 0);
266 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
267
268 ready_map_name (op->map->path, 0);
269
270 return 1;
271}
272
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
287int 365int
288command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
289{ 367{
290 int ticks; 368 int ticks;
291 player *pl; 369 player *pl;
… …
326 object *dummy; 404 object *dummy;
327 player *pl; 405 player *pl;
328 406
329 if (!op) 407 if (!op)
330 return 0; 408 return 0;
409
331 if (params == NULL) 410 if (params == NULL)
332 { 411 {
333 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
334 return 1; 413 return 1;
335 } 414 }
415
336 pl = get_other_player_from_name (op, params); 416 pl = get_other_player_from_name (op, params);
337 if (!pl) 417 if (!pl)
338 return 1; 418 return 1;
419
339 dummy = get_jail_exit (pl->ob); 420 dummy = get_jail_exit (pl->ob);
340 if (!dummy) 421 if (!dummy)
341 { 422 {
342 /* we have nowhere to send the prisoner.... */ 423 /* 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"); 424 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
344 return 0; 425 return 0;
345 } 426 }
346 enter_exit (pl->ob, dummy); 427
347 free_object (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
429 dummy->destroy ();
430
348 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.");
349 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
350 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);
351 return 1; 434 return 1;
352} 435}
… …
376 { 459 {
377 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 460 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
378 return 1; 461 return 1;
379 } 462 }
380 463
381 dummy = get_object (); 464 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."); 465 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
388 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 466 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
389 467
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; 468 return 1;
435} 469}
436 470
437/** 471/**
438 * This function is a real mess, because we're stucking getting 472 * This function is a real mess, because we're stucking getting
… …
528 * we also set up spell_name which is only 562 * we also set up spell_name which is only
529 * the first word. 563 * the first word.
530 */ 564 */
531 565
532 at_spell = archetype::find (cp); 566 at_spell = archetype::find (cp);
533 if (!at_spell || at_spell->clone.type != SPELL) 567 if (!at_spell || at_spell->type != SPELL)
534 at_spell = find_archetype_by_object_name (cp); 568 at_spell = find_archetype_by_object_name (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 569 if (!at_spell || at_spell->type != SPELL)
536 { 570 {
537 strcpy (spell_name, cp); 571 assign (spell_name, cp);
538 fsp = strchr (spell_name, ' '); 572 fsp = strchr (spell_name, ' ');
539 if (fsp) 573 if (fsp)
540 { 574 {
541 *fsp = 0; 575 *fsp = 0;
542 fsp++; 576 fsp++;
543 at_spell = archetype::find (spell_name); 577 at_spell = archetype::find (spell_name);
544 578
545 /* Got a spell, update the first string pointer */ 579 /* Got a spell, update the first string pointer */
546 if (at_spell && at_spell->clone.type == SPELL) 580 if (at_spell && at_spell->type == SPELL)
547 bp2 = cp + strlen (spell_name) + 1; 581 bp2 = cp + strlen (spell_name) + 1;
548 else 582 else
549 at_spell = NULL; 583 at_spell = NULL;
550 } 584 }
551 } 585 }
… …
553 /* OK - we didn't find a spell - presume the 'of' 587 /* OK - we didn't find a spell - presume the 'of'
554 * in this case means its an artifact. 588 * in this case means its an artifact.
555 */ 589 */
556 if (!at_spell) 590 if (!at_spell)
557 { 591 {
558 if (find_artifactlist (at->clone.type) == NULL) 592 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); 593 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
560 else 594 else
561 { 595 {
562 art = find_artifactlist (at->clone.type)->items; 596 art = find_artifactlist (at->type)->items;
563 597
564 do 598 while (art)
565 { 599 {
566 if (!strcmp (art->item->name, cp)) 600 if (!strcmp (&art->item->name, cp))
567 break; 601 break;
602
568 art = art->next; 603 art = art->next;
569 } 604 }
570 while (art != NULL);
571 605
572 if (!art) 606 if (!art)
573 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 607 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
574 } 608 }
575 609
576 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 610 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
577 } 611 }
578 } /* if cp */ 612 } /* if cp */
579 613
580 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 614 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
581 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 615 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
582 { 616 {
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); 617 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; 618 return 1;
585 } 619 }
586 620
… …
588 * Rather than have two different blocks with a lot of similar code, 622 * Rather than have two different blocks with a lot of similar code,
589 * just create one object, do all the processing, and then determine 623 * 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. 624 * if that one object should be inserted or if we need to make copies.
591 */ 625 */
592 tmp = arch_to_object (at); 626 tmp = arch_to_object (at);
593
594 if (settings.real_wiz == FALSE)
595 SET_FLAG (tmp, FLAG_WAS_WIZ);
596 627
597 if (set_magic) 628 if (set_magic)
598 set_abs_magic (tmp, magic); 629 set_abs_magic (tmp, magic);
599 630
600 if (art) 631 if (art)
… …
680 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 711 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
681 712
682 bp2 = bp3 + 1; 713 bp2 = bp3 + 1;
683 } 714 }
684 715
685 if (at->clone.nrof) 716 if (at->nrof)
686 { 717 {
687 if (at_spell) 718 if (at_spell)
688 insert_ob_in_ob (arch_to_object (at_spell), tmp); 719 tmp->insert (arch_to_object (at_spell));
689 720
690 tmp->x = op->x; 721 tmp->x = op->x;
691 tmp->y = op->y; 722 tmp->y = op->y;
723 tmp->map = op->map;
692 724
693 if (set_nrof) 725 if (set_nrof)
694 tmp->nrof = nrof; 726 tmp->nrof = nrof;
695 727
696 tmp->map = op->map; 728 op->insert (tmp);
697
698 tmp = insert_ob_in_ob (tmp, op);
699 esrv_send_item (op, tmp);
700 729
701 /* Let's put this created item on stack so dm can access it easily. */ 730 /* Let's put this created item on stack so dm can access it easily. */
702 dm_stack_push (op->contr, tmp->count); 731 dm_stack_push (op->contr, tmp->count);
703 732
704 return 1; 733 return 1;
705 } 734 }
706 else 735 else
707 { 736 {
708 for (i = 0; i < (set_nrof ? nrof : 1); i++) 737 for (i = 0; i < (set_nrof ? nrof : 1); i++)
709 { 738 {
710 archetype *atmp;
711 object *prev = 0, *head = 0; 739 object *prev = 0, *head = 0;
712 740
713 for (atmp = at; atmp; atmp = atmp->more) 741 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
714 { 742 {
715 object *dup = arch_to_object (atmp); 743 object *dup = arch_to_object (atmp);
716 744
717 if (at_spell) 745 if (at_spell)
718 insert_ob_in_ob (arch_to_object (at_spell), dup); 746 insert_ob_in_ob (arch_to_object (at_spell), dup);
… …
722 * so just copying it over should be fine. 750 * so just copying it over should be fine.
723 */ 751 */
724 if (!head) 752 if (!head)
725 { 753 {
726 head = dup; 754 head = dup;
727 copy_object (tmp, dup); 755 tmp->copy_to (dup);
728 } 756 }
729 757
730 if (settings.real_wiz == FALSE)
731 SET_FLAG (dup, FLAG_WAS_WIZ);
732
733 dup->x = op->x + dup->arch->clone.x; 758 dup->x = op->x + dup->arch->x;
734 dup->y = op->y + dup->arch->clone.y; 759 dup->y = op->y + dup->arch->y;
735 dup->map = op->map; 760 dup->map = op->map;
736 761
737 if (head != dup) 762 if (head != dup)
738 { 763 {
739 dup->head = head; 764 dup->head = head;
… …
749 int size_x = 0; 774 int size_x = 0;
750 int size_y = 0; 775 int size_y = 0;
751 776
752 while (check) 777 while (check)
753 { 778 {
754 size_x = MAX (size_x, check->arch->clone.x); 779 size_x = max (size_x, check->arch->x);
755 size_y = MAX (size_y, check->arch->clone.y); 780 size_y = max (size_y, check->arch->y);
756 check = check->more; 781 check = check->more;
757 } 782 }
758 783
759 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 784 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
760 { 785 {
761 if (head->x < size_x || head->y < size_y) 786 if (head->x < size_x || head->y < size_y)
762 { 787 {
763 dm_stack_pop (op->contr); 788 dm_stack_pop (op->contr);
764 free_object (head); 789 head->destroy ();
765 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
766 free_object (tmp); 791 tmp->destroy ();
767 return 1; 792 return 1;
768 } 793 }
769 794
770 check = head; 795 check = head;
771 796
… …
786 /* Wonder if we really want to push all of these, but since 811 /* Wonder if we really want to push all of these, but since
787 * things like rods have nrof 0, we want to cover those. 812 * things like rods have nrof 0, we want to cover those.
788 */ 813 */
789 dm_stack_push (op->contr, head->count); 814 dm_stack_push (op->contr, head->count);
790 815
791 if (at->clone.randomitems != NULL && !at_spell) 816 if (at->randomitems && !at_spell)
792 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 817 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
793
794 esrv_send_item (op, head);
795 } 818 }
796 819
797 /* free the one we used to copy */ 820 /* free the one we used to copy */
798 free_object (tmp); 821 tmp->destroy ();
799 } 822 }
800 823
801 return 1; 824 return 1;
802} 825}
803 826
… …
806 */ 829 */
807 830
808int 831int
809command_inventory (object *op, char *params) 832command_inventory (object *op, char *params)
810{ 833{
834 int i;
811 object *tmp; 835 object *tmp;
812 int i;
813 836
814 if (!params) 837 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
815 { 838 {
816 inventory (op, NULL); 839 op->contr->failmsg ("Inventory of what object (nr)?");
817 return 0; 840 return 1;
818 }
819
820 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
821 { 841 }
822 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
823 return 1;
824 }
825 842
826 inventory (op, tmp); 843 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
844
827 return 1; 845 return 1;
828} 846}
829 847
830/* just show player's their skills for now. Dm's can 848/* just show player's their skills for now. Dm's can
831 * already see skills w/ inventory command - b.t. 849 * already see skills w/ inventory command - b.t.
… …
852 free (dump); 870 free (dump);
853 871
854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 872 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 873 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
856 874
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; 875 return 1;
961} 876}
962 877
963int 878int
964command_patch (object *op, char *params) 879command_patch (object *op, char *params)
… …
979 return 1; 894 return 1;
980 } 895 }
981 896
982 if ((arg2 = strchr (arg, ' '))) 897 if ((arg2 = strchr (arg, ' ')))
983 arg2++; 898 arg2++;
984 if (settings.real_wiz == FALSE) 899
985 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
986 if (set_variable (tmp, arg) == -1) 900 if (set_variable (tmp, arg) == -1)
987 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 901 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
988 else 902 else
989 {
990 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 903 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
991 }
992 904
993 return 1; 905 return 1;
994} 906}
995 907
996int 908int
… …
1023 dm_stack_pop (op->contr); 935 dm_stack_pop (op->contr);
1024 936
1025 /* Always work on the head - otherwise object will get in odd state */ 937 /* Always work on the head - otherwise object will get in odd state */
1026 if (tmp->head) 938 if (tmp->head)
1027 tmp = tmp->head; 939 tmp = tmp->head;
1028 remove_ob (tmp); 940 tmp->remove ();
1029 return 1; 941 return 1;
1030} 942}
1031 943
1032int 944int
1033command_free (object *op, char *params) 945command_free (object *op, char *params)
… …
1045 957
1046 if (from != STACK_FROM_STACK) 958 if (from != STACK_FROM_STACK)
1047 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 959 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1048 dm_stack_pop (op->contr); 960 dm_stack_pop (op->contr);
1049 961
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) 962 if (tmp->head)
1057 tmp = tmp->head; 963 tmp = tmp->head;
1058 free_object (tmp); 964
965 tmp->destroy ();
1059 return 1; 966 return 1;
1060} 967}
1061 968
1062/** 969/**
1063 * This adds exp to a player. We now allow adding to a specific skill. 970 * This adds exp to a player. We now allow adding to a specific skill.
1064 */ 971 */
1065int 972int
1066command_addexp (object *op, char *params) 973command_addexp (object *op, char *params)
1067{ 974{
1068 char buf[MAX_BUF], skill[MAX_BUF]; 975 char buf[MAX_BUF], skill[MAX_BUF];
1069 int i, q; 976 int q;
977 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1070 object *skillob = NULL; 978 object *skillob = NULL;
1071 player *pl;
1072 979
1073 skill[0] = '\0'; 980 skill[0] = '\0';
1074 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 981 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
1075 { 982 {
1076 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 983 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1077 return 1; 984 return 1;
1078 } 985 }
1079 986
1080 for (pl = first_player; pl != NULL; pl = pl->next) 987 for_all_players (pl)
1081 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 988 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1082 break;
1083
1084 if (pl == NULL)
1085 { 989 {
1086 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1087 return 1;
1088 }
1089
1090 if (q >= 3) 990 if (q >= 3)
1091 { 991 {
1092 skillob = find_skill_by_name (pl->ob, skill); 992 skillob = find_skill_by_name (pl->ob, skill);
1093 if (!skillob) 993 if (!skillob)
1094 { 994 {
1095 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 995 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
996 return 1;
997 }
998
999 i = check_exp_adjust (skillob, i);
1000 skillob->stats.exp += i;
1001 calc_perm_exp (skillob);
1002 player_lvl_adj (pl->ob, skillob);
1003 }
1004
1005 pl->ob->stats.exp += i;
1006 calc_perm_exp (pl->ob);
1007 player_lvl_adj (pl->ob, NULL);
1008
1096 return 1; 1009 return 1;
1097 } 1010 }
1098 1011
1099 i = check_exp_adjust (skillob, i); 1012 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; 1013 return 1;
1112} 1014}
1113 1015
1114/**************************************************************************/ 1016/**************************************************************************/
1115 1017
… …
1121 1023
1122int 1024int
1123command_stats (object *op, char *params) 1025command_stats (object *op, char *params)
1124{ 1026{
1125 char thing[20]; 1027 char thing[20];
1126 player *pl;
1127 char buf[MAX_BUF]; 1028 char buf[MAX_BUF];
1128 1029
1129 thing[0] = '\0'; 1030 thing[0] = '\0';
1130 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1031 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1131 { 1032 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1033 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1133 return 1; 1034 return 1;
1134 } 1035 }
1135 1036
1136 for (pl = first_player; pl != NULL; pl = pl->next) 1037 for_all_players (pl)
1137 if (!strcmp (pl->ob->name, thing)) 1038 if (!strcmp (&pl->ob->name, thing))
1138 { 1039 {
1139 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1040 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); 1041 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); 1042 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); 1043 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); 1044 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); 1045 new_draw_info (NDI_UNIQUE, 0, op, buf);
1145 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1046 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1146 new_draw_info (NDI_UNIQUE, 0, op, buf); 1047 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); 1048 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1049 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1050 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1051 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1052 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1152 new_draw_info (NDI_UNIQUE, 0, op, buf); 1053 new_draw_info (NDI_UNIQUE, 0, op, buf);
1153 break; 1054 return 1;
1154 } 1055 }
1155 if (pl == NULL) 1056
1156 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1057 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1157 return 1; 1058 return 1;
1158} 1059}
1159 1060
1160int 1061int
1161command_abil (object *op, char *params) 1062command_abil (object *op, char *params)
1162{ 1063{
1163 char thing[20], thing2[20]; 1064 char thing[20], thing2[20];
1164 int iii; 1065 int iii;
1165 player *pl;
1166 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
1167 1067
1168 iii = 0; 1068 iii = 0;
1169 thing[0] = '\0'; 1069 thing[0] = '\0';
1170 thing2[0] = '\0'; 1070 thing2[0] = '\0';
… …
1184 { 1084 {
1185 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1085 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1186 return 1; 1086 return 1;
1187 } 1087 }
1188 1088
1189 for (pl = first_player; pl != NULL; pl = pl->next) 1089 for_all_players (pl)
1190 { 1090 {
1191 if (!strcmp (pl->ob->name, thing)) 1091 if (!strcmp (&pl->ob->name, thing))
1192 { 1092 {
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; 1093 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; 1094 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; 1095 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; 1096 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; 1097 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; 1098 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; 1099 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1100
1209 sprintf (buf, "%s has been altered.", &pl->ob->name); 1101 sprintf (buf, "%s has been altered.", &pl->ob->name);
1210 new_draw_info (NDI_UNIQUE, 0, op, buf); 1102 new_draw_info (NDI_UNIQUE, 0, op, buf);
1211 fix_player (pl->ob); 1103 pl->ob->update_stats ();
1212 return 1; 1104 return 1;
1213 } 1105 }
1214 } 1106 }
1215 1107
1216 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1108 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1217 return 1; 1109 return 1;
1218} 1110}
1219 1111
1220int 1112int
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) 1113command_nowiz (object *op, char *params)
1312{ /* 'noadm' is alias */ 1114{ /* 'nodm' is alias */
1313 CLEAR_FLAG (op, FLAG_WIZ); 1115 CLEAR_FLAG (op, FLAG_WIZ);
1314 CLEAR_FLAG (op, FLAG_WIZPASS); 1116 CLEAR_FLAG (op, FLAG_WIZPASS);
1315 CLEAR_FLAG (op, FLAG_WIZCAST); 1117 CLEAR_FLAG (op, FLAG_WIZCAST);
1316
1317 if (settings.real_wiz == TRUE)
1318 CLEAR_FLAG (op, FLAG_WAS_WIZ); 1118 CLEAR_FLAG (op, FLAG_WIZLOOK);
1119 op->contr->do_los = 1;
1120
1319 if (op->contr->hidden) 1121 if (op->contr->hidden)
1320 { 1122 {
1321 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1123 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1322 op->map->players++; 1124 op->map->players++;
1323 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 1125 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; 1126 op->contr->hidden = 0;
1325 op->invisible = 1; 1127 op->invisible = 1;
1326 } 1128 }
1327 else 1129 else
1328 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1130 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1131
1329 return 1; 1132 return 1;
1330} 1133}
1331 1134
1332/** 1135/**
1333 * object *op is trying to become dm. 1136 * object *op is trying to become dm.
… …
1370 } 1173 }
1371 fclose (dmfile); 1174 fclose (dmfile);
1372 return (0); 1175 return (0);
1373} 1176}
1374 1177
1375int 1178static int
1376do_wizard_dm (object *op, char *params, int silent) 1179do_wizard_dm (object *op, char *params, int silent)
1377{ 1180{
1378 if (!op->contr) 1181 if (!op->contr)
1379 return 0; 1182 return 0;
1380 1183
… …
1382 { 1185 {
1383 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1186 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1384 return 0; 1187 return 0;
1385 } 1188 }
1386 1189
1387 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1190 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1388 { 1191 {
1389 SET_FLAG (op, FLAG_WIZ); 1192 SET_FLAG (op, FLAG_WIZ);
1390 SET_FLAG (op, FLAG_WAS_WIZ);
1391 SET_FLAG (op, FLAG_WIZPASS); 1193 SET_FLAG (op, FLAG_WIZPASS);
1392 SET_FLAG (op, FLAG_WIZCAST); 1194 SET_FLAG (op, FLAG_WIZCAST);
1195 SET_FLAG (op, FLAG_WIZLOOK);
1196 op->contr->do_los = 1;
1197
1393 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1198 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'; 1199 op->contr->write_buf[0] = '\0';
1402 1200
1403 if (!silent) 1201 if (!silent)
1404 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1202 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1405 1203
… …
1432command_invisible (object *op, char *params) 1230command_invisible (object *op, char *params)
1433{ 1231{
1434 if (op) 1232 if (op)
1435 { 1233 {
1436 op->invisible += 100; 1234 op->invisible += 100;
1437 update_object (op, UP_OBJ_FACE); 1235 update_object (op, UP_OBJ_CHANGE);
1438 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1236 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1439 } 1237 }
1440 1238
1441 return 0; 1239 return 0;
1442} 1240}
… …
1445 * Returns spell object (from archetypes) by name. 1243 * Returns spell object (from archetypes) by name.
1446 * Returns NULL if 0 or more than one spell matches. 1244 * Returns NULL if 0 or more than one spell matches.
1447 * Used for wizard's learn spell/prayer. 1245 * Used for wizard's learn spell/prayer.
1448 * 1246 *
1449 * op is the player issuing the command. 1247 * 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 */ 1248 */
1456static object * 1249static object *
1457get_spell_by_name (object *op, const char *spell_name) 1250get_spell_by_name (object *op, shstr_cmp spell_name)
1458{ 1251{
1459 archetype *ar; 1252 /* First check for full name matches. */
1253 int conflict_found = 0;
1460 archetype *found; 1254 archetype *found;
1461 int conflict_found; 1255 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 { 1256 {
1469 if (ar->clone.type != SPELL) 1257 if (at->type != SPELL)
1470 continue; 1258 continue;
1471 1259
1472 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1260 if (at->object::name != spell_name)
1473 continue; 1261 continue;
1474 1262
1475 if (strcmp (ar->clone.name, spell_name) != 0)
1476 continue;
1477
1478 if (found != NULL) 1263 if (found)
1479 { 1264 {
1480 if (!conflict_found) 1265 if (!conflict_found)
1481 { 1266 {
1482 conflict_found = 1; 1267 conflict_found = 1;
1483 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1268 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); 1269 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1485 } 1270 }
1271
1486 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1272 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1487 continue; 1273 return 0;
1488 } 1274 }
1489 1275
1490 found = ar; 1276 found = at;
1491 } 1277 }
1492
1493 /* No match if more more than one archetype matches. */
1494 if (conflict_found)
1495 return NULL;
1496 1278
1497 /* Return if exactly one archetype matches. */ 1279 /* Return if exactly one archetype matches. */
1498 if (found != NULL) 1280 if (found)
1499 return arch_to_object (found); 1281 return arch_to_object (found);
1500 1282
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. */ 1283 /* 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); 1284 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1285
1541 return NULL; 1286 return 0;
1542} 1287}
1543 1288
1544static int 1289static int
1545command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1290command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1546{ 1291{
… …
1563 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1308 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1564 return 0; 1309 return 0;
1565 } 1310 }
1566 1311
1567 do_learn_spell (op, tmp, special_prayer); 1312 do_learn_spell (op, tmp, special_prayer);
1568 free_object (tmp); 1313 tmp->destroy ();
1569 return 1; 1314 return 1;
1570} 1315}
1571 1316
1572int 1317int
1573command_learn_spell (object *op, char *params) 1318command_learn_spell (object *op, char *params)
… …
1598 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1343 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1599 return 0; 1344 return 0;
1600 } 1345 }
1601 1346
1602 do_forget_spell (op, spell->name); 1347 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; 1348 return 1;
1662} 1349}
1663 1350
1664/** 1351/**
1665 * A players wants to become DM and hide. 1352 * A players wants to become DM and hide.
… …
1673 return 0; 1360 return 0;
1674 1361
1675 do_wizard_hide (op, 1); 1362 do_wizard_hide (op, 1);
1676 1363
1677 return 1; 1364 return 1;
1678}
1679
1680void
1681dm_stack_pop (player *pl)
1682{
1683 if (!pl->stack_items || !pl->stack_position)
1684 {
1685 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1686 return;
1687 }
1688
1689 pl->stack_position--;
1690 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1691}
1692
1693/**
1694 * Get current stack top item for player.
1695 * Returns NULL if no stacked item.
1696 * If stacked item disappeared (freed), remove it.
1697 *
1698 * Ryo, august 2004
1699 */
1700object *
1701dm_stack_peek (player *pl)
1702{
1703 object *ob;
1704
1705 if (!pl->stack_position)
1706 {
1707 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1708 return NULL;
1709 }
1710
1711 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1712 if (!ob)
1713 {
1714 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1715 dm_stack_pop (pl);
1716 return NULL;
1717 }
1718
1719 return ob;
1720}
1721
1722/**
1723 * Push specified item on player stack.
1724 * Inform player of position.
1725 * Initializes variables if needed.
1726 */
1727void
1728dm_stack_push (player *pl, tag_t item)
1729{
1730 if (!pl->stack_items)
1731 {
1732 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1733 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1734 }
1735
1736 if (pl->stack_position == STACK_SIZE)
1737 {
1738 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1739 return;
1740 }
1741
1742 pl->stack_items[pl->stack_position] = item;
1743 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1744 pl->stack_position++;
1745}
1746
1747/**
1748 * Checks 'params' for object code.
1749 *
1750 * Can be:
1751 * * empty => get current object stack top for player
1752 * * number => get item with that tag, stack it for future use
1753 * * $number => get specified stack item
1754 * * "me" => player himself
1755 *
1756 * At function exit, params points to first non-object char
1757 *
1758 * 'from', if not NULL, contains at exit:
1759 * * STACK_FROM_NONE => object not found
1760 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1761 * * STACK_FROM_STACK => item from somewhere in the stack
1762 * * STACK_FROM_NUMBER => item by number, pushed on stack
1763 *
1764 * Ryo, august 2004
1765 */
1766object *
1767get_dm_object (player *pl, char **params, int *from)
1768{
1769 int item_tag, item_position;
1770 object *ob;
1771
1772 if (!pl)
1773 return NULL;
1774
1775 if (!params || !*params || **params == '\0')
1776 {
1777 if (from)
1778 *from = STACK_FROM_TOP;
1779 /* No parameter => get stack item */
1780 return dm_stack_peek (pl);
1781 }
1782
1783 /* Let's clean white spaces */
1784 while (**params == ' ')
1785 (*params)++;
1786
1787 /* Next case: number => item tag */
1788 if (sscanf (*params, "%d", &item_tag))
1789 {
1790 /* Move parameter to next item */
1791 while (isdigit (**params))
1792 (*params)++;
1793
1794 /* And skip blanks, too */
1795 while (**params == ' ')
1796 (*params)++;
1797
1798 /* Get item */
1799 ob = find_object (item_tag);
1800 if (!ob)
1801 {
1802 if (from)
1803 *from = STACK_FROM_NONE;
1804 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1805 return NULL;
1806 }
1807
1808 /* Got one, let's push it on stack */
1809 dm_stack_push (pl, item_tag);
1810 if (from)
1811 *from = STACK_FROM_NUMBER;
1812 return ob;
1813 }
1814
1815 /* Next case: $number => stack item */
1816 if (sscanf (*params, "$%d", &item_position))
1817 {
1818 /* Move parameter to next item */
1819 (*params)++;
1820
1821 while (isdigit (**params))
1822 (*params)++;
1823 while (**params == ' ')
1824 (*params)++;
1825
1826 if (item_position >= pl->stack_position)
1827 {
1828 if (from)
1829 *from = STACK_FROM_NONE;
1830 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1831 return NULL;
1832 }
1833
1834 ob = find_object (pl->stack_items[item_position]);
1835 if (!ob)
1836 {
1837 if (from)
1838 *from = STACK_FROM_NONE;
1839 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1840 return NULL;
1841 }
1842
1843 if (from)
1844 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1845 return ob;
1846 }
1847
1848 /* Next case: 'me' => return pl->ob */
1849 if (!strncmp (*params, "me", 2))
1850 {
1851 if (from)
1852 *from = STACK_FROM_NUMBER;
1853 dm_stack_push (pl, pl->ob->count);
1854
1855 /* Skip to next token */
1856 (*params) += 2;
1857 while (**params == ' ')
1858 (*params)++;
1859
1860 return pl->ob;
1861 }
1862
1863 /* Last case: get stack top */
1864 if (from)
1865 *from = STACK_FROM_TOP;
1866 return dm_stack_peek (pl);
1867} 1365}
1868 1366
1869/** 1367/**
1870 * Pop the stack top. 1368 * Pop the stack top.
1871 */ 1369 */
… …
1931} 1429}
1932 1430
1933int 1431int
1934command_insert_into (object *op, char *params) 1432command_insert_into (object *op, char *params)
1935{ 1433{
1936 object *left, *right, *inserted; 1434 object *left, *right;
1937 int left_from, right_from; 1435 int left_from, right_from;
1938 1436
1939 left = get_dm_object (op->contr, &params, &left_from); 1437 left = get_dm_object (op->contr, &params, &left_from);
1940 if (!left) 1438 if (!left)
1941 { 1439 {
… …
1985 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1483 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1986 return 0; 1484 return 0;
1987 } 1485 }
1988 1486
1989 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1487 if (!QUERY_FLAG (right, FLAG_REMOVED))
1990 remove_ob (right); 1488 right->remove ();
1489
1991 inserted = insert_ob_in_ob (right, left); 1490 object *inserted = 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 1491
1998 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1492 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1999 1493
2000 return 0; 1494 return 0;
2001 1495

Diff Legend

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