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.12 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.91 by root, Wed Nov 21 12:12:03 2012 UTC

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

Diff Legend

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