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.95 by root, Sat Nov 17 23:40:03 2018 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
6 8 *
7 This program is free software; you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 12 * option) any later version.
11 13 *
12 This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 17 * GNU General Public License for more details.
16 18 *
17 You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 20 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
20 22 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 24 */
23 25
24#include <global.h> 26#include <global.h>
25#ifndef __CEXTRACT__
26# include <sproto.h> 27#include <sproto.h>
27#endif
28#include <spells.h> 28#include <spells.h>
29#include <treasure.h> 29#include <treasure.h>
30#include <skills.h> 30#include <skills.h>
31 31
32/** Defines for DM item stack **/ 32/** Defines for DM item stack **/
… …
35/* Values for 'from' field of get_dm_object */ 35/* Values for 'from' field of get_dm_object */
36#define STACK_FROM_NONE 0 /* Item was not found */ 36#define STACK_FROM_NONE 0 /* Item was not found */
37#define STACK_FROM_TOP 1 /* Item is stack top */ 37#define STACK_FROM_TOP 1 /* Item is stack top */
38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 38#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
39#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 39#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
40
41 40
42/** 41/**
43 * Enough of the DM functions seem to need this that I broke 42 * Enough of the DM functions seem to need this that I broke
44 * it out to a seperate function. name is the person 43 * it out to a seperate function. name is the person
45 * being saught, rq is who is looking for them. This 44 * being saught, rq is who is looking for them. This
… …
47 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
48 */ 47 */
49static player * 48static player *
50get_other_player_from_name (object *op, char *name) 49get_other_player_from_name (object *op, char *name)
51{ 50{
52 player *pl;
53
54 if (!name) 51 if (!name)
55 return NULL; 52 return NULL;
56 53
57 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 56 {
57 if (pl->ob == op)
58 {
59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
60 return NULL;
61 }
62
63 if (pl->ns->state != ST_PLAYING)
64 {
65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
66 return NULL;
67 }
68
69 return pl;
70 }
71
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
73 return 0;
74}
75
76static void
77dm_stack_pop (player *pl)
78{
79 if (!pl->stack_items || !pl->stack_position)
80 {
81 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
82 return;
83 }
84
85 pl->stack_position--;
86 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
87}
88
89/**
90 * Get current stack top item for player.
91 * Returns NULL if no stacked item.
92 * If stacked item disappeared (freed), remove it.
93 *
94 * Ryo, august 2004
95 */
96static object *
97dm_stack_peek (player *pl)
98{
99 object *ob;
100
101 if (!pl->stack_position)
102 {
103 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
64 return NULL; 104 return NULL;
65 } 105 }
66 106
67 if (pl->ob == op) 107 ob = find_object (pl->stack_items[pl->stack_position - 1]);
108 if (!ob)
68 { 109 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 110 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
111 dm_stack_pop (pl);
70 return NULL; 112 return NULL;
71 } 113 }
72 if (pl->state != ST_PLAYING) 114
73 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL;
76 }
77 return pl; 115 return ob;
78} 116}
79 117
80/** 118/**
81 * This command will stress server. 119 * Push specified item on player stack.
120 * Inform player of position.
121 * Initializes variables if needed.
82 */ 122 */
83int 123void
84command_loadtest (object *op, char *params) 124dm_stack_push (player *pl, tag_t item)
85{ 125{
86 uint32 x, y; 126 if (!pl->stack_items)
87 char buf[1024]; 127 {
128 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
129 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
130 }
88 131
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting"); 132 if (pl->stack_position == STACK_SIZE)
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places."); 133 {
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks."); 134 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
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; 135 return;
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 { 136 }
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 }
111 }
112 137
113 return 0; 138 pl->stack_items[pl->stack_position] = item;
139 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
140 pl->stack_position++;
114} 141}
115 142
116/** 143/**
117 * Actually hides specified player (obviously a DM). 144 * Checks 'params' for object code.
118 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
119 * else they just think someone left/entered.
120 */ 145 *
121void 146 * Can be:
122do_wizard_hide (object *op, int silent_dm) 147 * * empty => get current object stack top for player
148 * * number => get item with that tag, stack it for future use
149 * * $number => get specified stack item
150 * * "me" => player himself
151 *
152 * At function exit, params points to first non-object char
153 *
154 * 'from', if not NULL, contains at exit:
155 * * STACK_FROM_NONE => object not found
156 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
157 * * STACK_FROM_STACK => item from somewhere in the stack
158 * * STACK_FROM_NUMBER => item by number, pushed on stack
159 *
160 * Ryo, august 2004
161 */
162static object *
163get_dm_object (player *pl, char **params, int *from)
123{ 164{
124 if (op->contr->hidden) 165 int item_tag, item_position;
166 object *ob;
167
168 if (!pl)
169 return NULL;
170
171 if (!params || !*params || **params == '\0')
172 {
173 if (from)
174 *from = STACK_FROM_TOP;
175 /* No parameter => get stack item */
176 return dm_stack_peek (pl);
125 { 177 }
126 op->contr->hidden = 0; 178
127 op->invisible = 1; 179 /* Let's clean white spaces */
128 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 180 while (**params == ' ')
129 op->map->players++; 181 (*params)++;
130 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); 182
131 if (!silent_dm) 183 /* Next case: number => item tag */
132 { 184 if (sscanf (*params, "%d", &item_tag))
133 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 185 {
186 /* Move parameter to next item */
187 while (isdigit (**params))
188 (*params)++;
189
190 /* And skip blanks, too */
191 while (**params == ' ')
192 (*params)++;
193
194 /* Get item */
195 ob = find_object (item_tag);
196 if (!ob)
134 } 197 {
135 } 198 if (from)
136 else 199 *from = STACK_FROM_NONE;
137 { 200 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
138 op->contr->hidden = 1; 201 return NULL;
139 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
140 op->map->players--;
141 if (!silent_dm)
142 { 202 }
143 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 203
204 /* Got one, let's push it on stack */
205 dm_stack_push (pl, item_tag);
206 if (from)
207 *from = STACK_FROM_NUMBER;
208 return ob;
209 }
210
211 /* Next case: $number => stack item */
212 if (sscanf (*params, "$%d", &item_position))
213 {
214 /* Move parameter to next item */
215 (*params)++;
216
217 while (isdigit (**params))
218 (*params)++;
219 while (**params == ' ')
220 (*params)++;
221
222 if (item_position >= pl->stack_position)
144 } 223 {
145 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); 224 if (from)
146 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); 225 *from = STACK_FROM_NONE;
226 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
227 return NULL;
228 }
229
230 ob = find_object (pl->stack_items[item_position]);
231 if (!ob)
232 {
233 if (from)
234 *from = STACK_FROM_NONE;
235 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
236 return NULL;
237 }
238
239 if (from)
240 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
241 return ob;
242 }
243
244 /* Next case: 'me' => return pl->ob */
245 if (!strncmp (*params, "me", 2))
147 } 246 {
148} 247 if (from)
248 *from = STACK_FROM_NUMBER;
249 dm_stack_push (pl, pl->ob->count);
149 250
150int 251 /* Skip to next token */
151command_hide (object *op, char *params) 252 (*params) += 2;
152{ 253 while (**params == ' ')
153 do_wizard_hide (op, 0); 254 (*params)++;
154 return 1; 255
256 return pl->ob;
257 }
258
259 /* Last case: get stack top */
260 if (from)
261 *from = STACK_FROM_TOP;
262 return dm_stack_peek (pl);
155} 263}
156 264
157/** 265/**
158 * This finds and returns the object which matches the name or 266 * This finds and returns the object which matches the name or
159 * object nubmer (specified via num #whatever). 267 * object nubmer (specified via num #whatever).
… …
209 { 317 {
210 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str); 318 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
211 return 1; 319 return 1;
212 } 320 }
213 321
214 become_follower (ob, god); 322 ob->become_follower (god);
215 return 1;
216}
217
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; 323 return 1;
384} 324}
385 325
386int 326int
387command_freeze (object *op, char *params) 327command_freeze (object *op, char *params)
… …
425 object *dummy; 365 object *dummy;
426 player *pl; 366 player *pl;
427 367
428 if (!op) 368 if (!op)
429 return 0; 369 return 0;
370
430 if (params == NULL) 371 if (params == NULL)
431 { 372 {
432 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 373 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
433 return 1; 374 return 1;
434 } 375 }
376
435 pl = get_other_player_from_name (op, params); 377 pl = get_other_player_from_name (op, params);
436 if (!pl) 378 if (!pl)
437 return 1; 379 return 1;
380
438 dummy = get_jail_exit (pl->ob); 381 dummy = get_jail_exit (pl->ob);
439 if (!dummy) 382 if (!dummy)
440 { 383 {
441 /* we have nowhere to send the prisoner.... */ 384 /* 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"); 385 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
443 return 0; 386 return 0;
444 } 387 }
445 enter_exit (pl->ob, dummy); 388
446 free_object (dummy); 389 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
390 dummy->destroy ();
391
447 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 394 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
450 return 1; 395 return 1;
451} 396}
452 397
453int 398int
454command_summon (object *op, char *params) 399command_summon (object *op, char *params)
455{ 400{
456 int i; 401 int i;
457 object *dummy;
458 player *pl; 402 player *pl;
459 403
460 if (!op) 404 if (!op)
461 return 0; 405 return 0;
462 406
… …
468 412
469 pl = get_other_player_from_name (op, params); 413 pl = get_other_player_from_name (op, params);
470 if (!pl) 414 if (!pl)
471 return 1; 415 return 1;
472 416
473 i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 417 maptile *m = op->map;
418 sint16 nx = op->x;
419 sint16 ny = op->y;
420
421 i = find_free_spot (op, m, nx, ny, 1, SIZEOFFREE1+1);
474 if (i == -1) 422 if (i == -1)
475 { 423 {
476 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 424 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
477 return 1; 425 return 1;
478 } 426 }
479 427
480 dummy = get_object (); 428 nx += DIRX (i);
481 EXIT_PATH (dummy) = op->map->path; 429 ny += DIRY (i);
482 EXIT_X (dummy) = op->x + freearr_x[i]; 430
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 431 if (!xy_normalise (m, nx, ny))
484 enter_exit (pl->ob, dummy); 432 {
485 free_object (dummy); 433 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
434 return 1;
435 }
436
437 pl->ob->player_goto (m->path, nx, ny);
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 438 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 439 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 440
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; 441 return 1;
534} 442}
535 443
536/** 444/**
537 * This function is a real mess, because we're stucking getting 445 * This function is a real mess, because we're stucking getting
… …
551int 459int
552command_create (object *op, char *params) 460command_create (object *op, char *params)
553{ 461{
554 object *tmp = NULL; 462 object *tmp = NULL;
555 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace; 463 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
556 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 464 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
557 archetype *at, *at_spell = NULL; 465 archetype *at, *at_spell = NULL;
558 artifact *art = NULL; 466 artifact *art = NULL;
559 467
560 if (!op) 468 if (!op)
561 return 0; 469 return 0;
… …
627 * we also set up spell_name which is only 535 * we also set up spell_name which is only
628 * the first word. 536 * the first word.
629 */ 537 */
630 538
631 at_spell = archetype::find (cp); 539 at_spell = archetype::find (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 540 if (!at_spell || at_spell->type != SPELL)
633 at_spell = find_archetype_by_object_name (cp); 541 at_spell = find_archetype_by_object_name (cp);
634 if (!at_spell || at_spell->clone.type != SPELL) 542 if (!at_spell || at_spell->type != SPELL)
635 { 543 {
636 strcpy (spell_name, cp); 544 assign (spell_name, cp);
637 fsp = strchr (spell_name, ' '); 545 fsp = strchr (spell_name, ' ');
638 if (fsp) 546 if (fsp)
639 { 547 {
640 *fsp = 0; 548 *fsp = 0;
641 fsp++; 549 fsp++;
642 at_spell = archetype::find (spell_name); 550 at_spell = archetype::find (spell_name);
643 551
644 /* Got a spell, update the first string pointer */ 552 /* Got a spell, update the first string pointer */
645 if (at_spell && at_spell->clone.type == SPELL) 553 if (at_spell && at_spell->type == SPELL)
646 bp2 = cp + strlen (spell_name) + 1; 554 bp2 = cp + strlen (spell_name) + 1;
647 else 555 else
648 at_spell = NULL; 556 at_spell = NULL;
649 } 557 }
650 } 558 }
… …
652 /* OK - we didn't find a spell - presume the 'of' 560 /* OK - we didn't find a spell - presume the 'of'
653 * in this case means its an artifact. 561 * in this case means its an artifact.
654 */ 562 */
655 if (!at_spell) 563 if (!at_spell)
656 { 564 {
657 if (find_artifactlist (at->clone.type) == NULL) 565 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); 566 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type);
659 else 567 else
660 { 568 {
661 art = find_artifactlist (at->clone.type)->items; 569 art = find_artifactlist (at->type)->items;
662 570
663 do 571 while (art)
664 { 572 {
665 if (!strcmp (art->item->name, cp)) 573 if (!strcmp (&art->item->name, cp))
666 break; 574 break;
575
667 art = art->next; 576 art = art->next;
668 } 577 }
669 while (art != NULL);
670 578
671 if (!art) 579 if (!art)
672 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); 580 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp);
673 } 581 }
674 582
675 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 583 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
676 } 584 }
677 } /* if cp */ 585 } /* if cp */
678 586
679 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 587 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
680 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 588 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
681 { 589 {
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); 590 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
683 return 1; 591 return 1;
684 } 592 }
685 593
686 /* 594 /*
687 * Rather than have two different blocks with a lot of similar code, 595 * Rather than have two different blocks with a lot of similar code,
688 * just create one object, do all the processing, and then determine 596 * 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. 597 * if that one object should be inserted or if we need to make copies.
690 */ 598 */
691 tmp = arch_to_object (at); 599 tmp = at->instance ();
692
693 if (settings.real_wiz == FALSE)
694 SET_FLAG (tmp, FLAG_WAS_WIZ);
695 600
696 if (set_magic) 601 if (set_magic)
697 set_abs_magic (tmp, magic); 602 set_abs_magic (tmp, magic);
698 603
699 if (art) 604 if (art)
700 give_artifact_abilities (tmp, art->item); 605 give_artifact_abilities (tmp, art->item);
701 606
702 if (need_identify (tmp)) 607 if (tmp->need_identify ())
703 { 608 {
704 SET_FLAG (tmp, FLAG_IDENTIFIED); 609 tmp->set_flag (FLAG_IDENTIFIED);
705 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 610 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
706 } 611 }
707 612
708 /* 613 /*
709 * This entire block here tries to find variable pairings, 614 * This entire block here tries to find variable pairings,
710 * eg, 'hp 4' or the like. The mess here is that values 615 * eg, 'hp 4' or the like. The mess here is that values
… …
712 * is we want to find two spaces, but if we got a quote, 617 * is we want to find two spaces, but if we got a quote,
713 * any spaces there don't count. 618 * any spaces there don't count.
714 */ 619 */
715 while (*bp2 && bp2 <= endline) 620 while (*bp2 && bp2 <= endline)
716 { 621 {
717 bp4 = NULL;
718 gotspace = 0; 622 gotspace = 0;
719 gotquote = 0; 623 gotquote = 0;
720 624
721 /* find the first quote */ 625 /* find the first quote */
722 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 626 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
779 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); 683 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
780 684
781 bp2 = bp3 + 1; 685 bp2 = bp3 + 1;
782 } 686 }
783 687
784 if (at->clone.nrof) 688 if (at->nrof)
785 { 689 {
786 if (at_spell) 690 if (at_spell)
787 insert_ob_in_ob (arch_to_object (at_spell), tmp); 691 tmp->insert (at_spell->instance ());
788 692
789 tmp->x = op->x; 693 tmp->x = op->x;
790 tmp->y = op->y; 694 tmp->y = op->y;
695 tmp->map = op->map;
791 696
792 if (set_nrof) 697 if (set_nrof)
793 tmp->nrof = nrof; 698 tmp->nrof = nrof;
794 699
795 tmp->map = op->map; 700 op->insert (tmp);
796
797 tmp = insert_ob_in_ob (tmp, op);
798 esrv_send_item (op, tmp);
799 701
800 /* Let's put this created item on stack so dm can access it easily. */ 702 /* Let's put this created item on stack so dm can access it easily. */
801 dm_stack_push (op->contr, tmp->count); 703 dm_stack_push (op->contr, tmp->count);
802 704
803 return 1; 705 return 1;
804 } 706 }
805 else 707 else
806 { 708 {
807 for (i = 0; i < (set_nrof ? nrof : 1); i++) 709 for (i = 0; i < (set_nrof ? nrof : 1); i++)
808 { 710 {
809 archetype *atmp;
810 object *prev = 0, *head = 0; 711 object *prev = 0, *head = 0;
811 712
812 for (atmp = at; atmp; atmp = atmp->more) 713 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
813 { 714 {
814 object *dup = arch_to_object (atmp); 715 object *dup = atmp->instance ();
815 716
816 if (at_spell) 717 if (at_spell)
817 insert_ob_in_ob (arch_to_object (at_spell), dup); 718 insert_ob_in_ob (at_spell->instance (), dup);
818 719
819 /* 720 /*
820 * The head is what contains all the important bits, 721 * The head is what contains all the important bits,
821 * so just copying it over should be fine. 722 * so just copying it over should be fine.
822 */ 723 */
823 if (!head) 724 if (!head)
824 { 725 {
825 head = dup; 726 head = dup;
826 copy_object (tmp, dup); 727 tmp->copy_to (dup);
827 } 728 }
828 729
829 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ);
831
832 dup->x = op->x + dup->arch->clone.x; 730 dup->x = op->x + dup->arch->x;
833 dup->y = op->y + dup->arch->clone.y; 731 dup->y = op->y + dup->arch->y;
834 dup->map = op->map; 732 dup->map = op->map;
835 733
836 if (head != dup) 734 if (head != dup)
837 { 735 {
838 dup->head = head; 736 dup->head = head;
… …
840 } 738 }
841 739
842 prev = dup; 740 prev = dup;
843 } 741 }
844 742
845 if (QUERY_FLAG (head, FLAG_ALIVE)) 743 if (head->flag [FLAG_ALIVE])
846 { 744 {
847 object *check = head; 745 object *check = head;
848 int size_x = 0; 746 int size_x = 0;
849 int size_y = 0; 747 int size_y = 0;
850 748
851 while (check) 749 while (check)
852 { 750 {
853 size_x = MAX (size_x, check->arch->clone.x); 751 size_x = max (size_x, check->arch->x);
854 size_y = MAX (size_y, check->arch->clone.y); 752 size_y = max (size_y, check->arch->y);
855 check = check->more; 753 check = check->more;
856 } 754 }
857 755
858 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 756 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
859 { 757 {
860 if (head->x < size_x || head->y < size_y) 758 if (head->x < size_x || head->y < size_y)
861 { 759 {
862 dm_stack_pop (op->contr); 760 dm_stack_pop (op->contr);
863 free_object (head); 761 head->destroy ();
864 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 762 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
865 free_object (tmp); 763 tmp->destroy ();
866 return 1; 764 return 1;
867 } 765 }
868 766
869 check = head; 767 check = head;
870 768
… …
885 /* Wonder if we really want to push all of these, but since 783 /* Wonder if we really want to push all of these, but since
886 * things like rods have nrof 0, we want to cover those. 784 * things like rods have nrof 0, we want to cover those.
887 */ 785 */
888 dm_stack_push (op->contr, head->count); 786 dm_stack_push (op->contr, head->count);
889 787
890 if (at->clone.randomitems != NULL && !at_spell) 788 if (at->randomitems && !at_spell)
891 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 789 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
892
893 esrv_send_item (op, head);
894 } 790 }
895 791
896 /* free the one we used to copy */ 792 /* free the one we used to copy */
897 free_object (tmp); 793 tmp->destroy ();
898 } 794 }
899 795
900 return 1; 796 return 1;
901} 797}
902 798
… …
905 */ 801 */
906 802
907int 803int
908command_inventory (object *op, char *params) 804command_inventory (object *op, char *params)
909{ 805{
806 int i;
910 object *tmp; 807 object *tmp;
911 int i;
912 808
913 if (!params) 809 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
914 { 810 {
915 inventory (op, NULL); 811 op->contr->failmsg ("Inventory of what object (nr)?");
916 return 0; 812 return 1;
917 }
918
919 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
920 { 813 }
921 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
922 return 1;
923 }
924 814
925 inventory (op, tmp); 815 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
816
926 return 1; 817 return 1;
927} 818}
928 819
929/* just show player's their skills for now. Dm's can 820/* just show player's their skills for now. Dm's can
930 * already see skills w/ inventory command - b.t. 821 * already see skills w/ inventory command - b.t.
… …
944 835
945 tmp = get_dm_object (op->contr, &params, NULL); 836 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 837 if (!tmp)
947 return 1; 838 return 1;
948 839
949 dump_object (tmp); 840 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 841 new_draw_info (NDI_UNIQUE, 0, op, dump);
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 842 free (dump);
843
844 if (tmp->flag [FLAG_OBJ_ORIGINAL])
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 845 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
953 return 1;
954}
955 846
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; 847 return 1;
1057} 848}
1058 849
1059int 850int
1060command_patch (object *op, char *params) 851command_patch (object *op, char *params)
… …
1075 return 1; 866 return 1;
1076 } 867 }
1077 868
1078 if ((arg2 = strchr (arg, ' '))) 869 if ((arg2 = strchr (arg, ' ')))
1079 arg2++; 870 arg2++;
1080 if (settings.real_wiz == FALSE) 871
1081 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1082 if (set_variable (tmp, arg) == -1) 872 if (set_variable (tmp, arg) == -1)
1083 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); 873 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
1084 else 874 else
1085 {
1086 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); 875 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
1087 }
1088 876
1089 return 1; 877 return 1;
1090} 878}
1091 879
1092int 880int
… …
1106 { 894 {
1107 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 895 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
1108 return 1; 896 return 1;
1109 } 897 }
1110 898
1111 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 899 if (tmp->flag [FLAG_REMOVED])
1112 { 900 {
1113 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 901 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
1114 return 1; 902 return 1;
1115 } 903 }
1116 904
… …
1119 dm_stack_pop (op->contr); 907 dm_stack_pop (op->contr);
1120 908
1121 /* Always work on the head - otherwise object will get in odd state */ 909 /* Always work on the head - otherwise object will get in odd state */
1122 if (tmp->head) 910 if (tmp->head)
1123 tmp = tmp->head; 911 tmp = tmp->head;
1124 remove_ob (tmp); 912 tmp->remove ();
1125 return 1; 913 return 1;
1126} 914}
1127 915
1128int 916int
1129command_free (object *op, char *params) 917command_free (object *op, char *params)
… …
1141 929
1142 if (from != STACK_FROM_STACK) 930 if (from != STACK_FROM_STACK)
1143 /* Item is either stack top, or is a number thus is now stack top, let's remove it */ 931 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1144 dm_stack_pop (op->contr); 932 dm_stack_pop (op->contr);
1145 933
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) 934 if (tmp->head)
1153 tmp = tmp->head; 935 tmp = tmp->head;
1154 free_object (tmp); 936
937 tmp->destroy ();
1155 return 1; 938 return 1;
1156} 939}
1157 940
1158/** 941/**
1159 * This adds exp to a player. We now allow adding to a specific skill. 942 * This adds exp to a player. We now allow adding to a specific skill.
1160 */ 943 */
1161int 944int
1162command_addexp (object *op, char *params) 945command_addexp (object *op, char *params)
1163{ 946{
1164 char buf[MAX_BUF], skill[MAX_BUF]; 947 char buf[MAX_BUF], skill[MAX_BUF];
1165 int i, q; 948 int q;
949 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1166 object *skillob = NULL; 950 object *skillob = NULL;
1167 player *pl;
1168 951
1169 skill[0] = '\0'; 952 skill[0] = '\0';
1170 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 953 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %[^\n]", buf, &i, skill)) < 2))
1171 { 954 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 955 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1173 return 1; 956 return 1;
1174 } 957 }
1175 958
1176 for (pl = first_player; pl != NULL; pl = pl->next) 959 for_all_players (pl)
1177 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 960 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1178 break;
1179
1180 if (pl == NULL)
1181 { 961 {
1182 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1;
1184 }
1185
1186 if (q >= 3) 962 if (q >= 3)
1187 { 963 {
1188 skillob = find_skill_by_name (pl->ob, skill); 964 skillob = find_skill_by_name (pl->ob, skill);
1189 if (!skillob) 965 if (!skillob)
1190 { 966 {
1191 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 967 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
968 return 1;
969 }
970
971 i = check_exp_adjust (skillob, i);
972 skillob->stats.exp += i;
973 calc_perm_exp (skillob);
974 player_lvl_adj (pl->ob, skillob);
975 }
976
977 pl->ob->stats.exp += i;
978 calc_perm_exp (pl->ob);
979 player_lvl_adj (pl->ob, NULL);
980
1192 return 1; 981 return 1;
1193 } 982 }
1194 983
1195 i = check_exp_adjust (skillob, i); 984 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; 985 return 1;
1208} 986}
1209 987
1210/**************************************************************************/ 988/**************************************************************************/
1211 989
… …
1216/**************************************************************************/ 994/**************************************************************************/
1217 995
1218int 996int
1219command_stats (object *op, char *params) 997command_stats (object *op, char *params)
1220{ 998{
1221 char thing[20];
1222 player *pl;
1223 char buf[MAX_BUF]; 999 char buf[MAX_BUF];
1224 1000
1225 thing[0] = '\0'; 1001 if (params == NULL || params[0] == '\0')
1226 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1227 { 1002 {
1228 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1003 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1229 return 1; 1004 return 1;
1230 } 1005 }
1231 1006
1232 for (pl = first_player; pl != NULL; pl = pl->next) 1007 for_all_players (pl)
1233 if (!strcmp (pl->ob->name, thing)) 1008 if (!strcmp (&pl->ob->name, params))
1234 { 1009 {
1235 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1010 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1011 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); 1012 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); 1013 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); 1014 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); 1015 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1016 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1017 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); 1018 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1019 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1020 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1021 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1022 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1023 new_draw_info (NDI_UNIQUE, 0, op, buf);
1249 break; 1024 return 1;
1250 } 1025 }
1251 if (pl == NULL) 1026
1252 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1027 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1253 return 1; 1028 return 1;
1254} 1029}
1255 1030
1256int 1031int
1257command_abil (object *op, char *params) 1032command_abil (object *op, char *params)
1258{ 1033{
1259 char thing[20], thing2[20]; 1034 char thing[20], thing2[20];
1260 int iii; 1035 int iii;
1261 player *pl;
1262 char buf[MAX_BUF]; 1036 char buf[MAX_BUF];
1263 1037
1264 iii = 0; 1038 iii = 0;
1265 thing[0] = '\0'; 1039 thing[0] = '\0';
1266 thing2[0] = '\0'; 1040 thing2[0] = '\0';
… …
1280 { 1054 {
1281 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1055 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1282 return 1; 1056 return 1;
1283 } 1057 }
1284 1058
1285 for (pl = first_player; pl != NULL; pl = pl->next) 1059 for_all_players (pl)
1286 { 1060 {
1287 if (!strcmp (pl->ob->name, thing)) 1061 if (!strcmp (&pl->ob->name, thing))
1288 { 1062 {
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; 1063 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; 1064 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; 1065 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; 1066 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; 1067 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; 1068 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; 1069 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
1070
1305 sprintf (buf, "%s has been altered.", &pl->ob->name); 1071 sprintf (buf, "%s has been altered.", &pl->ob->name);
1306 new_draw_info (NDI_UNIQUE, 0, op, buf); 1072 new_draw_info (NDI_UNIQUE, 0, op, buf);
1307 fix_player (pl->ob); 1073 pl->ob->update_stats ();
1308 return 1; 1074 return 1;
1309 } 1075 }
1310 } 1076 }
1311 1077
1312 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1078 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1313 return 1; 1079 return 1;
1314} 1080}
1315 1081
1316int 1082int
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)
1407{ /* 'noadm' is alias */
1408 CLEAR_FLAG (op, FLAG_WIZ);
1409 CLEAR_FLAG (op, FLAG_WIZPASS);
1410 CLEAR_FLAG (op, FLAG_WIZCAST);
1411
1412 if (settings.real_wiz == TRUE)
1413 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1414 if (op->contr->hidden)
1415 {
1416 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1417 op->map->players++;
1418 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;
1420 op->invisible = 1;
1421 }
1422 else
1423 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1424 return 1;
1425}
1426
1427/**
1428 * object *op is trying to become dm.
1429 * pl_name is name supplied by player. Restrictive DM will make it harder
1430 * for socket users to become DM - in that case, it will check for the players
1431 * character name.
1432 */
1433static int
1434checkdm (object *op, const char *pl_name, const char *pl_passwd, const char *pl_host)
1435{
1436 FILE *dmfile;
1437 char buf[MAX_BUF];
1438 char line_buf[160], name[160], passwd[160], host[160];
1439
1440#ifdef RESTRICTIVE_DM
1441 *pl_name = op->name ? op->name : "*";
1442#endif
1443
1444 sprintf (buf, "%s/%s", settings.confdir, DMFILE);
1445 if ((dmfile = fopen (buf, "r")) == NULL)
1446 {
1447 LOG (llevDebug, "Could not find DM file.\n");
1448 return 0;
1449 }
1450
1451 while (fgets (line_buf, 160, dmfile) != NULL)
1452 {
1453 if (line_buf[0] == '#')
1454 continue;
1455 if (sscanf (line_buf, "%[^:]:%[^:]:%s\n", name, passwd, host) != 3)
1456 {
1457 LOG (llevError, "Warning - malformed dm file entry: %s\n", line_buf);
1458 }
1459 else if ((!strcmp (name, "*") || (pl_name && !strcmp (pl_name, name)))
1460 && (!strcmp (passwd, "*") || !strcmp (passwd, pl_passwd)) && (!strcmp (host, "*") || !strcmp (host, pl_host)))
1461 {
1462 fclose (dmfile);
1463 return (1);
1464 }
1465 }
1466 fclose (dmfile);
1467 return (0);
1468}
1469
1470int
1471do_wizard_dm (object *op, char *params, int silent)
1472{
1473 if (!op->contr)
1474 return 0;
1475
1476 if (QUERY_FLAG (op, FLAG_WIZ))
1477 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1479 return 0;
1480 }
1481
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host))
1483 {
1484 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST);
1488 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';
1497
1498 if (!silent)
1499 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1500
1501 return 1;
1502 }
1503 else
1504 {
1505 new_draw_info (NDI_UNIQUE, 0, op, "Sorry Pal, I don't think so.");
1506 op->contr->write_buf[0] = '\0';
1507 return 0;
1508 }
1509}
1510
1511/*
1512 * Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2
1513 * - allow people on sockets to become dm, and allow better dm file
1514 */
1515int
1516command_dm (object *op, char *params)
1517{
1518 if (!op->contr)
1519 return 0;
1520
1521 do_wizard_dm (op, params, 0);
1522
1523 return 1;
1524}
1525
1526int
1527command_invisible (object *op, char *params) 1083command_invisible (object *op, char *params)
1528{ 1084{
1529 if (op) 1085 if (op)
1530 { 1086 {
1531 op->invisible += 100; 1087 op->invisible += TIME2TICK (60);
1532 update_object (op, UP_OBJ_FACE); 1088 update_object (op, UP_OBJ_CHANGE);
1533 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1089 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1534 } 1090 }
1535 1091
1536 return 0; 1092 return 0;
1537} 1093}
… …
1540 * Returns spell object (from archetypes) by name. 1096 * Returns spell object (from archetypes) by name.
1541 * Returns NULL if 0 or more than one spell matches. 1097 * Returns NULL if 0 or more than one spell matches.
1542 * Used for wizard's learn spell/prayer. 1098 * Used for wizard's learn spell/prayer.
1543 * 1099 *
1544 * op is the player issuing the command. 1100 * 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 */ 1101 */
1551static object * 1102static object *
1552get_spell_by_name (object *op, const char *spell_name) 1103get_spell_by_name (object *op, shstr_cmp spell_name)
1553{ 1104{
1554 archetype *ar;
1555 archetype *found;
1556 int conflict_found;
1557 size_t spell_name_length;
1558
1559 /* First check for full name matches. */ 1105 /* First check for full name matches. */
1560 conflict_found = 0; 1106 int conflict_found = 0;
1561 found = NULL; 1107 archetype *found = 0;
1562 for (ar = first_archetype; ar != NULL; ar = ar->next) 1108
1109 for_all_archetypes (at)
1563 { 1110 {
1564 if (ar->clone.type != SPELL) 1111 if (at->type != SPELL)
1565 continue; 1112 continue;
1566 1113
1567 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1114 if (at->object::name != spell_name)
1568 continue; 1115 continue;
1569 1116
1570 if (strcmp (ar->clone.name, spell_name) != 0)
1571 continue;
1572
1573 if (found != NULL) 1117 if (found)
1574 { 1118 {
1575 if (!conflict_found) 1119 if (!conflict_found)
1576 { 1120 {
1577 conflict_found = 1; 1121 conflict_found = 1;
1578 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1122 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1579 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1123 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1580 } 1124 }
1125
1581 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1126 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1582 continue; 1127 return 0;
1583 } 1128 }
1584 1129
1585 found = ar; 1130 found = at;
1586 } 1131 }
1587
1588 /* No match if more more than one archetype matches. */
1589 if (conflict_found)
1590 return NULL;
1591 1132
1592 /* Return if exactly one archetype matches. */ 1133 /* Return if exactly one archetype matches. */
1593 if (found != NULL) 1134 if (found)
1594 return arch_to_object (found); 1135 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 1136
1634 /* No spell found: just print an error message. */ 1137 /* 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); 1138 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell does not exist.");
1139
1636 return NULL; 1140 return 0;
1637} 1141}
1638 1142
1639static int 1143static int
1640command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1144command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1641{ 1145{
… …
1658 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1162 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1659 return 0; 1163 return 0;
1660 } 1164 }
1661 1165
1662 do_learn_spell (op, tmp, special_prayer); 1166 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1167 tmp->destroy ();
1664 return 1; 1168 return 1;
1665} 1169}
1666 1170
1667int 1171int
1668command_learn_spell (object *op, char *params) 1172command_learn_spell (object *op, char *params)
… …
1685 { 1189 {
1686 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?"); 1190 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
1687 return 0; 1191 return 0;
1688 } 1192 }
1689 1193
1690 spell = lookup_spell_by_name (op, params); 1194 spell = op->find_spell (params);
1691 if (spell == NULL) 1195 if (spell == NULL)
1692 { 1196 {
1693 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1197 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1694 return 0; 1198 return 0;
1695 } 1199 }
1696 1200
1697 do_forget_spell (op, spell->name); 1201 do_forget_spell (op, spell->name);
1698 return 1; 1202 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;
1757}
1758
1759/**
1760 * A players wants to become DM and hide.
1761 * Let's see if that's authorized.
1762 * Make sure to not tell anything to anyone.
1763 */
1764int
1765command_dmhide (object *op, char *params)
1766{
1767 if (!do_wizard_dm (op, params, 1))
1768 return 0;
1769
1770 do_wizard_hide (op, 1);
1771
1772 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} 1203}
1963 1204
1964/** 1205/**
1965 * Pop the stack top. 1206 * Pop the stack top.
1966 */ 1207 */
… …
2026} 1267}
2027 1268
2028int 1269int
2029command_insert_into (object *op, char *params) 1270command_insert_into (object *op, char *params)
2030{ 1271{
2031 object *left, *right, *inserted; 1272 object *left, *right;
2032 int left_from, right_from; 1273 int left_from, right_from;
2033 1274
2034 left = get_dm_object (op->contr, &params, &left_from); 1275 left = get_dm_object (op->contr, &params, &left_from);
2035 if (!left) 1276 if (!left)
2036 { 1277 {
… …
2079 { 1320 {
2080 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1321 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2081 return 0; 1322 return 0;
2082 } 1323 }
2083 1324
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1325 if (!right->flag [FLAG_REMOVED])
2085 remove_ob (right); 1326 right->remove ();
1327
2086 inserted = insert_ob_in_ob (right, left); 1328 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 1329
2093 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1330 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
2094 1331
2095 return 0; 1332 return 0;
2096 1333

Diff Legend

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