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.13 by root, Fri Sep 15 23:31:34 2006 UTC vs.
Revision 1.80 by root, Fri Mar 26 00:59:22 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 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 **/
… …
36#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
37#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
39#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
40 39
41
42/** 40/**
43 * Enough of the DM functions seem to need this that I broke 41 * Enough of the DM functions seem to need this that I broke
44 * it out to a seperate function. name is the person 42 * it out to a seperate function. name is the person
45 * being saught, rq is who is looking for them. This 43 * being saught, rq is who is looking for them. This
46 * prints diagnostics messages, and returns the 44 * prints diagnostics messages, and returns the
47 * other player, or NULL otherwise. 45 * other player, or NULL otherwise.
48 */ 46 */
49static player * 47static player *
50get_other_player_from_name (object *op, char *name) 48get_other_player_from_name (object *op, char *name)
51{ 49{
52 player *pl;
53
54 if (!name) 50 if (!name)
55 return NULL; 51 return NULL;
56 52
57 for (pl = first_player; pl != NULL; pl = pl->next) 53 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 54 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 55 {
56 if (pl->ob == op)
57 {
58 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
59 return NULL;
60 }
61
62 if (pl->ns->state != ST_PLAYING)
63 {
64 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
65 return NULL;
66 }
67
68 return pl;
69 }
70
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 71 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
72 return 0;
73}
74
75static void
76dm_stack_pop (player *pl)
77{
78 if (!pl->stack_items || !pl->stack_position)
79 {
80 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
81 return;
82 }
83
84 pl->stack_position--;
85 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
86}
87
88/**
89 * Get current stack top item for player.
90 * Returns NULL if no stacked item.
91 * If stacked item disappeared (freed), remove it.
92 *
93 * Ryo, august 2004
94 */
95static object *
96dm_stack_peek (player *pl)
97{
98 object *ob;
99
100 if (!pl->stack_position)
101 {
102 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
64 return NULL; 103 return NULL;
65 } 104 }
66 105
67 if (pl->ob == op) 106 ob = find_object (pl->stack_items[pl->stack_position - 1]);
107 if (!ob)
68 { 108 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 109 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
110 dm_stack_pop (pl);
70 return NULL; 111 return NULL;
71 } 112 }
72 if (pl->state != ST_PLAYING) 113
114 return ob;
115}
116
117/**
118 * Push specified item on player stack.
119 * Inform player of position.
120 * Initializes variables if needed.
121 */
122void
123dm_stack_push (player *pl, tag_t item)
124{
125 if (!pl->stack_items)
126 {
127 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
128 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
73 { 129 }
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 130
131 if (pl->stack_position == STACK_SIZE)
132 {
133 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
134 return;
135 }
136
137 pl->stack_items[pl->stack_position] = item;
138 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
139 pl->stack_position++;
140}
141
142/**
143 * Checks 'params' for object code.
144 *
145 * Can be:
146 * * empty => get current object stack top for player
147 * * number => get item with that tag, stack it for future use
148 * * $number => get specified stack item
149 * * "me" => player himself
150 *
151 * At function exit, params points to first non-object char
152 *
153 * 'from', if not NULL, contains at exit:
154 * * STACK_FROM_NONE => object not found
155 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
156 * * STACK_FROM_STACK => item from somewhere in the stack
157 * * STACK_FROM_NUMBER => item by number, pushed on stack
158 *
159 * Ryo, august 2004
160 */
161static object *
162get_dm_object (player *pl, char **params, int *from)
163{
164 int item_tag, item_position;
165 object *ob;
166
167 if (!pl)
75 return NULL; 168 return NULL;
169
170 if (!params || !*params || **params == '\0')
76 } 171 {
77 return pl; 172 if (from)
78} 173 *from = STACK_FROM_TOP;
79 174 /* No parameter => get stack item */
80/** 175 return dm_stack_peek (pl);
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 { 176 }
106 for (y = 0; y < settings.worldmaptilesy; y++) 177
107 { 178 /* Let's clean white spaces */
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty); 179 while (**params == ' ')
109 command_goto (op, buf); 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)
110 } 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))
111 } 212 {
213 /* Move parameter to next item */
214 (*params)++;
112 215
113 return 0; 216 while (isdigit (**params))
217 (*params)++;
218 while (**params == ' ')
219 (*params)++;
220
221 if (item_position >= pl->stack_position)
222 {
223 if (from)
224 *from = STACK_FROM_NONE;
225 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
226 return NULL;
227 }
228
229 ob = find_object (pl->stack_items[item_position]);
230 if (!ob)
231 {
232 if (from)
233 *from = STACK_FROM_NONE;
234 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
235 return NULL;
236 }
237
238 if (from)
239 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
240 return ob;
241 }
242
243 /* Next case: 'me' => return pl->ob */
244 if (!strncmp (*params, "me", 2))
245 {
246 if (from)
247 *from = STACK_FROM_NUMBER;
248 dm_stack_push (pl, pl->ob->count);
249
250 /* Skip to next token */
251 (*params) += 2;
252 while (**params == ' ')
253 (*params)++;
254
255 return pl->ob;
256 }
257
258 /* Last case: get stack top */
259 if (from)
260 *from = STACK_FROM_TOP;
261 return dm_stack_peek (pl);
114} 262}
115 263
116/** 264/**
117 * Actually hides specified player (obviously a DM). 265 * Actually hides specified player (obviously a DM).
118 * 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,
119 * else they just think someone left/entered. 267 * else they just think someone left/entered.
120 */ 268 */
121void 269static void
122do_wizard_hide (object *op, int silent_dm) 270do_wizard_hide (object *op, int silent_dm)
123{ 271{
124 if (op->contr->hidden) 272 if (op->contr->hidden)
125 { 273 {
126 op->contr->hidden = 0; 274 op->contr->hidden = 0;
127 op->invisible = 1; 275 op->invisible = 1;
128 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");
129 op->map->players++; 277 op->map->players++;
130 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
131 if (!silent_dm) 280 if (!silent_dm)
132 {
133 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!");
134 }
135 } 282 }
136 else 283 else
137 { 284 {
138 op->contr->hidden = 1; 285 op->contr->hidden = 1;
139 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.");
140 op->map->players--; 287 op->map->players--;
288
141 if (!silent_dm) 289 if (!silent_dm)
142 {
143 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..");
144 } 291
145 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);
146 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);
147 } 294 }
148} 295}
149 296
… …
213 360
214 become_follower (ob, god); 361 become_follower (ob, god);
215 return 1; 362 return 1;
216} 363}
217 364
218/**
219 * Add player's IP to ban_file and kick them off the server
220 * I know most people have dynamic IPs but this is more of a short term
221 * solution if they have to get a new IP to play maybe they'll calm down.
222 * This uses the banish_file in the local directory *not* the ban_file
223 * The action is logged with a ! for easy searching. -tm
224 */
225int
226command_banish (object *op, char *params)
227{
228 player *pl;
229 FILE *banishfile;
230 char buf[MAX_BUF];
231 time_t now;
232
233 if (!params)
234 {
235 new_draw_info (NDI_UNIQUE, 0, op, "Usage: banish <player>.");
236 return 1;
237 }
238
239 pl = get_other_player_from_name (op, params);
240 if (!pl)
241 return 1;
242
243 sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);
244
245 if ((banishfile = fopen (buf, "a")) == NULL)
246 {
247 LOG (llevDebug, "Could not find file banish_file.\n");
248 new_draw_info (NDI_UNIQUE, 0, op, "Could not find banish_file.");
249 return 0;
250 }
251
252 now = time (NULL);
253 /*
254 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code.
256 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host);
259 fclose (banishfile);
260
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name);
265 return 1;
266}
267
268int
269command_kick (object *op, char *params)
270{
271 struct pl *pl;
272
273 for (pl = first_player; pl != NULL; pl = pl->next)
274 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 {
276 object *op = pl->ob;
277
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
281 strcpy (op->contr->killer, "kicked");
282 }
283
284 pl->socket.status = Ns_Dead;
285 }
286
287 return 1;
288}
289
290int
291command_save_overlay (object *op, char *params)
292{
293 if (!op)
294 return 0;
295
296 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
297 {
298 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
299 return 1;
300 }
301
302 new_save_map (op->map, 2);
303 new_save_map (op->map, 0);
304 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
305
306 ready_map_name (op->map->path, 0);
307
308 return 1;
309}
310
311int
312command_shutdown (object *op, char *params)
313{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
317 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1;
320 }
321
322 cleanup ();
323 /* not reached */
324 return 1;
325}
326
327int
328command_goto (object *op, char *params)
329{
330 char *name;
331 object *dummy;
332
333 if (!op)
334 return 0;
335
336 if (params == NULL)
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
339 return 1;
340 }
341
342 name = params;
343 dummy = get_object ();
344 dummy->map = op->map;
345 EXIT_PATH (dummy) = name;
346 dummy->name = name;
347
348 enter_exit (op, dummy);
349 free_object (dummy);
350 if (op->contr->loading == NULL)
351 {
352 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
353 }
354
355 return 1;
356}
357
358/* is this function called from somewhere ? -Tero */
359int
360command_generate (object *op, char *params)
361{
362 object *tmp;
363 int nr = 1, i, retry;
364
365 if (!op)
366 return 0;
367
368 if (params != NULL)
369 sscanf (params, "%d", &nr);
370 for (i = 0; i < nr; i++)
371 {
372 retry = 50;
373 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
374 ;
375 if (tmp != NULL)
376 {
377 tmp = insert_ob_in_ob (tmp, op);
378 if (op->type == PLAYER)
379 esrv_send_item (op, tmp);
380 }
381 }
382
383 return 1;
384}
385
386int 365int
387command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
388{ 367{
389 int ticks; 368 int ticks;
390 player *pl; 369 player *pl;
… …
425 object *dummy; 404 object *dummy;
426 player *pl; 405 player *pl;
427 406
428 if (!op) 407 if (!op)
429 return 0; 408 return 0;
409
430 if (params == NULL) 410 if (params == NULL)
431 { 411 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 413 return 1;
434 } 414 }
415
435 pl = get_other_player_from_name (op, params); 416 pl = get_other_player_from_name (op, params);
436 if (!pl) 417 if (!pl)
437 return 1; 418 return 1;
419
438 dummy = get_jail_exit (pl->ob); 420 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 421 if (!dummy)
440 { 422 {
441 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
442 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");
443 return 0; 425 return 0;
444 } 426 }
445 enter_exit (pl->ob, dummy); 427
446 free_object (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
429 dummy->destroy ();
430
447 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.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 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);
450 return 1; 434 return 1;
451} 435}
… …
475 { 459 {
476 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 460 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
477 return 1; 461 return 1;
478 } 462 }
479 463
480 dummy = get_object (); 464 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
481 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy);
485 free_object (dummy);
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 465 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 466 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 467
489 return 1;
490}
491
492/**
493 * Teleport next to target player.
494 */
495
496/* mids 01/16/2002 */
497int
498command_teleport (object *op, char *params)
499{
500 int i;
501 object *dummy;
502 player *pl;
503
504 if (!op)
505 return 0;
506
507 if (params == NULL)
508 {
509 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
510 return 1;
511 }
512
513 pl = get_other_player_from_name (op, params);
514 if (!pl)
515 return 1;
516
517 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
518 if (i == -1)
519 {
520 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
521 return 1;
522 }
523
524 dummy = get_object ();
525 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy);
529 free_object (dummy);
530 if (!op->contr->hidden)
531 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 468 return 1;
534} 469}
535 470
536/** 471/**
537 * This function is a real mess, because we're stucking getting 472 * This function is a real mess, because we're stucking getting
… …
627 * we also set up spell_name which is only 562 * we also set up spell_name which is only
628 * the first word. 563 * the first word.
629 */ 564 */
630 565
631 at_spell = archetype::find (cp); 566 at_spell = archetype::find (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 567 if (!at_spell || at_spell->type != SPELL)
633 at_spell = find_archetype_by_object_name (cp); 568 at_spell = find_archetype_by_object_name (cp);
634 if (!at_spell || at_spell->clone.type != SPELL) 569 if (!at_spell || at_spell->type != SPELL)
635 { 570 {
636 strcpy (spell_name, cp); 571 assign (spell_name, cp);
637 fsp = strchr (spell_name, ' '); 572 fsp = strchr (spell_name, ' ');
638 if (fsp) 573 if (fsp)
639 { 574 {
640 *fsp = 0; 575 *fsp = 0;
641 fsp++; 576 fsp++;
642 at_spell = archetype::find (spell_name); 577 at_spell = archetype::find (spell_name);
643 578
644 /* Got a spell, update the first string pointer */ 579 /* Got a spell, update the first string pointer */
645 if (at_spell && at_spell->clone.type == SPELL) 580 if (at_spell && at_spell->type == SPELL)
646 bp2 = cp + strlen (spell_name) + 1; 581 bp2 = cp + strlen (spell_name) + 1;
647 else 582 else
648 at_spell = NULL; 583 at_spell = NULL;
649 } 584 }
650 } 585 }
… …
652 /* OK - we didn't find a spell - presume the 'of' 587 /* OK - we didn't find a spell - presume the 'of'
653 * in this case means its an artifact. 588 * in this case means its an artifact.
654 */ 589 */
655 if (!at_spell) 590 if (!at_spell)
656 { 591 {
657 if (find_artifactlist (at->clone.type) == NULL) 592 if (find_artifactlist (at->type) == NULL)
658 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type); 593 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
659 else 594 else
660 { 595 {
661 art = find_artifactlist (at->clone.type)->items; 596 art = find_artifactlist (at->type)->items;
662 597
663 do 598 while (art)
664 { 599 {
665 if (!strcmp (art->item->name, cp)) 600 if (!strcmp (&art->item->name, cp))
666 break; 601 break;
602
667 art = art->next; 603 art = art->next;
668 } 604 }
669 while (art != NULL);
670 605
671 if (!art) 606 if (!art)
672 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 607 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
673 } 608 }
674 609
675 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 610 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
676 } 611 }
677 } /* if cp */ 612 } /* if cp */
678 613
679 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 614 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
680 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 615 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
681 { 616 {
682 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp); 617 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
683 return 1; 618 return 1;
684 } 619 }
685 620
686 /* 621 /*
687 * Rather than have two different blocks with a lot of similar code, 622 * Rather than have two different blocks with a lot of similar code,
688 * just create one object, do all the processing, and then determine 623 * just create one object, do all the processing, and then determine
689 * if that one object should be inserted or if we need to make copies. 624 * if that one object should be inserted or if we need to make copies.
690 */ 625 */
691 tmp = arch_to_object (at); 626 tmp = at->instance ();
692
693 if (settings.real_wiz == FALSE)
694 SET_FLAG (tmp, FLAG_WAS_WIZ);
695 627
696 if (set_magic) 628 if (set_magic)
697 set_abs_magic (tmp, magic); 629 set_abs_magic (tmp, magic);
698 630
699 if (art) 631 if (art)
… …
779 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 711 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
780 712
781 bp2 = bp3 + 1; 713 bp2 = bp3 + 1;
782 } 714 }
783 715
784 if (at->clone.nrof) 716 if (at->nrof)
785 { 717 {
786 if (at_spell) 718 if (at_spell)
787 insert_ob_in_ob (arch_to_object (at_spell), tmp); 719 tmp->insert (at_spell->instance ());
788 720
789 tmp->x = op->x; 721 tmp->x = op->x;
790 tmp->y = op->y; 722 tmp->y = op->y;
723 tmp->map = op->map;
791 724
792 if (set_nrof) 725 if (set_nrof)
793 tmp->nrof = nrof; 726 tmp->nrof = nrof;
794 727
795 tmp->map = op->map; 728 op->insert (tmp);
796
797 tmp = insert_ob_in_ob (tmp, op);
798 esrv_send_item (op, tmp);
799 729
800 /* Let's put this created item on stack so dm can access it easily. */ 730 /* Let's put this created item on stack so dm can access it easily. */
801 dm_stack_push (op->contr, tmp->count); 731 dm_stack_push (op->contr, tmp->count);
802 732
803 return 1; 733 return 1;
804 } 734 }
805 else 735 else
806 { 736 {
807 for (i = 0; i < (set_nrof ? nrof : 1); i++) 737 for (i = 0; i < (set_nrof ? nrof : 1); i++)
808 { 738 {
809 archetype *atmp;
810 object *prev = 0, *head = 0; 739 object *prev = 0, *head = 0;
811 740
812 for (atmp = at; atmp; atmp = atmp->more) 741 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
813 { 742 {
814 object *dup = arch_to_object (atmp); 743 object *dup = atmp->instance ();
815 744
816 if (at_spell) 745 if (at_spell)
817 insert_ob_in_ob (arch_to_object (at_spell), dup); 746 insert_ob_in_ob (at_spell->instance (), dup);
818 747
819 /* 748 /*
820 * The head is what contains all the important bits, 749 * The head is what contains all the important bits,
821 * so just copying it over should be fine. 750 * so just copying it over should be fine.
822 */ 751 */
823 if (!head) 752 if (!head)
824 { 753 {
825 head = dup; 754 head = dup;
826 copy_object (tmp, dup); 755 tmp->copy_to (dup);
827 } 756 }
828 757
829 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ);
831
832 dup->x = op->x + dup->arch->clone.x; 758 dup->x = op->x + dup->arch->x;
833 dup->y = op->y + dup->arch->clone.y; 759 dup->y = op->y + dup->arch->y;
834 dup->map = op->map; 760 dup->map = op->map;
835 761
836 if (head != dup) 762 if (head != dup)
837 { 763 {
838 dup->head = head; 764 dup->head = head;
… …
848 int size_x = 0; 774 int size_x = 0;
849 int size_y = 0; 775 int size_y = 0;
850 776
851 while (check) 777 while (check)
852 { 778 {
853 size_x = MAX (size_x, check->arch->clone.x); 779 size_x = max (size_x, check->arch->x);
854 size_y = MAX (size_y, check->arch->clone.y); 780 size_y = max (size_y, check->arch->y);
855 check = check->more; 781 check = check->more;
856 } 782 }
857 783
858 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 784 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
859 { 785 {
860 if (head->x < size_x || head->y < size_y) 786 if (head->x < size_x || head->y < size_y)
861 { 787 {
862 dm_stack_pop (op->contr); 788 dm_stack_pop (op->contr);
863 free_object (head); 789 head->destroy ();
864 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
865 free_object (tmp); 791 tmp->destroy ();
866 return 1; 792 return 1;
867 } 793 }
868 794
869 check = head; 795 check = head;
870 796
… …
885 /* Wonder if we really want to push all of these, but since 811 /* Wonder if we really want to push all of these, but since
886 * things like rods have nrof 0, we want to cover those. 812 * things like rods have nrof 0, we want to cover those.
887 */ 813 */
888 dm_stack_push (op->contr, head->count); 814 dm_stack_push (op->contr, head->count);
889 815
890 if (at->clone.randomitems != NULL && !at_spell) 816 if (at->randomitems && !at_spell)
891 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 817 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
892
893 esrv_send_item (op, head);
894 } 818 }
895 819
896 /* free the one we used to copy */ 820 /* free the one we used to copy */
897 free_object (tmp); 821 tmp->destroy ();
898 } 822 }
899 823
900 return 1; 824 return 1;
901} 825}
902 826
… …
905 */ 829 */
906 830
907int 831int
908command_inventory (object *op, char *params) 832command_inventory (object *op, char *params)
909{ 833{
834 int i;
910 object *tmp; 835 object *tmp;
911 int i;
912 836
913 if (!params) 837 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
914 { 838 {
915 inventory (op, NULL); 839 op->contr->failmsg ("Inventory of what object (nr)?");
916 return 0; 840 return 1;
917 }
918
919 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
920 { 841 }
921 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
922 return 1;
923 }
924 842
925 inventory (op, tmp); 843 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
844
926 return 1; 845 return 1;
927} 846}
928 847
929/* just show player's their skills for now. Dm's can 848/* just show player's their skills for now. Dm's can
930 * already see skills w/ inventory command - b.t. 849 * already see skills w/ inventory command - b.t.
… …
944 863
945 tmp = get_dm_object (op->contr, &params, NULL); 864 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 865 if (!tmp)
947 return 1; 866 return 1;
948 867
949 dump_object (tmp); 868 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 869 new_draw_info (NDI_UNIQUE, 0, op, dump);
870 free (dump);
871
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 872 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 873 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
953 return 1;
954}
955 874
956/**
957 * When DM is possessing a monster, flip aggression on and off, to allow
958 * better motion.
959 */
960int
961command_mon_aggr (object *op, char *params)
962{
963 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
964 {
965 op->enemy = NULL;
966 SET_FLAG (op, FLAG_UNAGGRESSIVE);
967 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
968 }
969 else
970 {
971 CLEAR_FLAG (op, FLAG_FRIENDLY);
972 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
973 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
974 }
975
976 return 1;
977}
978
979/** DM can possess a monster. Basically, this tricks the client into thinking
980 * a given monster, is actually the player it controls. This allows a DM
981 * to inhabit a monster's body, and run around the game with it.
982 * This function is severely broken - it has tons of hardcoded values,
983 */
984int
985command_possess (object *op, char *params)
986{
987 object *victim, *curinv, *nextinv;
988 player *pl;
989 int i;
990 char buf[MAX_BUF];
991
992 victim = NULL;
993 if (params != NULL)
994 {
995 if (sscanf (params, "%d", &i))
996 victim = find_object (i);
997 else if (sscanf (params, "%s", buf))
998 victim = find_object_name (buf);
999 }
1000 if (victim == NULL)
1001 {
1002 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
1003 return 1;
1004 }
1005
1006 if (victim == op)
1007 {
1008 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1009 return 1;
1010 }
1011
1012 /* clear out the old inventory */
1013 curinv = op->inv;
1014 while (curinv != NULL)
1015 {
1016 nextinv = curinv->below;
1017 esrv_del_item (op->contr, curinv->count);
1018 curinv = nextinv;
1019 }
1020
1021 /* make the switch */
1022 pl = op->contr;
1023 victim->contr = pl;
1024 pl->ob = victim;
1025 victim->type = PLAYER;
1026 SET_FLAG (victim, FLAG_WIZ);
1027
1028 /* send the inventory to the client */
1029 curinv = victim->inv;
1030 while (curinv != NULL)
1031 {
1032 nextinv = curinv->below;
1033 esrv_send_item (victim, curinv);
1034 curinv = nextinv;
1035 }
1036 /* basic patchup */
1037 /* The use of hard coded values is terrible. Note
1038 * that really, to be fair, this shouldn't get changed at
1039 * all - if you are possessing a kobold, you should have the
1040 * same limitations. As it is, as more body locations are added,
1041 * this will give this player more locations than perhaps
1042 * they should be allowed.
1043 */
1044 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1045 if (i == 1 || i == 6 || i == 8 || i == 9)
1046 victim->body_info[i] = 2;
1047 else
1048 victim->body_info[i] = 1;
1049
1050 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1051 esrv_send_inventory (victim, victim);
1052
1053 fix_player (victim);
1054
1055 do_some_living (victim);
1056 return 1; 875 return 1;
1057} 876}
1058 877
1059int 878int
1060command_patch (object *op, char *params) 879command_patch (object *op, char *params)
… …
1075 return 1; 894 return 1;
1076 } 895 }
1077 896
1078 if ((arg2 = strchr (arg, ' '))) 897 if ((arg2 = strchr (arg, ' ')))
1079 arg2++; 898 arg2++;
1080 if (settings.real_wiz == FALSE) 899
1081 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1082 if (set_variable (tmp, arg) == -1) 900 if (set_variable (tmp, arg) == -1)
1083 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 901 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
1084 else 902 else
1085 {
1086 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 903 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
1087 }
1088 904
1089 return 1; 905 return 1;
1090} 906}
1091 907
1092int 908int
… …
1119 dm_stack_pop (op->contr); 935 dm_stack_pop (op->contr);
1120 936
1121 /* Always work on the head - otherwise object will get in odd state */ 937 /* Always work on the head - otherwise object will get in odd state */
1122 if (tmp->head) 938 if (tmp->head)
1123 tmp = tmp->head; 939 tmp = tmp->head;
1124 remove_ob (tmp); 940 tmp->remove ();
1125 return 1; 941 return 1;
1126} 942}
1127 943
1128int 944int
1129command_free (object *op, char *params) 945command_free (object *op, char *params)
… …
1141 957
1142 if (from != STACK_FROM_STACK) 958 if (from != STACK_FROM_STACK)
1143 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 959 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1144 dm_stack_pop (op->contr); 960 dm_stack_pop (op->contr);
1145 961
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 {
1148 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1149 remove_ob (tmp);
1150 }
1151
1152 if (tmp->head) 962 if (tmp->head)
1153 tmp = tmp->head; 963 tmp = tmp->head;
1154 free_object (tmp); 964
965 tmp->destroy ();
1155 return 1; 966 return 1;
1156} 967}
1157 968
1158/** 969/**
1159 * This adds exp to a player. We now allow adding to a specific skill. 970 * This adds exp to a player. We now allow adding to a specific skill.
1160 */ 971 */
1161int 972int
1162command_addexp (object *op, char *params) 973command_addexp (object *op, char *params)
1163{ 974{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 975 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 976 int q;
977 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1166 object *skillob = NULL; 978 object *skillob = NULL;
1167 player *pl;
1168 979
1169 skill[0] = '\0'; 980 skill[0] = '\0';
1170 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 981 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
1171 { 982 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 983 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1173 return 1; 984 return 1;
1174 } 985 }
1175 986
1176 for (pl = first_player; pl != NULL; pl = pl->next) 987 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 988 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 989 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 990 if (q >= 3)
1187 { 991 {
1188 skillob = find_skill_by_name (pl->ob, skill); 992 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 993 if (!skillob)
1190 { 994 {
1191 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 995 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
996 return 1;
997 }
998
999 i = check_exp_adjust (skillob, i);
1000 skillob->stats.exp += i;
1001 calc_perm_exp (skillob);
1002 player_lvl_adj (pl->ob, skillob);
1003 }
1004
1005 pl->ob->stats.exp += i;
1006 calc_perm_exp (pl->ob);
1007 player_lvl_adj (pl->ob, NULL);
1008
1192 return 1; 1009 return 1;
1193 } 1010 }
1194 1011
1195 i = check_exp_adjust (skillob, i); 1012 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1196 skillob->stats.exp += i;
1197 calc_perm_exp (skillob);
1198 player_lvl_adj (pl->ob, skillob);
1199 }
1200
1201 pl->ob->stats.exp += i;
1202 calc_perm_exp (pl->ob);
1203 player_lvl_adj (pl->ob, NULL);
1204
1205 if (settings.real_wiz == FALSE)
1206 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1207 return 1; 1013 return 1;
1208} 1014}
1209 1015
1210/**************************************************************************/ 1016/**************************************************************************/
1211 1017
… …
1217 1023
1218int 1024int
1219command_stats (object *op, char *params) 1025command_stats (object *op, char *params)
1220{ 1026{
1221 char thing[20]; 1027 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 1028 char buf[MAX_BUF];
1224 1029
1225 thing[0] = '\0'; 1030 thing[0] = '\0';
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1031 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 1032 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1033 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 1034 return 1;
1230 } 1035 }
1231 1036
1232 for (pl = first_player; pl != NULL; pl = pl->next) 1037 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 1038 if (!strcmp (&pl->ob->name, thing))
1234 { 1039 {
1235 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1040 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1041 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1042 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1043 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1044 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1045 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1046 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1047 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1048 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1049 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1050 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1051 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1052 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1053 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 1054 return 1;
1250 } 1055 }
1251 if (pl == NULL) 1056
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1057 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 1058 return 1;
1254} 1059}
1255 1060
1256int 1061int
1257command_abil (object *op, char *params) 1062command_abil (object *op, char *params)
1258{ 1063{
1259 char thing[20], thing2[20]; 1064 char thing[20], thing2[20];
1260 int iii; 1065 int iii;
1261 player *pl;
1262 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
1263 1067
1264 iii = 0; 1068 iii = 0;
1265 thing[0] = '\0'; 1069 thing[0] = '\0';
1266 thing2[0] = '\0'; 1070 thing2[0] = '\0';
… …
1280 { 1084 {
1281 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1085 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1282 return 1; 1086 return 1;
1283 } 1087 }
1284 1088
1285 for (pl = first_player; pl != NULL; pl = pl->next) 1089 for_all_players (pl)
1286 { 1090 {
1287 if (!strcmp (pl->ob->name, thing)) 1091 if (!strcmp (&pl->ob->name, thing))
1288 { 1092 {
1289 if (settings.real_wiz == FALSE)
1290 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1291 if (!strcmp ("str", thing2))
1292 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 1093 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1293 if (!strcmp ("dex", thing2))
1294 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 1094 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1295 if (!strcmp ("con", thing2))
1296 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 1095 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1297 if (!strcmp ("wis", thing2))
1298 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 1096 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1299 if (!strcmp ("cha", thing2))
1300 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 1097 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1301 if (!strcmp ("int", thing2))
1302 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 1098 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1303 if (!strcmp ("pow", thing2))
1304 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 1099 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1100
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 1101 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 1102 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 1103 pl->ob->update_stats ();
1308 return 1; 1104 return 1;
1309 } 1105 }
1310 } 1106 }
1311 1107
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1108 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 1109 return 1;
1314} 1110}
1315 1111
1316int 1112int
1317command_reset (object *op, char *params)
1318{
1319 mapstruct *m;
1320 object *dummy = NULL, *tmp = NULL;
1321
1322 if (params == NULL)
1323 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1325 return 1;
1326 }
1327
1328 if (strcmp (params, ".") == 0)
1329 params = op->map->path;
1330 m = has_been_loaded (params);
1331 if (m == NULL)
1332 {
1333 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1334 return 1;
1335 }
1336
1337 if (m->in_memory != MAP_SWAPPED)
1338 {
1339 if (m->in_memory != MAP_IN_MEMORY)
1340 {
1341 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1342 return 0;
1343 }
1344
1345 /*
1346 * Only attempt to remove the player that is doing the reset, and not other
1347 * players or wiz's.
1348 */
1349 if (op->map == m)
1350 {
1351 dummy = get_object ();
1352 dummy->map = NULL;
1353 EXIT_X (dummy) = op->x;
1354 EXIT_Y (dummy) = op->y;
1355 EXIT_PATH (dummy) = op->map->path;
1356 remove_ob (op);
1357 op->map = NULL;
1358 tmp = op;
1359 }
1360 swap_map (m);
1361 }
1362
1363 if (m->in_memory == MAP_SWAPPED)
1364 {
1365 LOG (llevDebug, "Resetting map %s.\n", m->path);
1366
1367 /* setting this effectively causes an immediate reload */
1368 m->reset_time = 1;
1369 flush_old_maps ();
1370 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1371 if (tmp)
1372 {
1373 enter_exit (tmp, dummy);
1374 free_object (dummy);
1375 }
1376 return 1;
1377 }
1378 else
1379 {
1380 player *pl;
1381 int playercount = 0;
1382
1383 /* Need to re-insert player if swap failed for some reason */
1384 if (tmp)
1385 {
1386 insert_ob_in_map (op, m, NULL, 0);
1387 free_object (dummy);
1388 }
1389
1390 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1391 for (pl = first_player; pl != NULL; pl = pl->next)
1392 {
1393 if (pl->ob->map == m && pl->ob != op)
1394 {
1395 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1396 playercount++;
1397 }
1398 }
1399 if (!playercount)
1400 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1401 return 1;
1402 }
1403}
1404
1405int
1406command_nowiz (object *op, char *params) 1113command_nowiz (object *op, char *params)
1407{ /* 'noadm' is alias */ 1114{ /* 'nodm' is alias */
1408 CLEAR_FLAG (op, FLAG_WIZ); 1115 CLEAR_FLAG (op, FLAG_WIZ);
1409 CLEAR_FLAG (op, FLAG_WIZPASS); 1116 CLEAR_FLAG (op, FLAG_WIZPASS);
1410 CLEAR_FLAG (op, FLAG_WIZCAST); 1117 CLEAR_FLAG (op, FLAG_WIZCAST);
1411
1412 if (settings.real_wiz == TRUE)
1413 CLEAR_FLAG (op, FLAG_WAS_WIZ); 1118 CLEAR_FLAG (op, FLAG_WIZLOOK);
1119 op->contr->do_los = 1;
1120
1414 if (op->contr->hidden) 1121 if (op->contr->hidden)
1415 { 1122 {
1416 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1123 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1417 op->map->players++; 1124 op->map->players++;
1418 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 1125 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1419 op->contr->hidden = 0; 1126 op->contr->hidden = 0;
1420 op->invisible = 1; 1127 op->invisible = 1;
1421 } 1128 }
1422 else 1129 else
1423 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 1130 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1131
1424 return 1; 1132 return 1;
1425} 1133}
1426 1134
1427/** 1135/**
1428 * object *op is trying to become dm. 1136 * object *op is trying to become dm.
… …
1465 } 1173 }
1466 fclose (dmfile); 1174 fclose (dmfile);
1467 return (0); 1175 return (0);
1468} 1176}
1469 1177
1470int 1178static int
1471do_wizard_dm (object *op, char *params, int silent) 1179do_wizard_dm (object *op, char *params, int silent)
1472{ 1180{
1473 if (!op->contr) 1181 if (!op->contr)
1474 return 0; 1182 return 0;
1475 1183
… …
1477 { 1185 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1186 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1479 return 0; 1187 return 0;
1480 } 1188 }
1481 1189
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1190 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1483 { 1191 {
1484 SET_FLAG (op, FLAG_WIZ); 1192 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1193 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1194 SET_FLAG (op, FLAG_WIZCAST);
1195 SET_FLAG (op, FLAG_WIZLOOK);
1196 op->contr->do_los = 1;
1197
1488 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1198 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1489 /*
1490 * Remove setting flying here - that won't work, because next
1491 * fix_player() is called that will get cleared - proper solution
1492 * is probably something like a wiz_force which gives that and any
1493 * other desired abilities.
1494 */
1495 clear_los (op);
1496 op->contr->write_buf[0] = '\0'; 1199 op->contr->write_buf[0] = '\0';
1497 1200
1498 if (!silent) 1201 if (!silent)
1499 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1202 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1500 1203
… …
1527command_invisible (object *op, char *params) 1230command_invisible (object *op, char *params)
1528{ 1231{
1529 if (op) 1232 if (op)
1530 { 1233 {
1531 op->invisible += 100; 1234 op->invisible += 100;
1532 update_object (op, UP_OBJ_FACE); 1235 update_object (op, UP_OBJ_CHANGE);
1533 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1236 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1534 } 1237 }
1535 1238
1536 return 0; 1239 return 0;
1537} 1240}
… …
1540 * Returns spell object (from archetypes) by name. 1243 * Returns spell object (from archetypes) by name.
1541 * Returns NULL if 0 or more than one spell matches. 1244 * Returns NULL if 0 or more than one spell matches.
1542 * Used for wizard's learn spell/prayer. 1245 * Used for wizard's learn spell/prayer.
1543 * 1246 *
1544 * op is the player issuing the command. 1247 * op is the player issuing the command.
1545 *
1546 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1547 * anymore (but may still be present in some player's inventories and thus
1548 * cannot be removed). We have to ignore them here since they have the same
1549 * name than other "spell_xxx" archetypes and would always conflict.
1550 */ 1248 */
1551static object * 1249static object *
1552get_spell_by_name (object *op, const char *spell_name) 1250get_spell_by_name (object *op, shstr_cmp spell_name)
1553{ 1251{
1554 archetype *ar;
1555 archetype *found;
1556 int conflict_found;
1557 size_t spell_name_length;
1558
1559 /* First check for full name matches. */ 1252 /* First check for full name matches. */
1560 conflict_found = 0; 1253 int conflict_found = 0;
1561 found = NULL; 1254 archetype *found = 0;
1562 for (ar = first_archetype; ar != NULL; ar = ar->next) 1255
1256 for_all_archetypes (at)
1563 { 1257 {
1564 if (ar->clone.type != SPELL) 1258 if (at->type != SPELL)
1565 continue; 1259 continue;
1566 1260
1567 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1261 if (at->object::name != spell_name)
1568 continue; 1262 continue;
1569 1263
1570 if (strcmp (ar->clone.name, spell_name) != 0)
1571 continue;
1572
1573 if (found != NULL) 1264 if (found)
1574 { 1265 {
1575 if (!conflict_found) 1266 if (!conflict_found)
1576 { 1267 {
1577 conflict_found = 1; 1268 conflict_found = 1;
1578 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1269 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1579 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1270 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1580 } 1271 }
1272
1581 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1273 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1582 continue; 1274 return 0;
1583 } 1275 }
1584 1276
1585 found = ar; 1277 found = at;
1586 } 1278 }
1587
1588 /* No match if more more than one archetype matches. */
1589 if (conflict_found)
1590 return NULL;
1591 1279
1592 /* Return if exactly one archetype matches. */ 1280 /* Return if exactly one archetype matches. */
1593 if (found != NULL) 1281 if (found)
1594 return arch_to_object (found); 1282 return found->instance ();
1595
1596 /* No full match found: now check for partial matches. */
1597 spell_name_length = strlen (spell_name);
1598 conflict_found = 0;
1599 found = NULL;
1600 for (ar = first_archetype; ar != NULL; ar = ar->next)
1601 {
1602 if (ar->clone.type != SPELL)
1603 continue;
1604
1605 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1606 continue;
1607
1608 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1609 continue;
1610
1611 if (found != NULL)
1612 {
1613 if (!conflict_found)
1614 {
1615 conflict_found = 1;
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1617 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1618 }
1619 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1620 continue;
1621 }
1622
1623 found = ar;
1624 }
1625
1626 /* No match if more more than one archetype matches. */
1627 if (conflict_found)
1628 return NULL;
1629
1630 /* Return if exactly one archetype matches. */
1631 if (found != NULL)
1632 return arch_to_object (found);
1633 1283
1634 /* No spell found: just print an error message. */ 1284 /* No spell found: just print an error message. */
1635 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1285 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1286
1636 return NULL; 1287 return 0;
1637} 1288}
1638 1289
1639static int 1290static int
1640command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1291command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1641{ 1292{
… …
1658 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1309 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1659 return 0; 1310 return 0;
1660 } 1311 }
1661 1312
1662 do_learn_spell (op, tmp, special_prayer); 1313 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1314 tmp->destroy ();
1664 return 1; 1315 return 1;
1665} 1316}
1666 1317
1667int 1318int
1668command_learn_spell (object *op, char *params) 1319command_learn_spell (object *op, char *params)
… …
1693 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1344 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1694 return 0; 1345 return 0;
1695 } 1346 }
1696 1347
1697 do_forget_spell (op, spell->name); 1348 do_forget_spell (op, spell->name);
1698 return 1;
1699}
1700
1701/**
1702 * Lists all plugins currently loaded with their IDs and full names.
1703 */
1704int
1705command_listplugins (object *op, char *params)
1706{
1707 plugins_display_list (op);
1708 return 1;
1709}
1710
1711/**
1712 * Loads the given plugin. The DM specifies the name of the library to load (no
1713 * pathname is needed). Do not ever attempt to load the same plugin more than
1714 * once at a time, or bad things could happen.
1715 */
1716int
1717command_loadplugin (object *op, char *params)
1718{
1719 char buf[MAX_BUF];
1720
1721 if (params == NULL)
1722 {
1723 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1724 return 1;
1725 }
1726
1727 strcpy (buf, LIBDIR);
1728 strcat (buf, "/plugins/");
1729 strcat (buf, params);
1730 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1731 if (plugins_init_plugin (buf) == 0)
1732 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1733 else
1734 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1735 return 1;
1736}
1737
1738/**
1739 * Unloads the given plugin. The DM specified the ID of the library to unload.
1740 * Note that some things may behave strangely if the correct plugins are not
1741 * loaded.
1742 */
1743int
1744command_unloadplugin (object *op, char *params)
1745{
1746 if (params == NULL)
1747 {
1748 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1749 return 1;
1750 }
1751
1752 if (plugins_remove_plugin (params) == 0)
1753 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1754 else
1755 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1756 return 1; 1349 return 1;
1757} 1350}
1758 1351
1759/** 1352/**
1760 * A players wants to become DM and hide. 1353 * A players wants to become DM and hide.
… …
1768 return 0; 1361 return 0;
1769 1362
1770 do_wizard_hide (op, 1); 1363 do_wizard_hide (op, 1);
1771 1364
1772 return 1; 1365 return 1;
1773}
1774
1775void
1776dm_stack_pop (player *pl)
1777{
1778 if (!pl->stack_items || !pl->stack_position)
1779 {
1780 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1781 return;
1782 }
1783
1784 pl->stack_position--;
1785 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1786}
1787
1788/**
1789 * Get current stack top item for player.
1790 * Returns NULL if no stacked item.
1791 * If stacked item disappeared (freed), remove it.
1792 *
1793 * Ryo, august 2004
1794 */
1795object *
1796dm_stack_peek (player *pl)
1797{
1798 object *ob;
1799
1800 if (!pl->stack_position)
1801 {
1802 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1803 return NULL;
1804 }
1805
1806 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1807 if (!ob)
1808 {
1809 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1810 dm_stack_pop (pl);
1811 return NULL;
1812 }
1813
1814 return ob;
1815}
1816
1817/**
1818 * Push specified item on player stack.
1819 * Inform player of position.
1820 * Initializes variables if needed.
1821 */
1822void
1823dm_stack_push (player *pl, tag_t item)
1824{
1825 if (!pl->stack_items)
1826 {
1827 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1828 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1829 }
1830
1831 if (pl->stack_position == STACK_SIZE)
1832 {
1833 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1834 return;
1835 }
1836
1837 pl->stack_items[pl->stack_position] = item;
1838 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1839 pl->stack_position++;
1840}
1841
1842/**
1843 * Checks 'params' for object code.
1844 *
1845 * Can be:
1846 * * empty => get current object stack top for player
1847 * * number => get item with that tag, stack it for future use
1848 * * $number => get specified stack item
1849 * * "me" => player himself
1850 *
1851 * At function exit, params points to first non-object char
1852 *
1853 * 'from', if not NULL, contains at exit:
1854 * * STACK_FROM_NONE => object not found
1855 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1856 * * STACK_FROM_STACK => item from somewhere in the stack
1857 * * STACK_FROM_NUMBER => item by number, pushed on stack
1858 *
1859 * Ryo, august 2004
1860 */
1861object *
1862get_dm_object (player *pl, char **params, int *from)
1863{
1864 int item_tag, item_position;
1865 object *ob;
1866
1867 if (!pl)
1868 return NULL;
1869
1870 if (!params || !*params || **params == '\0')
1871 {
1872 if (from)
1873 *from = STACK_FROM_TOP;
1874 /* No parameter => get stack item */
1875 return dm_stack_peek (pl);
1876 }
1877
1878 /* Let's clean white spaces */
1879 while (**params == ' ')
1880 (*params)++;
1881
1882 /* Next case: number => item tag */
1883 if (sscanf (*params, "%d", &item_tag))
1884 {
1885 /* Move parameter to next item */
1886 while (isdigit (**params))
1887 (*params)++;
1888
1889 /* And skip blanks, too */
1890 while (**params == ' ')
1891 (*params)++;
1892
1893 /* Get item */
1894 ob = find_object (item_tag);
1895 if (!ob)
1896 {
1897 if (from)
1898 *from = STACK_FROM_NONE;
1899 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1900 return NULL;
1901 }
1902
1903 /* Got one, let's push it on stack */
1904 dm_stack_push (pl, item_tag);
1905 if (from)
1906 *from = STACK_FROM_NUMBER;
1907 return ob;
1908 }
1909
1910 /* Next case: $number => stack item */
1911 if (sscanf (*params, "$%d", &item_position))
1912 {
1913 /* Move parameter to next item */
1914 (*params)++;
1915
1916 while (isdigit (**params))
1917 (*params)++;
1918 while (**params == ' ')
1919 (*params)++;
1920
1921 if (item_position >= pl->stack_position)
1922 {
1923 if (from)
1924 *from = STACK_FROM_NONE;
1925 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1926 return NULL;
1927 }
1928
1929 ob = find_object (pl->stack_items[item_position]);
1930 if (!ob)
1931 {
1932 if (from)
1933 *from = STACK_FROM_NONE;
1934 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1935 return NULL;
1936 }
1937
1938 if (from)
1939 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1940 return ob;
1941 }
1942
1943 /* Next case: 'me' => return pl->ob */
1944 if (!strncmp (*params, "me", 2))
1945 {
1946 if (from)
1947 *from = STACK_FROM_NUMBER;
1948 dm_stack_push (pl, pl->ob->count);
1949
1950 /* Skip to next token */
1951 (*params) += 2;
1952 while (**params == ' ')
1953 (*params)++;
1954
1955 return pl->ob;
1956 }
1957
1958 /* Last case: get stack top */
1959 if (from)
1960 *from = STACK_FROM_TOP;
1961 return dm_stack_peek (pl);
1962} 1366}
1963 1367
1964/** 1368/**
1965 * Pop the stack top. 1369 * Pop the stack top.
1966 */ 1370 */
… …
2026} 1430}
2027 1431
2028int 1432int
2029command_insert_into (object *op, char *params) 1433command_insert_into (object *op, char *params)
2030{ 1434{
2031 object *left, *right, *inserted; 1435 object *left, *right;
2032 int left_from, right_from; 1436 int left_from, right_from;
2033 1437
2034 left = get_dm_object (op->contr, &params, &left_from); 1438 left = get_dm_object (op->contr, &params, &left_from);
2035 if (!left) 1439 if (!left)
2036 { 1440 {
… …
2080 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1484 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2081 return 0; 1485 return 0;
2082 } 1486 }
2083 1487
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1488 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1489 right->remove ();
1490
2086 inserted = insert_ob_in_ob (right, left); 1491 object *inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER)
2088 if (inserted == right)
2089 esrv_send_item (left, right);
2090 else
2091 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2092 1492
2093 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1493 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2094 1494
2095 return 0; 1495 return 0;
2096 1496

Diff Legend

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