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

Diff Legend

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