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.95 by root, Sat Nov 17 23:40:03 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
6 8 *
7 This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 12 * option) any later version.
11 13 *
12 This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 17 * GNU General Public License for more details.
16 18 *
17 You should have received a copy of the GNU General Public License 19 * 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 20 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
20 22 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 24 */
23 25
24#include <global.h> 26#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 27#include <sproto.h>
27#endif
28#include <spells.h> 28#include <spells.h>
29#include <treasure.h> 29#include <treasure.h>
30#include <skills.h> 30#include <skills.h>
31 31
32/** Defines for DM item stack **/ 32/** Defines for DM item stack **/
… …
35/* Values for 'from' field of get_dm_object */ 35/* Values for 'from' field of get_dm_object */
36#define STACK_FROM_NONE 0 /* Item was not found */ 36#define STACK_FROM_NONE 0 /* Item was not found */
37#define STACK_FROM_TOP 1 /* Item is stack top */ 37#define STACK_FROM_TOP 1 /* Item is stack top */
38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
39#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 39#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
40
41 40
42/** 41/**
43 * Enough of the DM functions seem to need this that I broke 42 * Enough of the DM functions seem to need this that I broke
44 * it out to a seperate function. name is the person 43 * it out to a seperate function. name is the person
45 * being saught, rq is who is looking for them. This 44 * being saught, rq is who is looking for them. This
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
57 if (pl->ob == op)
58 {
59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
60 return NULL;
61 }
62
63 if (pl->ns->state != ST_PLAYING)
64 {
65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
66 return NULL;
67 }
68
69 return pl;
70 }
71
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
73 return 0;
74}
75
76static void
77dm_stack_pop (player *pl)
78{
79 if (!pl->stack_items || !pl->stack_position)
80 {
81 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
82 return;
83 }
84
85 pl->stack_position--;
86 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
87}
88
89/**
90 * Get current stack top item for player.
91 * Returns NULL if no stacked item.
92 * If stacked item disappeared (freed), remove it.
93 *
94 * Ryo, august 2004
95 */
96static object *
97dm_stack_peek (player *pl)
98{
99 object *ob;
100
101 if (!pl->stack_position)
102 {
103 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
64 return NULL; 104 return NULL;
65 } 105 }
66 106
67 if (pl->ob == op) 107 ob = find_object (pl->stack_items[pl->stack_position - 1]);
108 if (!ob)
68 { 109 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 110 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
111 dm_stack_pop (pl);
70 return NULL; 112 return NULL;
71 } 113 }
72 114
73 if (pl->ns->state != ST_PLAYING)
74 {
75 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
76 return NULL;
77 }
78
79 return pl; 115 return ob;
80} 116}
81 117
82/** 118/**
83 * Actually hides specified player (obviously a DM). 119 * Push specified item on player stack.
84 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 120 * Inform player of position.
85 * else they just think someone left/entered. 121 * Initializes variables if needed.
86 */ 122 */
87void 123void
88do_wizard_hide (object *op, int silent_dm) 124dm_stack_push (player *pl, tag_t item)
89{ 125{
90 if (op->contr->hidden) 126 if (!pl->stack_items)
127 {
128 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
129 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
91 { 130 }
92 op->contr->hidden = 0; 131
93 op->invisible = 1; 132 if (pl->stack_position == STACK_SIZE)
94 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 133 {
95 op->map->players++; 134 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
96 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 135 return;
97 if (!silent_dm) 136 }
98 { 137
99 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 138 pl->stack_items[pl->stack_position] = item;
139 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
140 pl->stack_position++;
141}
142
143/**
144 * Checks 'params' for object code.
145 *
146 * Can be:
147 * * empty => get current object stack top for player
148 * * number => get item with that tag, stack it for future use
149 * * $number => get specified stack item
150 * * "me" => player himself
151 *
152 * At function exit, params points to first non-object char
153 *
154 * 'from', if not NULL, contains at exit:
155 * * STACK_FROM_NONE => object not found
156 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
157 * * STACK_FROM_STACK => item from somewhere in the stack
158 * * STACK_FROM_NUMBER => item by number, pushed on stack
159 *
160 * Ryo, august 2004
161 */
162static object *
163get_dm_object (player *pl, char **params, int *from)
164{
165 int item_tag, item_position;
166 object *ob;
167
168 if (!pl)
169 return NULL;
170
171 if (!params || !*params || **params == '\0')
172 {
173 if (from)
174 *from = STACK_FROM_TOP;
175 /* No parameter => get stack item */
176 return dm_stack_peek (pl);
177 }
178
179 /* Let's clean white spaces */
180 while (**params == ' ')
181 (*params)++;
182
183 /* Next case: number => item tag */
184 if (sscanf (*params, "%d", &item_tag))
185 {
186 /* Move parameter to next item */
187 while (isdigit (**params))
188 (*params)++;
189
190 /* And skip blanks, too */
191 while (**params == ' ')
192 (*params)++;
193
194 /* Get item */
195 ob = find_object (item_tag);
196 if (!ob)
100 } 197 {
101 } 198 if (from)
102 else 199 *from = STACK_FROM_NONE;
103 { 200 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
104 op->contr->hidden = 1; 201 return NULL;
105 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
106 op->map->players--;
107 if (!silent_dm)
108 { 202 }
109 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 203
204 /* Got one, let's push it on stack */
205 dm_stack_push (pl, item_tag);
206 if (from)
207 *from = STACK_FROM_NUMBER;
208 return ob;
209 }
210
211 /* Next case: $number => stack item */
212 if (sscanf (*params, "$%d", &item_position))
213 {
214 /* Move parameter to next item */
215 (*params)++;
216
217 while (isdigit (**params))
218 (*params)++;
219 while (**params == ' ')
220 (*params)++;
221
222 if (item_position >= pl->stack_position)
110 } 223 {
111 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 224 if (from)
112 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 225 *from = STACK_FROM_NONE;
226 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
227 return NULL;
228 }
229
230 ob = find_object (pl->stack_items[item_position]);
231 if (!ob)
232 {
233 if (from)
234 *from = STACK_FROM_NONE;
235 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
236 return NULL;
237 }
238
239 if (from)
240 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
241 return ob;
242 }
243
244 /* Next case: 'me' => return pl->ob */
245 if (!strncmp (*params, "me", 2))
113 } 246 {
114} 247 if (from)
248 *from = STACK_FROM_NUMBER;
249 dm_stack_push (pl, pl->ob->count);
115 250
116int 251 /* Skip to next token */
117command_hide (object *op, char *params) 252 (*params) += 2;
118{ 253 while (**params == ' ')
119 do_wizard_hide (op, 0); 254 (*params)++;
120 return 1; 255
256 return pl->ob;
257 }
258
259 /* Last case: get stack top */
260 if (from)
261 *from = STACK_FROM_TOP;
262 return dm_stack_peek (pl);
121} 263}
122 264
123/** 265/**
124 * This finds and returns the object which matches the name or 266 * This finds and returns the object which matches the name or
125 * object nubmer (specified via num #whatever). 267 * object nubmer (specified via num #whatever).
… …
175 { 317 {
176 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 318 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
177 return 1; 319 return 1;
178 } 320 }
179 321
180 become_follower (ob, god); 322 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; 323 return 1;
287} 324}
288 325
289int 326int
290command_freeze (object *op, char *params) 327command_freeze (object *op, char *params)
… …
328 object *dummy; 365 object *dummy;
329 player *pl; 366 player *pl;
330 367
331 if (!op) 368 if (!op)
332 return 0; 369 return 0;
370
333 if (params == NULL) 371 if (params == NULL)
334 { 372 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 373 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 374 return 1;
337 } 375 }
376
338 pl = get_other_player_from_name (op, params); 377 pl = get_other_player_from_name (op, params);
339 if (!pl) 378 if (!pl)
340 return 1; 379 return 1;
380
341 dummy = get_jail_exit (pl->ob); 381 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 382 if (!dummy)
343 { 383 {
344 /* we have nowhere to send the prisoner.... */ 384 /* 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"); 385 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 386 return 0;
347 } 387 }
348 enter_exit (pl->ob, dummy); 388
389 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
349 dummy->destroy (); 390 dummy->destroy ();
391
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 394 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 395 return 1;
354} 396}
355 397
356int 398int
357command_summon (object *op, char *params) 399command_summon (object *op, char *params)
358{ 400{
359 int i; 401 int i;
360 object *dummy;
361 player *pl; 402 player *pl;
362 403
363 if (!op) 404 if (!op)
364 return 0; 405 return 0;
365 406
… …
371 412
372 pl = get_other_player_from_name (op, params); 413 pl = get_other_player_from_name (op, params);
373 if (!pl) 414 if (!pl)
374 return 1; 415 return 1;
375 416
376 i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 417 maptile *m = op->map;
418 sint16 nx = op->x;
419 sint16 ny = op->y;
420
421 i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
377 if (i == -1) 422 if (i == -1)
378 { 423 {
379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 424 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
380 return 1; 425 return 1;
381 } 426 }
382 427
383 dummy = object::create (); 428 nx += DIRX (i);
384 EXIT_PATH (dummy) = op->map->path; 429 ny += DIRY (i);
385 EXIT_X (dummy) = op->x + freearr_x[i]; 430
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 431 if (!xy_normalise (m, nx, ny))
387 enter_exit (pl->ob, dummy); 432 {
388 dummy->destroy (); 433 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
434 return 1;
435 }
436
437 pl->ob->player_goto (m->path, nx, ny);
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 438 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 439 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 440
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; 441 return 1;
437} 442}
438 443
439/** 444/**
440 * This function is a real mess, because we're stucking getting 445 * This function is a real mess, because we're stucking getting
… …
454int 459int
455command_create (object *op, char *params) 460command_create (object *op, char *params)
456{ 461{
457 object *tmp = NULL; 462 object *tmp = NULL;
458 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace; 463 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
459 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 464 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
460 archetype *at, *at_spell = NULL; 465 archetype *at, *at_spell = NULL;
461 artifact *art = NULL; 466 artifact *art = NULL;
462 467
463 if (!op) 468 if (!op)
464 return 0; 469 return 0;
… …
530 * we also set up spell_name which is only 535 * we also set up spell_name which is only
531 * the first word. 536 * the first word.
532 */ 537 */
533 538
534 at_spell = archetype::find (cp); 539 at_spell = archetype::find (cp);
535 if (!at_spell || at_spell->clone.type != SPELL) 540 if (!at_spell || at_spell->type != SPELL)
536 at_spell = find_archetype_by_object_name (cp); 541 at_spell = find_archetype_by_object_name (cp);
537 if (!at_spell || at_spell->clone.type != SPELL) 542 if (!at_spell || at_spell->type != SPELL)
538 { 543 {
539 strcpy (spell_name, cp); 544 assign (spell_name, cp);
540 fsp = strchr (spell_name, ' '); 545 fsp = strchr (spell_name, ' ');
541 if (fsp) 546 if (fsp)
542 { 547 {
543 *fsp = 0; 548 *fsp = 0;
544 fsp++; 549 fsp++;
545 at_spell = archetype::find (spell_name); 550 at_spell = archetype::find (spell_name);
546 551
547 /* Got a spell, update the first string pointer */ 552 /* Got a spell, update the first string pointer */
548 if (at_spell && at_spell->clone.type == SPELL) 553 if (at_spell && at_spell->type == SPELL)
549 bp2 = cp + strlen (spell_name) + 1; 554 bp2 = cp + strlen (spell_name) + 1;
550 else 555 else
551 at_spell = NULL; 556 at_spell = NULL;
552 } 557 }
553 } 558 }
… …
555 /* OK - we didn't find a spell - presume the 'of' 560 /* OK - we didn't find a spell - presume the 'of'
556 * in this case means its an artifact. 561 * in this case means its an artifact.
557 */ 562 */
558 if (!at_spell) 563 if (!at_spell)
559 { 564 {
560 if (find_artifactlist (at->clone.type) == NULL) 565 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); 566 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
562 else 567 else
563 { 568 {
564 art = find_artifactlist (at->clone.type)->items; 569 art = find_artifactlist (at->type)->items;
565 570
566 do 571 while (art)
567 { 572 {
568 if (!strcmp (art->item->name, cp)) 573 if (!strcmp (&art->item->name, cp))
569 break; 574 break;
575
570 art = art->next; 576 art = art->next;
571 } 577 }
572 while (art != NULL);
573 578
574 if (!art) 579 if (!art)
575 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 580 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
576 } 581 }
577 582
578 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 583 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
579 } 584 }
580 } /* if cp */ 585 } /* if cp */
581 586
582 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 587 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
583 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 588 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
584 { 589 {
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); 590 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; 591 return 1;
587 } 592 }
588 593
589 /* 594 /*
590 * Rather than have two different blocks with a lot of similar code, 595 * Rather than have two different blocks with a lot of similar code,
591 * just create one object, do all the processing, and then determine 596 * 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. 597 * if that one object should be inserted or if we need to make copies.
593 */ 598 */
594 tmp = arch_to_object (at); 599 tmp = at->instance ();
595
596 if (settings.real_wiz == FALSE)
597 SET_FLAG (tmp, FLAG_WAS_WIZ);
598 600
599 if (set_magic) 601 if (set_magic)
600 set_abs_magic (tmp, magic); 602 set_abs_magic (tmp, magic);
601 603
602 if (art) 604 if (art)
603 give_artifact_abilities (tmp, art->item); 605 give_artifact_abilities (tmp, art->item);
604 606
605 if (need_identify (tmp)) 607 if (tmp->need_identify ())
606 { 608 {
607 SET_FLAG (tmp, FLAG_IDENTIFIED); 609 tmp->set_flag (FLAG_IDENTIFIED);
608 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 610 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
609 } 611 }
610 612
611 /* 613 /*
612 * This entire block here tries to find variable pairings, 614 * This entire block here tries to find variable pairings,
613 * eg, 'hp 4' or the like. The mess here is that values 615 * eg, 'hp 4' or the like. The mess here is that values
… …
615 * is we want to find two spaces, but if we got a quote, 617 * is we want to find two spaces, but if we got a quote,
616 * any spaces there don't count. 618 * any spaces there don't count.
617 */ 619 */
618 while (*bp2 && bp2 <= endline) 620 while (*bp2 && bp2 <= endline)
619 { 621 {
620 bp4 = NULL;
621 gotspace = 0; 622 gotspace = 0;
622 gotquote = 0; 623 gotquote = 0;
623 624
624 /* find the first quote */ 625 /* find the first quote */
625 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 626 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
682 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 683 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
683 684
684 bp2 = bp3 + 1; 685 bp2 = bp3 + 1;
685 } 686 }
686 687
687 if (at->clone.nrof) 688 if (at->nrof)
688 { 689 {
689 if (at_spell) 690 if (at_spell)
690 insert_ob_in_ob (arch_to_object (at_spell), tmp); 691 tmp->insert (at_spell->instance ());
691 692
692 tmp->x = op->x; 693 tmp->x = op->x;
693 tmp->y = op->y; 694 tmp->y = op->y;
695 tmp->map = op->map;
694 696
695 if (set_nrof) 697 if (set_nrof)
696 tmp->nrof = nrof; 698 tmp->nrof = nrof;
697 699
698 tmp->map = op->map; 700 op->insert (tmp);
699
700 tmp = insert_ob_in_ob (tmp, op);
701 esrv_send_item (op, tmp);
702 701
703 /* Let's put this created item on stack so dm can access it easily. */ 702 /* Let's put this created item on stack so dm can access it easily. */
704 dm_stack_push (op->contr, tmp->count); 703 dm_stack_push (op->contr, tmp->count);
705 704
706 return 1; 705 return 1;
707 } 706 }
708 else 707 else
709 { 708 {
710 for (i = 0; i < (set_nrof ? nrof : 1); i++) 709 for (i = 0; i < (set_nrof ? nrof : 1); i++)
711 { 710 {
712 archetype *atmp;
713 object *prev = 0, *head = 0; 711 object *prev = 0, *head = 0;
714 712
715 for (atmp = at; atmp; atmp = atmp->more) 713 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
716 { 714 {
717 object *dup = arch_to_object (atmp); 715 object *dup = atmp->instance ();
718 716
719 if (at_spell) 717 if (at_spell)
720 insert_ob_in_ob (arch_to_object (at_spell), dup); 718 insert_ob_in_ob (at_spell->instance (), dup);
721 719
722 /* 720 /*
723 * The head is what contains all the important bits, 721 * The head is what contains all the important bits,
724 * so just copying it over should be fine. 722 * so just copying it over should be fine.
725 */ 723 */
… …
727 { 725 {
728 head = dup; 726 head = dup;
729 tmp->copy_to (dup); 727 tmp->copy_to (dup);
730 } 728 }
731 729
732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ);
734
735 dup->x = op->x + dup->arch->clone.x; 730 dup->x = op->x + dup->arch->x;
736 dup->y = op->y + dup->arch->clone.y; 731 dup->y = op->y + dup->arch->y;
737 dup->map = op->map; 732 dup->map = op->map;
738 733
739 if (head != dup) 734 if (head != dup)
740 { 735 {
741 dup->head = head; 736 dup->head = head;
… …
743 } 738 }
744 739
745 prev = dup; 740 prev = dup;
746 } 741 }
747 742
748 if (QUERY_FLAG (head, FLAG_ALIVE)) 743 if (head->flag [FLAG_ALIVE])
749 { 744 {
750 object *check = head; 745 object *check = head;
751 int size_x = 0; 746 int size_x = 0;
752 int size_y = 0; 747 int size_y = 0;
753 748
754 while (check) 749 while (check)
755 { 750 {
756 size_x = MAX (size_x, check->arch->clone.x); 751 size_x = max (size_x, check->arch->x);
757 size_y = MAX (size_y, check->arch->clone.y); 752 size_y = max (size_y, check->arch->y);
758 check = check->more; 753 check = check->more;
759 } 754 }
760 755
761 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 756 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
762 { 757 {
… …
788 /* Wonder if we really want to push all of these, but since 783 /* Wonder if we really want to push all of these, but since
789 * things like rods have nrof 0, we want to cover those. 784 * things like rods have nrof 0, we want to cover those.
790 */ 785 */
791 dm_stack_push (op->contr, head->count); 786 dm_stack_push (op->contr, head->count);
792 787
793 if (at->clone.randomitems != NULL && !at_spell) 788 if (at->randomitems && !at_spell)
794 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 789 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
795
796 esrv_send_item (op, head);
797 } 790 }
798 791
799 /* free the one we used to copy */ 792 /* free the one we used to copy */
800 tmp->destroy (); 793 tmp->destroy ();
801 } 794 }
… …
808 */ 801 */
809 802
810int 803int
811command_inventory (object *op, char *params) 804command_inventory (object *op, char *params)
812{ 805{
806 int i;
813 object *tmp; 807 object *tmp;
814 int i;
815 808
816 if (!params) 809 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
817 { 810 {
818 inventory (op, NULL); 811 op->contr->failmsg ("Inventory of what object (nr)?");
819 return 0; 812 return 1;
820 }
821
822 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
823 { 813 }
824 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
825 return 1;
826 }
827 814
828 inventory (op, tmp); 815 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
816
829 return 1; 817 return 1;
830} 818}
831 819
832/* just show player's their skills for now. Dm's can 820/* just show player's their skills for now. Dm's can
833 * already see skills w/ inventory command - b.t. 821 * already see skills w/ inventory command - b.t.
… …
851 839
852 char *dump = dump_object (tmp); 840 char *dump = dump_object (tmp);
853 new_draw_info (NDI_UNIQUE, 0, op, dump); 841 new_draw_info (NDI_UNIQUE, 0, op, dump);
854 free (dump); 842 free (dump);
855 843
856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 844 if (tmp->flag [FLAG_OBJ_ORIGINAL])
857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 845 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858 846
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; 847 return 1;
963} 848}
964 849
965int 850int
966command_patch (object *op, char *params) 851command_patch (object *op, char *params)
… …
981 return 1; 866 return 1;
982 } 867 }
983 868
984 if ((arg2 = strchr (arg, ' '))) 869 if ((arg2 = strchr (arg, ' ')))
985 arg2++; 870 arg2++;
986 if (settings.real_wiz == FALSE) 871
987 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
988 if (set_variable (tmp, arg) == -1) 872 if (set_variable (tmp, arg) == -1)
989 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 873 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
990 else 874 else
991 {
992 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 875 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
993 }
994 876
995 return 1; 877 return 1;
996} 878}
997 879
998int 880int
… …
1012 { 894 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 895 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
1014 return 1; 896 return 1;
1015 } 897 }
1016 898
1017 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 899 if (tmp->flag [FLAG_REMOVED])
1018 { 900 {
1019 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 901 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
1020 return 1; 902 return 1;
1021 } 903 }
1022 904
… …
1047 929
1048 if (from != STACK_FROM_STACK) 930 if (from != STACK_FROM_STACK)
1049 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 931 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1050 dm_stack_pop (op->contr); 932 dm_stack_pop (op->contr);
1051 933
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) 934 if (tmp->head)
1059 tmp = tmp->head; 935 tmp = tmp->head;
1060 936
1061 tmp->destroy (); 937 tmp->destroy ();
1062 return 1; 938 return 1;
… …
1067 */ 943 */
1068int 944int
1069command_addexp (object *op, char *params) 945command_addexp (object *op, char *params)
1070{ 946{
1071 char buf[MAX_BUF], skill[MAX_BUF]; 947 char buf[MAX_BUF], skill[MAX_BUF];
1072 int i, q; 948 int q;
949 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1073 object *skillob = NULL; 950 object *skillob = NULL;
1074 player *pl;
1075 951
1076 skill[0] = '\0'; 952 skill[0] = '\0';
1077 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 953 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
1078 { 954 {
1079 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 955 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1080 return 1; 956 return 1;
1081 } 957 }
1082 958
1083 for (pl = first_player; pl != NULL; pl = pl->next) 959 for_all_players (pl)
1084 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 960 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1085 break;
1086
1087 if (pl == NULL)
1088 { 961 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1090 return 1;
1091 }
1092
1093 if (q >= 3) 962 if (q >= 3)
1094 { 963 {
1095 skillob = find_skill_by_name (pl->ob, skill); 964 skillob = find_skill_by_name (pl->ob, skill);
1096 if (!skillob) 965 if (!skillob)
1097 { 966 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 967 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
968 return 1;
969 }
970
971 i = check_exp_adjust (skillob, i);
972 skillob->stats.exp += i;
973 calc_perm_exp (skillob);
974 player_lvl_adj (pl->ob, skillob);
975 }
976
977 pl->ob->stats.exp += i;
978 calc_perm_exp (pl->ob);
979 player_lvl_adj (pl->ob, NULL);
980
1099 return 1; 981 return 1;
1100 } 982 }
1101 983
1102 i = check_exp_adjust (skillob, i); 984 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; 985 return 1;
1115} 986}
1116 987
1117/**************************************************************************/ 988/**************************************************************************/
1118 989
… …
1123/**************************************************************************/ 994/**************************************************************************/
1124 995
1125int 996int
1126command_stats (object *op, char *params) 997command_stats (object *op, char *params)
1127{ 998{
1128 char thing[20];
1129 player *pl;
1130 char buf[MAX_BUF]; 999 char buf[MAX_BUF];
1131 1000
1132 thing[0] = '\0'; 1001 if (params == NULL || params[0] == '\0')
1133 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1134 { 1002 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1003 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1136 return 1; 1004 return 1;
1137 } 1005 }
1138 1006
1139 for (pl = first_player; pl != NULL; pl = pl->next) 1007 for_all_players (pl)
1140 if (!strcmp (pl->ob->name, thing)) 1008 if (!strcmp (&pl->ob->name, params))
1141 { 1009 {
1142 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1010 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); 1011 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); 1012 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); 1013 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1019 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1020 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 1021 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1022 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1155 new_draw_info (NDI_UNIQUE, 0, op, buf); 1023 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 break; 1024 return 1;
1157 } 1025 }
1158 if (pl == NULL) 1026
1159 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1027 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1160 return 1; 1028 return 1;
1161} 1029}
1162 1030
1163int 1031int
1164command_abil (object *op, char *params) 1032command_abil (object *op, char *params)
1165{ 1033{
1166 char thing[20], thing2[20]; 1034 char thing[20], thing2[20];
1167 int iii; 1035 int iii;
1168 player *pl;
1169 char buf[MAX_BUF]; 1036 char buf[MAX_BUF];
1170 1037
1171 iii = 0; 1038 iii = 0;
1172 thing[0] = '\0'; 1039 thing[0] = '\0';
1173 thing2[0] = '\0'; 1040 thing2[0] = '\0';
… …
1187 { 1054 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1055 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1189 return 1; 1056 return 1;
1190 } 1057 }
1191 1058
1192 for (pl = first_player; pl != NULL; pl = pl->next) 1059 for_all_players (pl)
1193 { 1060 {
1194 if (!strcmp (pl->ob->name, thing)) 1061 if (!strcmp (&pl->ob->name, thing))
1195 { 1062 {
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; 1063 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; 1064 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; 1065 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; 1066 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; 1067 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; 1068 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; 1069 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1070
1212 sprintf (buf, "%s has been altered.", &pl->ob->name); 1071 sprintf (buf, "%s has been altered.", &pl->ob->name);
1213 new_draw_info (NDI_UNIQUE, 0, op, buf); 1072 new_draw_info (NDI_UNIQUE, 0, op, buf);
1214 fix_player (pl->ob); 1073 pl->ob->update_stats ();
1215 return 1; 1074 return 1;
1216 } 1075 }
1217 } 1076 }
1218 1077
1219 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1078 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1220 return 1; 1079 return 1;
1221} 1080}
1222 1081
1223int 1082int
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)
1317{ /* 'noadm' is alias */
1318 CLEAR_FLAG (op, FLAG_WIZ);
1319 CLEAR_FLAG (op, FLAG_WIZPASS);
1320 CLEAR_FLAG (op, FLAG_WIZCAST);
1321
1322 if (settings.real_wiz == TRUE)
1323 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1324 if (op->contr->hidden)
1325 {
1326 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1327 op->map->players++;
1328 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;
1330 op->invisible = 1;
1331 }
1332 else
1333 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1334 return 1;
1335}
1336
1337/**
1338 * object *op is trying to become dm.
1339 * pl_name is name supplied by player. Restrictive DM will make it harder
1340 * for socket users to become DM - in that case, it will check for the players
1341 * character name.
1342 */
1343static int
1344checkdm (object *op, const char *pl_name, const char *pl_passwd, const char *pl_host)
1345{
1346 FILE *dmfile;
1347 char buf[MAX_BUF];
1348 char line_buf[160], name[160], passwd[160], host[160];
1349
1350#ifdef RESTRICTIVE_DM
1351 *pl_name = op->name ? op->name : "*";
1352#endif
1353
1354 sprintf (buf, "%s/%s", settings.confdir, DMFILE);
1355 if ((dmfile = fopen (buf, "r")) == NULL)
1356 {
1357 LOG (llevDebug, "Could not find DM file.\n");
1358 return 0;
1359 }
1360
1361 while (fgets (line_buf, 160, dmfile) != NULL)
1362 {
1363 if (line_buf[0] == '#')
1364 continue;
1365 if (sscanf (line_buf, "%[^:]:%[^:]:%s\n", name, passwd, host) != 3)
1366 {
1367 LOG (llevError, "Warning - malformed dm file entry: %s\n", line_buf);
1368 }
1369 else if ((!strcmp (name, "*") || (pl_name && !strcmp (pl_name, name)))
1370 && (!strcmp (passwd, "*") || !strcmp (passwd, pl_passwd)) && (!strcmp (host, "*") || !strcmp (host, pl_host)))
1371 {
1372 fclose (dmfile);
1373 return (1);
1374 }
1375 }
1376 fclose (dmfile);
1377 return (0);
1378}
1379
1380int
1381do_wizard_dm (object *op, char *params, int silent)
1382{
1383 if (!op->contr)
1384 return 0;
1385
1386 if (QUERY_FLAG (op, FLAG_WIZ))
1387 {
1388 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1389 return 0;
1390 }
1391
1392 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1393 {
1394 SET_FLAG (op, FLAG_WIZ);
1395 SET_FLAG (op, FLAG_WAS_WIZ);
1396 SET_FLAG (op, FLAG_WIZPASS);
1397 SET_FLAG (op, FLAG_WIZCAST);
1398 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';
1407
1408 if (!silent)
1409 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1410
1411 return 1;
1412 }
1413 else
1414 {
1415 new_draw_info (NDI_UNIQUE, 0, op, "Sorry Pal, I don't think so.");
1416 op->contr->write_buf[0] = '\0';
1417 return 0;
1418 }
1419}
1420
1421/*
1422 * Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2
1423 * - allow people on sockets to become dm, and allow better dm file
1424 */
1425int
1426command_dm (object *op, char *params)
1427{
1428 if (!op->contr)
1429 return 0;
1430
1431 do_wizard_dm (op, params, 0);
1432
1433 return 1;
1434}
1435
1436int
1437command_invisible (object *op, char *params) 1083command_invisible (object *op, char *params)
1438{ 1084{
1439 if (op) 1085 if (op)
1440 { 1086 {
1441 op->invisible += 100; 1087 op->invisible += TIME2TICK (60);
1442 update_object (op, UP_OBJ_FACE); 1088 update_object (op, UP_OBJ_CHANGE);
1443 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1089 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1444 } 1090 }
1445 1091
1446 return 0; 1092 return 0;
1447} 1093}
… …
1450 * Returns spell object (from archetypes) by name. 1096 * Returns spell object (from archetypes) by name.
1451 * Returns NULL if 0 or more than one spell matches. 1097 * Returns NULL if 0 or more than one spell matches.
1452 * Used for wizard's learn spell/prayer. 1098 * Used for wizard's learn spell/prayer.
1453 * 1099 *
1454 * op is the player issuing the command. 1100 * 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 */ 1101 */
1461static object * 1102static object *
1462get_spell_by_name (object *op, const char *spell_name) 1103get_spell_by_name (object *op, shstr_cmp spell_name)
1463{ 1104{
1464 archetype *ar;
1465 archetype *found;
1466 int conflict_found;
1467 size_t spell_name_length;
1468
1469 /* First check for full name matches. */ 1105 /* First check for full name matches. */
1470 conflict_found = 0; 1106 int conflict_found = 0;
1471 found = NULL; 1107 archetype *found = 0;
1472 for (ar = first_archetype; ar != NULL; ar = ar->next) 1108
1109 for_all_archetypes (at)
1473 { 1110 {
1474 if (ar->clone.type != SPELL) 1111 if (at->type != SPELL)
1475 continue; 1112 continue;
1476 1113
1477 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1114 if (at->object::name != spell_name)
1478 continue; 1115 continue;
1479 1116
1480 if (strcmp (ar->clone.name, spell_name) != 0)
1481 continue;
1482
1483 if (found != NULL) 1117 if (found)
1484 { 1118 {
1485 if (!conflict_found) 1119 if (!conflict_found)
1486 { 1120 {
1487 conflict_found = 1; 1121 conflict_found = 1;
1488 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1122 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); 1123 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1490 } 1124 }
1125
1491 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1126 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1492 continue; 1127 return 0;
1493 } 1128 }
1494 1129
1495 found = ar; 1130 found = at;
1496 } 1131 }
1497
1498 /* No match if more more than one archetype matches. */
1499 if (conflict_found)
1500 return NULL;
1501 1132
1502 /* Return if exactly one archetype matches. */ 1133 /* Return if exactly one archetype matches. */
1503 if (found != NULL) 1134 if (found)
1504 return arch_to_object (found); 1135 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 1136
1544 /* No spell found: just print an error message. */ 1137 /* 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); 1138 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1139
1546 return NULL; 1140 return 0;
1547} 1141}
1548 1142
1549static int 1143static int
1550command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1144command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1551{ 1145{
… …
1595 { 1189 {
1596 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?"); 1190 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
1597 return 0; 1191 return 0;
1598 } 1192 }
1599 1193
1600 spell = lookup_spell_by_name (op, params); 1194 spell = op->find_spell (params);
1601 if (spell == NULL) 1195 if (spell == NULL)
1602 { 1196 {
1603 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1197 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1604 return 0; 1198 return 0;
1605 } 1199 }
1606 1200
1607 do_forget_spell (op, spell->name); 1201 do_forget_spell (op, spell->name);
1608 return 1; 1202 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;
1667}
1668
1669/**
1670 * A players wants to become DM and hide.
1671 * Let's see if that's authorized.
1672 * Make sure to not tell anything to anyone.
1673 */
1674int
1675command_dmhide (object *op, char *params)
1676{
1677 if (!do_wizard_dm (op, params, 1))
1678 return 0;
1679
1680 do_wizard_hide (op, 1);
1681
1682 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} 1203}
1873 1204
1874/** 1205/**
1875 * Pop the stack top. 1206 * Pop the stack top.
1876 */ 1207 */
… …
1936} 1267}
1937 1268
1938int 1269int
1939command_insert_into (object *op, char *params) 1270command_insert_into (object *op, char *params)
1940{ 1271{
1941 object *left, *right, *inserted; 1272 object *left, *right;
1942 int left_from, right_from; 1273 int left_from, right_from;
1943 1274
1944 left = get_dm_object (op->contr, &params, &left_from); 1275 left = get_dm_object (op->contr, &params, &left_from);
1945 if (!left) 1276 if (!left)
1946 { 1277 {
… …
1989 { 1320 {
1990 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1321 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1991 return 0; 1322 return 0;
1992 } 1323 }
1993 1324
1994 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1325 if (!right->flag [FLAG_REMOVED])
1995 right->remove (); 1326 right->remove ();
1327
1996 inserted = insert_ob_in_ob (right, left); 1328 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 1329
2003 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1330 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2004 1331
2005 return 0; 1332 return 0;
2006 1333

Diff Legend

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