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.25 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.87 by root, Tue Jan 3 11:25:36 2012 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,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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 **/
… …
35/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
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
41 39
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
… …
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 113
73 if (pl->ns->state != ST_PLAYING) 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);
74 { 129 }
75 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)
76 return NULL; 168 return NULL;
169
170 if (!params || !*params || **params == '\0')
77 } 171 {
172 if (from)
173 *from = STACK_FROM_TOP;
174 /* No parameter => get stack item */
175 return dm_stack_peek (pl);
176 }
78 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
79 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);
80} 262}
81 263
82/** 264/**
83 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
84 * 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,
85 * else they just think someone left/entered. 267 * else they just think someone left/entered.
86 */ 268 */
87void 269static void
88do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
89{ 271{
90 if (op->contr->hidden) 272 if (op->contr->hidden)
91 { 273 {
92 op->contr->hidden = 0; 274 op->contr->hidden = 0;
93 op->invisible = 1; 275 op->invisible = 1;
94 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");
95 op->map->players++; 277 op->map->players++;
96 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
97 if (!silent_dm) 280 if (!silent_dm)
98 {
99 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!");
100 }
101 } 282 }
102 else 283 else
103 { 284 {
104 op->contr->hidden = 1; 285 op->contr->hidden = 1;
105 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.");
106 op->map->players--; 287 op->map->players--;
288
107 if (!silent_dm) 289 if (!silent_dm)
108 {
109 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..");
110 } 291
111 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);
112 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);
113 } 294 }
114} 295}
115 296
… …
175 { 356 {
176 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);
177 return 1; 358 return 1;
178 } 359 }
179 360
180 become_follower (ob, god); 361 ob->become_follower (god);
181 return 1;
182}
183
184/**
185 * Add player's IP to ban_file and kick them off the server
186 * I know most people have dynamic IPs but this is more of a short term
187 * solution if they have to get a new IP to play maybe they'll calm down.
188 * This uses the banish_file in the local directory *not* the ban_file
189 * The action is logged with a ! for easy searching. -tm
190 */
191int
192command_banish (object *op, char *params)
193{
194 player *pl;
195 FILE *banishfile;
196 char buf[MAX_BUF];
197 time_t now;
198
199 if (!params)
200 {
201 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
202 return 1;
203 }
204
205 pl = get_other_player_from_name (op, params);
206 if (!pl)
207 return 1;
208
209 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
210
211 if ((banishfile = fopen (buf, "a")) == NULL)
212 {
213 LOG (llevDebug, "Could not find file banish_file.\n");
214 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
215 return 0;
216 }
217
218 now = time (NULL);
219 /*
220 * Record this as a comment - then we don't have to worry about changing
221 * the parsing code.
222 */
223 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
224 fprintf (banishfile, "*@%s\n", pl->ns->host);
225 fclose (banishfile);
226
227 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
228 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
229 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
230 command_kick (op, (char *) &pl->ob->name);
231 return 1;
232}
233
234int
235command_kick (object *op, char *params)
236{
237 for (player *pl = first_player; pl; pl = pl->next)
238 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
239 {
240 object *op = pl->ob;
241
242 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
243 {
244 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
245 strcpy (op->contr->killer, "kicked");
246 }
247
248 pl->ns->destroy ();
249 }
250
251 return 1;
252}
253
254int
255command_save_overlay (object *op, char *params)
256{
257 if (!op)
258 return 0;
259
260 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
261 {
262 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
263 return 1;
264 }
265
266 new_save_map (op->map, 2);
267 new_save_map (op->map, 0);
268 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
269
270 ready_map_name (op->map->path, 0);
271
272 return 1;
273}
274
275int
276command_shutdown (object *op, char *params)
277{
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1;
282 }
283
284 cleanup ();
285 /* not reached */
286 return 1; 362 return 1;
287} 363}
288 364
289int 365int
290command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
… …
328 object *dummy; 404 object *dummy;
329 player *pl; 405 player *pl;
330 406
331 if (!op) 407 if (!op)
332 return 0; 408 return 0;
409
333 if (params == NULL) 410 if (params == NULL)
334 { 411 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 413 return 1;
337 } 414 }
415
338 pl = get_other_player_from_name (op, params); 416 pl = get_other_player_from_name (op, params);
339 if (!pl) 417 if (!pl)
340 return 1; 418 return 1;
419
341 dummy = get_jail_exit (pl->ob); 420 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 421 if (!dummy)
343 { 422 {
344 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 424 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 425 return 0;
347 } 426 }
348 enter_exit (pl->ob, dummy); 427
428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
349 dummy->destroy (); 429 dummy->destroy ();
430
350 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.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 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);
353 return 1; 434 return 1;
354} 435}
… …
371 452
372 pl = get_other_player_from_name (op, params); 453 pl = get_other_player_from_name (op, params);
373 if (!pl) 454 if (!pl)
374 return 1; 455 return 1;
375 456
376 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);
377 if (i == -1) 462 if (i == -1)
378 { 463 {
379 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.");
380 return 1; 465 return 1;
381 } 466 }
382 467
383 dummy = object::create (); 468 nx += freearr_x [i];
384 EXIT_PATH (dummy) = op->map->path; 469 ny += freearr_y [i];
385 EXIT_X (dummy) = op->x + freearr_x[i]; 470
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 471 if (!xy_normalise (m, nx, ny))
387 enter_exit (pl->ob, dummy); 472 {
388 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);
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 478 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 479 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 480
392 return 1;
393}
394
395/**
396 * Teleport next to target player.
397 */
398
399/* mids 01/16/2002 */
400int
401command_teleport (object *op, char *params)
402{
403 int i;
404 object *dummy;
405 player *pl;
406
407 if (!op)
408 return 0;
409
410 if (params == NULL)
411 {
412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
413 return 1;
414 }
415
416 pl = get_other_player_from_name (op, params);
417 if (!pl)
418 return 1;
419
420 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
421 if (i == -1)
422 {
423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
424 return 1;
425 }
426
427 dummy = object::create ();
428 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy);
432 dummy->destroy ();
433 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 481 return 1;
437} 482}
438 483
439/** 484/**
440 * This function is a real mess, because we're stucking getting 485 * This function is a real mess, because we're stucking getting
… …
530 * we also set up spell_name which is only 575 * we also set up spell_name which is only
531 * the first word. 576 * the first word.
532 */ 577 */
533 578
534 at_spell = archetype::find (cp); 579 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 580 if (!at_spell || at_spell->type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 581 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 582 if (!at_spell || at_spell->type != SPELL)
538 { 583 {
539 strcpy (spell_name, cp); 584 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 585 fsp = strchr (spell_name, ' ');
541 if (fsp) 586 if (fsp)
542 { 587 {
543 *fsp = 0; 588 *fsp = 0;
544 fsp++; 589 fsp++;
545 at_spell = archetype::find (spell_name); 590 at_spell = archetype::find (spell_name);
546 591
547 /* Got a spell, update the first string pointer */ 592 /* Got a spell, update the first string pointer */
548 if (at_spell && at_spell->clone.type == SPELL) 593 if (at_spell && at_spell->type == SPELL)
549 bp2 = cp + strlen (spell_name) + 1; 594 bp2 = cp + strlen (spell_name) + 1;
550 else 595 else
551 at_spell = NULL; 596 at_spell = NULL;
552 } 597 }
553 } 598 }
… …
555 /* OK - we didn't find a spell - presume the 'of' 600 /* OK - we didn't find a spell - presume the 'of'
556 * in this case means its an artifact. 601 * in this case means its an artifact.
557 */ 602 */
558 if (!at_spell) 603 if (!at_spell)
559 { 604 {
560 if (find_artifactlist (at->clone.type) == NULL) 605 if (find_artifactlist (at->type) == NULL)
561 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 606 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
562 else 607 else
563 { 608 {
564 art = find_artifactlist (at->clone.type)->items; 609 art = find_artifactlist (at->type)->items;
565 610
566 do 611 while (art)
567 { 612 {
568 if (!strcmp (art->item->name, cp)) 613 if (!strcmp (&art->item->name, cp))
569 break; 614 break;
615
570 art = art->next; 616 art = art->next;
571 } 617 }
572 while (art != NULL);
573 618
574 if (!art) 619 if (!art)
575 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);
576 } 621 }
577 622
578 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);
579 } 624 }
580 } /* if cp */ 625 } /* if cp */
581 626
582 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 627 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
583 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 628 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
584 { 629 {
585 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 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);
586 return 1; 631 return 1;
587 } 632 }
588 633
589 /* 634 /*
590 * 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,
591 * just create one object, do all the processing, and then determine 636 * just create one object, do all the processing, and then determine
592 * if that one object should be inserted or if we need to make copies. 637 * if that one object should be inserted or if we need to make copies.
593 */ 638 */
594 tmp = arch_to_object (at); 639 tmp = at->instance ();
595
596 if (settings.real_wiz == FALSE)
597 SET_FLAG (tmp, FLAG_WAS_WIZ);
598 640
599 if (set_magic) 641 if (set_magic)
600 set_abs_magic (tmp, magic); 642 set_abs_magic (tmp, magic);
601 643
602 if (art) 644 if (art)
603 give_artifact_abilities (tmp, art->item); 645 give_artifact_abilities (tmp, art->item);
604 646
605 if (need_identify (tmp)) 647 if (tmp->need_identify ())
606 { 648 {
607 SET_FLAG (tmp, FLAG_IDENTIFIED); 649 tmp->set_flag (FLAG_IDENTIFIED);
608 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 650 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
609 } 651 }
610 652
611 /* 653 /*
612 * This entire block here tries to find variable pairings, 654 * This entire block here tries to find variable pairings,
613 * 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
… …
682 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);
683 725
684 bp2 = bp3 + 1; 726 bp2 = bp3 + 1;
685 } 727 }
686 728
687 if (at->clone.nrof) 729 if (at->nrof)
688 { 730 {
689 if (at_spell) 731 if (at_spell)
690 insert_ob_in_ob (arch_to_object (at_spell), tmp); 732 tmp->insert (at_spell->instance ());
691 733
692 tmp->x = op->x; 734 tmp->x = op->x;
693 tmp->y = op->y; 735 tmp->y = op->y;
736 tmp->map = op->map;
694 737
695 if (set_nrof) 738 if (set_nrof)
696 tmp->nrof = nrof; 739 tmp->nrof = nrof;
697 740
698 tmp->map = op->map; 741 op->insert (tmp);
699
700 tmp = insert_ob_in_ob (tmp, op);
701 esrv_send_item (op, tmp);
702 742
703 /* 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. */
704 dm_stack_push (op->contr, tmp->count); 744 dm_stack_push (op->contr, tmp->count);
705 745
706 return 1; 746 return 1;
707 } 747 }
708 else 748 else
709 { 749 {
710 for (i = 0; i < (set_nrof ? nrof : 1); i++) 750 for (i = 0; i < (set_nrof ? nrof : 1); i++)
711 { 751 {
712 archetype *atmp;
713 object *prev = 0, *head = 0; 752 object *prev = 0, *head = 0;
714 753
715 for (atmp = at; atmp; atmp = atmp->more) 754 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
716 { 755 {
717 object *dup = arch_to_object (atmp); 756 object *dup = atmp->instance ();
718 757
719 if (at_spell) 758 if (at_spell)
720 insert_ob_in_ob (arch_to_object (at_spell), dup); 759 insert_ob_in_ob (at_spell->instance (), dup);
721 760
722 /* 761 /*
723 * The head is what contains all the important bits, 762 * The head is what contains all the important bits,
724 * so just copying it over should be fine. 763 * so just copying it over should be fine.
725 */ 764 */
… …
727 { 766 {
728 head = dup; 767 head = dup;
729 tmp->copy_to (dup); 768 tmp->copy_to (dup);
730 } 769 }
731 770
732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ);
734
735 dup->x = op->x + dup->arch->clone.x; 771 dup->x = op->x + dup->arch->x;
736 dup->y = op->y + dup->arch->clone.y; 772 dup->y = op->y + dup->arch->y;
737 dup->map = op->map; 773 dup->map = op->map;
738 774
739 if (head != dup) 775 if (head != dup)
740 { 776 {
741 dup->head = head; 777 dup->head = head;
… …
743 } 779 }
744 780
745 prev = dup; 781 prev = dup;
746 } 782 }
747 783
748 if (QUERY_FLAG (head, FLAG_ALIVE)) 784 if (head->flag [FLAG_ALIVE])
749 { 785 {
750 object *check = head; 786 object *check = head;
751 int size_x = 0; 787 int size_x = 0;
752 int size_y = 0; 788 int size_y = 0;
753 789
754 while (check) 790 while (check)
755 { 791 {
756 size_x = MAX (size_x, check->arch->clone.x); 792 size_x = max (size_x, check->arch->x);
757 size_y = MAX (size_y, check->arch->clone.y); 793 size_y = max (size_y, check->arch->y);
758 check = check->more; 794 check = check->more;
759 } 795 }
760 796
761 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))
762 { 798 {
… …
788 /* 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
789 * things like rods have nrof 0, we want to cover those. 825 * things like rods have nrof 0, we want to cover those.
790 */ 826 */
791 dm_stack_push (op->contr, head->count); 827 dm_stack_push (op->contr, head->count);
792 828
793 if (at->clone.randomitems != NULL && !at_spell) 829 if (at->randomitems && !at_spell)
794 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 830 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
795
796 esrv_send_item (op, head);
797 } 831 }
798 832
799 /* free the one we used to copy */ 833 /* free the one we used to copy */
800 tmp->destroy (); 834 tmp->destroy ();
801 } 835 }
… …
808 */ 842 */
809 843
810int 844int
811command_inventory (object *op, char *params) 845command_inventory (object *op, char *params)
812{ 846{
847 int i;
813 object *tmp; 848 object *tmp;
814 int i;
815 849
816 if (!params) 850 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
817 { 851 {
818 inventory (op, NULL); 852 op->contr->failmsg ("Inventory of what object (nr)?");
819 return 0; 853 return 1;
820 }
821
822 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
823 { 854 }
824 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
825 return 1;
826 }
827 855
828 inventory (op, tmp); 856 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
857
829 return 1; 858 return 1;
830} 859}
831 860
832/* just show player's their skills for now. Dm's can 861/* just show player's their skills for now. Dm's can
833 * already see skills w/ inventory command - b.t. 862 * already see skills w/ inventory command - b.t.
… …
851 880
852 char *dump = dump_object (tmp); 881 char *dump = dump_object (tmp);
853 new_draw_info (NDI_UNIQUE, 0, op, dump); 882 new_draw_info (NDI_UNIQUE, 0, op, dump);
854 free (dump); 883 free (dump);
855 884
856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 885 if (tmp->flag [FLAG_OBJ_ORIGINAL])
857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 886 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858 887
859 return 1;
860}
861
862/**
863 * When DM is possessing a monster, flip aggression on and off, to allow
864 * better motion.
865 */
866int
867command_mon_aggr (object *op, char *params)
868{
869 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
870 {
871 op->enemy = NULL;
872 SET_FLAG (op, FLAG_UNAGGRESSIVE);
873 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
874 }
875 else
876 {
877 CLEAR_FLAG (op, FLAG_FRIENDLY);
878 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
879 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
880 }
881
882 return 1;
883}
884
885/** DM can possess a monster. Basically, this tricks the client into thinking
886 * a given monster, is actually the player it controls. This allows a DM
887 * to inhabit a monster's body, and run around the game with it.
888 * This function is severely broken - it has tons of hardcoded values,
889 */
890int
891command_possess (object *op, char *params)
892{
893 object *victim, *curinv, *nextinv;
894 player *pl;
895 int i;
896 char buf[MAX_BUF];
897
898 victim = NULL;
899 if (params != NULL)
900 {
901 if (sscanf (params, "%d", &i))
902 victim = find_object (i);
903 else if (sscanf (params, "%s", buf))
904 victim = find_object_name (buf);
905 }
906 if (victim == NULL)
907 {
908 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
909 return 1;
910 }
911
912 if (victim == op)
913 {
914 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
915 return 1;
916 }
917
918 /* clear out the old inventory */
919 curinv = op->inv;
920 while (curinv != NULL)
921 {
922 nextinv = curinv->below;
923 esrv_del_item (op->contr, curinv->count);
924 curinv = nextinv;
925 }
926
927 /* make the switch */
928 pl = op->contr;
929 victim->contr = pl;
930 pl->ob = victim;
931 victim->type = PLAYER;
932 SET_FLAG (victim, FLAG_WIZ);
933
934 /* send the inventory to the client */
935 curinv = victim->inv;
936 while (curinv != NULL)
937 {
938 nextinv = curinv->below;
939 esrv_send_item (victim, curinv);
940 curinv = nextinv;
941 }
942 /* basic patchup */
943 /* The use of hard coded values is terrible. Note
944 * that really, to be fair, this shouldn't get changed at
945 * all - if you are possessing a kobold, you should have the
946 * same limitations. As it is, as more body locations are added,
947 * this will give this player more locations than perhaps
948 * they should be allowed.
949 */
950 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
951 if (i == 1 || i == 6 || i == 8 || i == 9)
952 victim->body_info[i] = 2;
953 else
954 victim->body_info[i] = 1;
955
956 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
957 esrv_send_inventory (victim, victim);
958
959 fix_player (victim);
960
961 do_some_living (victim);
962 return 1; 888 return 1;
963} 889}
964 890
965int 891int
966command_patch (object *op, char *params) 892command_patch (object *op, char *params)
… …
981 return 1; 907 return 1;
982 } 908 }
983 909
984 if ((arg2 = strchr (arg, ' '))) 910 if ((arg2 = strchr (arg, ' ')))
985 arg2++; 911 arg2++;
986 if (settings.real_wiz == FALSE) 912
987 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
988 if (set_variable (tmp, arg) == -1) 913 if (set_variable (tmp, arg) == -1)
989 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 914 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
990 else 915 else
991 {
992 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 916 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
993 }
994 917
995 return 1; 918 return 1;
996} 919}
997 920
998int 921int
… …
1012 { 935 {
1013 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!");
1014 return 1; 937 return 1;
1015 } 938 }
1016 939
1017 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 940 if (tmp->flag [FLAG_REMOVED])
1018 { 941 {
1019 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));
1020 return 1; 943 return 1;
1021 } 944 }
1022 945
… …
1047 970
1048 if (from != STACK_FROM_STACK) 971 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 972 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 973 dm_stack_pop (op->contr);
1051 974
1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1053 {
1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1055 tmp->remove ();
1056 }
1057
1058 if (tmp->head) 975 if (tmp->head)
1059 tmp = tmp->head; 976 tmp = tmp->head;
1060 977
1061 tmp->destroy (); 978 tmp->destroy ();
1062 return 1; 979 return 1;
… …
1067 */ 984 */
1068int 985int
1069command_addexp (object *op, char *params) 986command_addexp (object *op, char *params)
1070{ 987{
1071 char buf[MAX_BUF], skill[MAX_BUF]; 988 char buf[MAX_BUF], skill[MAX_BUF];
1072 int i, q; 989 int q;
990 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1073 object *skillob = NULL; 991 object *skillob = NULL;
1074 player *pl;
1075 992
1076 skill[0] = '\0'; 993 skill[0] = '\0';
1077 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))
1078 { 995 {
1079 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>].");
1080 return 1; 997 return 1;
1081 } 998 }
1082 999
1083 for (pl = first_player; pl != NULL; pl = pl->next) 1000 for_all_players (pl)
1084 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1001 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1085 break;
1086
1087 if (pl == NULL)
1088 { 1002 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1090 return 1;
1091 }
1092
1093 if (q >= 3) 1003 if (q >= 3)
1094 { 1004 {
1095 skillob = find_skill_by_name (pl->ob, skill); 1005 skillob = find_skill_by_name (pl->ob, skill);
1096 if (!skillob) 1006 if (!skillob)
1097 { 1007 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1008 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1009 return 1;
1010 }
1011
1012 i = check_exp_adjust (skillob, i);
1013 skillob->stats.exp += i;
1014 calc_perm_exp (skillob);
1015 player_lvl_adj (pl->ob, skillob);
1016 }
1017
1018 pl->ob->stats.exp += i;
1019 calc_perm_exp (pl->ob);
1020 player_lvl_adj (pl->ob, NULL);
1021
1099 return 1; 1022 return 1;
1100 } 1023 }
1101 1024
1102 i = check_exp_adjust (skillob, i); 1025 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1103 skillob->stats.exp += i;
1104 calc_perm_exp (skillob);
1105 player_lvl_adj (pl->ob, skillob);
1106 }
1107
1108 pl->ob->stats.exp += i;
1109 calc_perm_exp (pl->ob);
1110 player_lvl_adj (pl->ob, NULL);
1111
1112 if (settings.real_wiz == FALSE)
1113 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1114 return 1; 1026 return 1;
1115} 1027}
1116 1028
1117/**************************************************************************/ 1029/**************************************************************************/
1118 1030
… …
1124 1036
1125int 1037int
1126command_stats (object *op, char *params) 1038command_stats (object *op, char *params)
1127{ 1039{
1128 char thing[20]; 1040 char thing[20];
1129 player *pl;
1130 char buf[MAX_BUF]; 1041 char buf[MAX_BUF];
1131 1042
1132 thing[0] = '\0'; 1043 thing[0] = '\0';
1133 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1044 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1134 { 1045 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1046 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1136 return 1; 1047 return 1;
1137 } 1048 }
1138 1049
1139 for (pl = first_player; pl != NULL; pl = pl->next) 1050 for_all_players (pl)
1140 if (!strcmp (pl->ob->name, thing)) 1051 if (!strcmp (&pl->ob->name, thing))
1141 { 1052 {
1142 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);
1143 new_draw_info (NDI_UNIQUE, 0, op, buf); 1054 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 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);
1145 new_draw_info (NDI_UNIQUE, 0, op, buf); 1056 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1062 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1063 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 1064 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1065 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1155 new_draw_info (NDI_UNIQUE, 0, op, buf); 1066 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 break; 1067 return 1;
1157 } 1068 }
1158 if (pl == NULL) 1069
1159 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1070 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1160 return 1; 1071 return 1;
1161} 1072}
1162 1073
1163int 1074int
1164command_abil (object *op, char *params) 1075command_abil (object *op, char *params)
1165{ 1076{
1166 char thing[20], thing2[20]; 1077 char thing[20], thing2[20];
1167 int iii; 1078 int iii;
1168 player *pl;
1169 char buf[MAX_BUF]; 1079 char buf[MAX_BUF];
1170 1080
1171 iii = 0; 1081 iii = 0;
1172 thing[0] = '\0'; 1082 thing[0] = '\0';
1173 thing2[0] = '\0'; 1083 thing2[0] = '\0';
… …
1187 { 1097 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1098 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1189 return 1; 1099 return 1;
1190 } 1100 }
1191 1101
1192 for (pl = first_player; pl != NULL; pl = pl->next) 1102 for_all_players (pl)
1193 { 1103 {
1194 if (!strcmp (pl->ob->name, thing)) 1104 if (!strcmp (&pl->ob->name, thing))
1195 { 1105 {
1196 if (settings.real_wiz == FALSE)
1197 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1198 if (!strcmp ("str", thing2))
1199 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;
1200 if (!strcmp ("dex", thing2))
1201 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;
1202 if (!strcmp ("con", thing2))
1203 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;
1204 if (!strcmp ("wis", thing2))
1205 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;
1206 if (!strcmp ("cha", thing2))
1207 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 1110 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1208 if (!strcmp ("int", thing2))
1209 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1111 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1210 if (!strcmp ("pow", thing2))
1211 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1112 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1113
1212 sprintf (buf, "%s has been altered.", &pl->ob->name); 1114 sprintf (buf, "%s has been altered.", &pl->ob->name);
1213 new_draw_info (NDI_UNIQUE, 0, op, buf); 1115 new_draw_info (NDI_UNIQUE, 0, op, buf);
1214 fix_player (pl->ob); 1116 pl->ob->update_stats ();
1215 return 1; 1117 return 1;
1216 } 1118 }
1217 } 1119 }
1218 1120
1219 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1121 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1220 return 1; 1122 return 1;
1221} 1123}
1222 1124
1223int 1125int
1224command_reset (object *op, char *params)
1225{
1226 maptile *m;
1227 object *dummy = NULL, *tmp = NULL;
1228
1229 if (params == NULL)
1230 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1232 return 1;
1233 }
1234
1235 if (strcmp (params, ".") == 0)
1236 params = op->map->path;
1237
1238 m = has_been_loaded (params);
1239 if (m == NULL)
1240 {
1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1242 return 1;
1243 }
1244
1245 if (m->in_memory != MAP_SWAPPED)
1246 {
1247 if (m->in_memory != MAP_IN_MEMORY)
1248 {
1249 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1250 return 0;
1251 }
1252
1253 /*
1254 * Only attempt to remove the player that is doing the reset, and not other
1255 * players or wiz's.
1256 */
1257 if (op->map == m)
1258 {
1259 dummy = object::create ();
1260 dummy->map = NULL;
1261 EXIT_X (dummy) = op->x;
1262 EXIT_Y (dummy) = op->y;
1263 EXIT_PATH (dummy) = op->map->path;
1264 op->remove ();
1265 op->map = NULL;
1266 tmp = op;
1267 }
1268 swap_map (m);
1269 }
1270
1271 if (m->in_memory == MAP_SWAPPED)
1272 {
1273 LOG (llevDebug, "Resetting map %s.\n", m->path);
1274
1275 /* setting this effectively causes an immediate reload */
1276 m->reset_time = 1;
1277 flush_old_maps ();
1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1280 if (tmp)
1281 {
1282 enter_exit (tmp, dummy);
1283 dummy->destroy ();
1284 }
1285
1286 return 1;
1287 }
1288 else
1289 {
1290 player *pl;
1291 int playercount = 0;
1292
1293 /* Need to re-insert player if swap failed for some reason */
1294 if (tmp)
1295 {
1296 insert_ob_in_map (op, m, NULL, 0);
1297 dummy->destroy ();
1298 }
1299
1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1301 for (pl = first_player; pl != NULL; pl = pl->next)
1302 {
1303 if (pl->ob->map == m && pl->ob != op)
1304 {
1305 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1306 playercount++;
1307 }
1308 }
1309 if (!playercount)
1310 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1311 return 1;
1312 }
1313}
1314
1315int
1316command_nowiz (object *op, char *params) 1126command_nowiz (object *op, char *params)
1317{ /* 'noadm' is alias */ 1127{ /* 'nodm' is alias */
1318 CLEAR_FLAG (op, FLAG_WIZ); 1128 op->clr_flag (FLAG_WIZ);
1319 CLEAR_FLAG (op, FLAG_WIZPASS); 1129 op->clr_flag (FLAG_WIZPASS);
1320 CLEAR_FLAG (op, FLAG_WIZCAST); 1130 op->clr_flag (FLAG_WIZCAST);
1131 op->clr_flag (FLAG_WIZLOOK);
1132 op->contr->do_los = 1;
1321 1133
1322 if (settings.real_wiz == TRUE)
1323 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1324 if (op->contr->hidden) 1134 if (op->contr->hidden)
1325 { 1135 {
1326 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");
1327 op->map->players++; 1137 op->map->players++;
1328 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 1138 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1329 op->contr->hidden = 0; 1139 op->contr->hidden = 0;
1330 op->invisible = 1; 1140 op->invisible = 1;
1331 } 1141 }
1332 else 1142 else
1333 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
1334 return 1; 1145 return 1;
1335} 1146}
1336 1147
1337/** 1148/**
1338 * object *op is trying to become dm. 1149 * object *op is trying to become dm.
… …
1375 } 1186 }
1376 fclose (dmfile); 1187 fclose (dmfile);
1377 return (0); 1188 return (0);
1378} 1189}
1379 1190
1380int 1191static int
1381do_wizard_dm (object *op, char *params, int silent) 1192do_wizard_dm (object *op, char *params, int silent)
1382{ 1193{
1383 if (!op->contr) 1194 if (!op->contr)
1384 return 0; 1195 return 0;
1385 1196
1386 if (QUERY_FLAG (op, FLAG_WIZ)) 1197 if (op->flag [FLAG_WIZ])
1387 { 1198 {
1388 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!");
1389 return 0; 1200 return 0;
1390 } 1201 }
1391 1202
1392 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1203 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1393 { 1204 {
1394 SET_FLAG (op, FLAG_WIZ); 1205 op->set_flag (FLAG_WIZ);
1395 SET_FLAG (op, FLAG_WAS_WIZ); 1206 op->set_flag (FLAG_WIZPASS);
1396 SET_FLAG (op, FLAG_WIZPASS); 1207 op->set_flag (FLAG_WIZCAST);
1397 SET_FLAG (op, FLAG_WIZCAST); 1208 op->set_flag (FLAG_WIZLOOK);
1209 op->contr->do_los = 1;
1210
1398 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!");
1399 /*
1400 * Remove setting flying here - that won't work, because next
1401 * fix_player() is called that will get cleared - proper solution
1402 * is probably something like a wiz_force which gives that and any
1403 * other desired abilities.
1404 */
1405 clear_los (op);
1406 op->contr->write_buf[0] = '\0'; 1212 op->contr->write_buf[0] = '\0';
1407 1213
1408 if (!silent) 1214 if (!silent)
1409 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!");
1410 1216
… …
1437command_invisible (object *op, char *params) 1243command_invisible (object *op, char *params)
1438{ 1244{
1439 if (op) 1245 if (op)
1440 { 1246 {
1441 op->invisible += 100; 1247 op->invisible += 100;
1442 update_object (op, UP_OBJ_FACE); 1248 update_object (op, UP_OBJ_CHANGE);
1443 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1249 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1444 } 1250 }
1445 1251
1446 return 0; 1252 return 0;
1447} 1253}
… …
1450 * Returns spell object (from archetypes) by name. 1256 * Returns spell object (from archetypes) by name.
1451 * Returns NULL if 0 or more than one spell matches. 1257 * Returns NULL if 0 or more than one spell matches.
1452 * Used for wizard's learn spell/prayer. 1258 * Used for wizard's learn spell/prayer.
1453 * 1259 *
1454 * op is the player issuing the command. 1260 * op is the player issuing the command.
1455 *
1456 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1457 * anymore (but may still be present in some player's inventories and thus
1458 * cannot be removed). We have to ignore them here since they have the same
1459 * name than other "spell_xxx" archetypes and would always conflict.
1460 */ 1261 */
1461static object * 1262static object *
1462get_spell_by_name (object *op, const char *spell_name) 1263get_spell_by_name (object *op, shstr_cmp spell_name)
1463{ 1264{
1464 archetype *ar;
1465 archetype *found;
1466 int conflict_found;
1467 size_t spell_name_length;
1468
1469 /* First check for full name matches. */ 1265 /* First check for full name matches. */
1470 conflict_found = 0; 1266 int conflict_found = 0;
1471 found = NULL; 1267 archetype *found = 0;
1472 for (ar = first_archetype; ar != NULL; ar = ar->next) 1268
1269 for_all_archetypes (at)
1473 { 1270 {
1474 if (ar->clone.type != SPELL) 1271 if (at->type != SPELL)
1475 continue; 1272 continue;
1476 1273
1477 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1274 if (at->object::name != spell_name)
1478 continue; 1275 continue;
1479 1276
1480 if (strcmp (ar->clone.name, spell_name) != 0)
1481 continue;
1482
1483 if (found != NULL) 1277 if (found)
1484 { 1278 {
1485 if (!conflict_found) 1279 if (!conflict_found)
1486 { 1280 {
1487 conflict_found = 1; 1281 conflict_found = 1;
1488 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);
1489 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1283 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1490 } 1284 }
1285
1491 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1286 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1492 continue; 1287 return 0;
1493 } 1288 }
1494 1289
1495 found = ar; 1290 found = at;
1496 } 1291 }
1497
1498 /* No match if more more than one archetype matches. */
1499 if (conflict_found)
1500 return NULL;
1501 1292
1502 /* Return if exactly one archetype matches. */ 1293 /* Return if exactly one archetype matches. */
1503 if (found != NULL) 1294 if (found)
1504 return arch_to_object (found); 1295 return found->instance ();
1505
1506 /* No full match found: now check for partial matches. */
1507 spell_name_length = strlen (spell_name);
1508 conflict_found = 0;
1509 found = NULL;
1510 for (ar = first_archetype; ar != NULL; ar = ar->next)
1511 {
1512 if (ar->clone.type != SPELL)
1513 continue;
1514
1515 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1516 continue;
1517
1518 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1519 continue;
1520
1521 if (found != NULL)
1522 {
1523 if (!conflict_found)
1524 {
1525 conflict_found = 1;
1526 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1527 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1528 }
1529 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1530 continue;
1531 }
1532
1533 found = ar;
1534 }
1535
1536 /* No match if more more than one archetype matches. */
1537 if (conflict_found)
1538 return NULL;
1539
1540 /* Return if exactly one archetype matches. */
1541 if (found != NULL)
1542 return arch_to_object (found);
1543 1296
1544 /* No spell found: just print an error message. */ 1297 /* No spell found: just print an error message. */
1545 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
1546 return NULL; 1300 return 0;
1547} 1301}
1548 1302
1549static int 1303static int
1550command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1304command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1551{ 1305{
… …
1603 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);
1604 return 0; 1358 return 0;
1605 } 1359 }
1606 1360
1607 do_forget_spell (op, spell->name); 1361 do_forget_spell (op, spell->name);
1608 return 1;
1609}
1610
1611/**
1612 * Lists all plugins currently loaded with their IDs and full names.
1613 */
1614int
1615command_listplugins (object *op, char *params)
1616{
1617 plugins_display_list (op);
1618 return 1;
1619}
1620
1621/**
1622 * Loads the given plugin. The DM specifies the name of the library to load (no
1623 * pathname is needed). Do not ever attempt to load the same plugin more than
1624 * once at a time, or bad things could happen.
1625 */
1626int
1627command_loadplugin (object *op, char *params)
1628{
1629 char buf[MAX_BUF];
1630
1631 if (params == NULL)
1632 {
1633 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1634 return 1;
1635 }
1636
1637 strcpy (buf, LIBDIR);
1638 strcat (buf, "/plugins/");
1639 strcat (buf, params);
1640 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1641 if (plugins_init_plugin (buf) == 0)
1642 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1643 else
1644 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1645 return 1;
1646}
1647
1648/**
1649 * Unloads the given plugin. The DM specified the ID of the library to unload.
1650 * Note that some things may behave strangely if the correct plugins are not
1651 * loaded.
1652 */
1653int
1654command_unloadplugin (object *op, char *params)
1655{
1656 if (params == NULL)
1657 {
1658 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1659 return 1;
1660 }
1661
1662 if (plugins_remove_plugin (params) == 0)
1663 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1664 else
1665 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1666 return 1; 1362 return 1;
1667} 1363}
1668 1364
1669/** 1365/**
1670 * A players wants to become DM and hide. 1366 * A players wants to become DM and hide.
… …
1678 return 0; 1374 return 0;
1679 1375
1680 do_wizard_hide (op, 1); 1376 do_wizard_hide (op, 1);
1681 1377
1682 return 1; 1378 return 1;
1683}
1684
1685void
1686dm_stack_pop (player *pl)
1687{
1688 if (!pl->stack_items || !pl->stack_position)
1689 {
1690 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1691 return;
1692 }
1693
1694 pl->stack_position--;
1695 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1696}
1697
1698/**
1699 * Get current stack top item for player.
1700 * Returns NULL if no stacked item.
1701 * If stacked item disappeared (freed), remove it.
1702 *
1703 * Ryo, august 2004
1704 */
1705object *
1706dm_stack_peek (player *pl)
1707{
1708 object *ob;
1709
1710 if (!pl->stack_position)
1711 {
1712 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1713 return NULL;
1714 }
1715
1716 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1717 if (!ob)
1718 {
1719 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1720 dm_stack_pop (pl);
1721 return NULL;
1722 }
1723
1724 return ob;
1725}
1726
1727/**
1728 * Push specified item on player stack.
1729 * Inform player of position.
1730 * Initializes variables if needed.
1731 */
1732void
1733dm_stack_push (player *pl, tag_t item)
1734{
1735 if (!pl->stack_items)
1736 {
1737 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1738 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1739 }
1740
1741 if (pl->stack_position == STACK_SIZE)
1742 {
1743 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1744 return;
1745 }
1746
1747 pl->stack_items[pl->stack_position] = item;
1748 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1749 pl->stack_position++;
1750}
1751
1752/**
1753 * Checks 'params' for object code.
1754 *
1755 * Can be:
1756 * * empty => get current object stack top for player
1757 * * number => get item with that tag, stack it for future use
1758 * * $number => get specified stack item
1759 * * "me" => player himself
1760 *
1761 * At function exit, params points to first non-object char
1762 *
1763 * 'from', if not NULL, contains at exit:
1764 * * STACK_FROM_NONE => object not found
1765 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1766 * * STACK_FROM_STACK => item from somewhere in the stack
1767 * * STACK_FROM_NUMBER => item by number, pushed on stack
1768 *
1769 * Ryo, august 2004
1770 */
1771object *
1772get_dm_object (player *pl, char **params, int *from)
1773{
1774 int item_tag, item_position;
1775 object *ob;
1776
1777 if (!pl)
1778 return NULL;
1779
1780 if (!params || !*params || **params == '\0')
1781 {
1782 if (from)
1783 *from = STACK_FROM_TOP;
1784 /* No parameter => get stack item */
1785 return dm_stack_peek (pl);
1786 }
1787
1788 /* Let's clean white spaces */
1789 while (**params == ' ')
1790 (*params)++;
1791
1792 /* Next case: number => item tag */
1793 if (sscanf (*params, "%d", &item_tag))
1794 {
1795 /* Move parameter to next item */
1796 while (isdigit (**params))
1797 (*params)++;
1798
1799 /* And skip blanks, too */
1800 while (**params == ' ')
1801 (*params)++;
1802
1803 /* Get item */
1804 ob = find_object (item_tag);
1805 if (!ob)
1806 {
1807 if (from)
1808 *from = STACK_FROM_NONE;
1809 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1810 return NULL;
1811 }
1812
1813 /* Got one, let's push it on stack */
1814 dm_stack_push (pl, item_tag);
1815 if (from)
1816 *from = STACK_FROM_NUMBER;
1817 return ob;
1818 }
1819
1820 /* Next case: $number => stack item */
1821 if (sscanf (*params, "$%d", &item_position))
1822 {
1823 /* Move parameter to next item */
1824 (*params)++;
1825
1826 while (isdigit (**params))
1827 (*params)++;
1828 while (**params == ' ')
1829 (*params)++;
1830
1831 if (item_position >= pl->stack_position)
1832 {
1833 if (from)
1834 *from = STACK_FROM_NONE;
1835 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1836 return NULL;
1837 }
1838
1839 ob = find_object (pl->stack_items[item_position]);
1840 if (!ob)
1841 {
1842 if (from)
1843 *from = STACK_FROM_NONE;
1844 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1845 return NULL;
1846 }
1847
1848 if (from)
1849 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1850 return ob;
1851 }
1852
1853 /* Next case: 'me' => return pl->ob */
1854 if (!strncmp (*params, "me", 2))
1855 {
1856 if (from)
1857 *from = STACK_FROM_NUMBER;
1858 dm_stack_push (pl, pl->ob->count);
1859
1860 /* Skip to next token */
1861 (*params) += 2;
1862 while (**params == ' ')
1863 (*params)++;
1864
1865 return pl->ob;
1866 }
1867
1868 /* Last case: get stack top */
1869 if (from)
1870 *from = STACK_FROM_TOP;
1871 return dm_stack_peek (pl);
1872} 1379}
1873 1380
1874/** 1381/**
1875 * Pop the stack top. 1382 * Pop the stack top.
1876 */ 1383 */
… …
1936} 1443}
1937 1444
1938int 1445int
1939command_insert_into (object *op, char *params) 1446command_insert_into (object *op, char *params)
1940{ 1447{
1941 object *left, *right, *inserted; 1448 object *left, *right;
1942 int left_from, right_from; 1449 int left_from, right_from;
1943 1450
1944 left = get_dm_object (op->contr, &params, &left_from); 1451 left = get_dm_object (op->contr, &params, &left_from);
1945 if (!left) 1452 if (!left)
1946 { 1453 {
… …
1989 { 1496 {
1990 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!");
1991 return 0; 1498 return 0;
1992 } 1499 }
1993 1500
1994 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1501 if (!right->flag [FLAG_REMOVED])
1995 right->remove (); 1502 right->remove ();
1503
1996 inserted = insert_ob_in_ob (right, left); 1504 object *inserted = insert_ob_in_ob (right, left);
1997 if (left->type == PLAYER)
1998 if (inserted == right)
1999 esrv_send_item (left, right);
2000 else
2001 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2002 1505
2003 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));
2004 1507
2005 return 0; 1508 return 0;
2006 1509

Diff Legend

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