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.14 by root, Sat Sep 16 22:24:13 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 for (player *pl = first_player; pl; pl = pl->next)
272 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
273 {
274 object *op = pl->ob;
275
276 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
277 {
278 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
279 strcpy (op->contr->killer, "kicked");
280 }
281
282 pl->socket.status = Ns_Dead;
283 }
284
285 return 1;
286}
287
288int
289command_save_overlay (object *op, char *params)
290{
291 if (!op)
292 return 0;
293
294 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
295 {
296 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
297 return 1;
298 }
299
300 new_save_map (op->map, 2);
301 new_save_map (op->map, 0);
302 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
303
304 ready_map_name (op->map->path, 0);
305
306 return 1;
307}
308
309int
310command_shutdown (object *op, char *params)
311{
312 struct pl *pl;
313
314 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
315 {
316 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
317 return 1;
318 }
319
320 cleanup ();
321 /* not reached */
322 return 1;
323}
324
325int
326command_goto (object *op, char *params)
327{
328 char *name;
329 object *dummy;
330
331 if (!op)
332 return 0;
333
334 if (params == NULL)
335 {
336 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
337 return 1;
338 }
339
340 name = params;
341 dummy = get_object ();
342 dummy->map = op->map;
343 EXIT_PATH (dummy) = name;
344 dummy->name = name;
345
346 enter_exit (op, dummy);
347 free_object (dummy);
348 if (op->contr->loading == NULL)
349 {
350 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
351 }
352
353 return 1;
354}
355
356/* is this function called from somewhere ? -Tero */
357int
358command_generate (object *op, char *params)
359{
360 object *tmp;
361 int nr = 1, i, retry;
362
363 if (!op)
364 return 0;
365
366 if (params != NULL)
367 sscanf (params, "%d", &nr);
368 for (i = 0; i < nr; i++)
369 {
370 retry = 50;
371 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
372 ;
373 if (tmp != NULL)
374 {
375 tmp = insert_ob_in_ob (tmp, op);
376 if (op->type == PLAYER)
377 esrv_send_item (op, tmp);
378 }
379 }
380
381 return 1; 362 return 1;
382} 363}
383 364
384int 365int
385command_freeze (object *op, char *params) 366command_freeze (object *op, char *params)
… …
423 object *dummy; 404 object *dummy;
424 player *pl; 405 player *pl;
425 406
426 if (!op) 407 if (!op)
427 return 0; 408 return 0;
409
428 if (params == NULL) 410 if (params == NULL)
429 { 411 {
430 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 412 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
431 return 1; 413 return 1;
432 } 414 }
415
433 pl = get_other_player_from_name (op, params); 416 pl = get_other_player_from_name (op, params);
434 if (!pl) 417 if (!pl)
435 return 1; 418 return 1;
419
436 dummy = get_jail_exit (pl->ob); 420 dummy = get_jail_exit (pl->ob);
437 if (!dummy) 421 if (!dummy)
438 { 422 {
439 /* we have nowhere to send the prisoner.... */ 423 /* we have nowhere to send the prisoner.... */
440 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");
441 return 0; 425 return 0;
442 } 426 }
443 enter_exit (pl->ob, dummy); 427
444 free_object (dummy); 428 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
429 dummy->destroy ();
430
445 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.");
446 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 432 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
447 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);
448 return 1; 434 return 1;
449} 435}
450 436
451int 437int
452command_summon (object *op, char *params) 438command_summon (object *op, char *params)
453{ 439{
454 int i; 440 int i;
455 object *dummy;
456 player *pl; 441 player *pl;
457 442
458 if (!op) 443 if (!op)
459 return 0; 444 return 0;
460 445
… …
466 451
467 pl = get_other_player_from_name (op, params); 452 pl = get_other_player_from_name (op, params);
468 if (!pl) 453 if (!pl)
469 return 1; 454 return 1;
470 455
471 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);
472 if (i == -1) 461 if (i == -1)
473 { 462 {
474 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.");
475 return 1; 464 return 1;
476 } 465 }
477 466
478 dummy = get_object (); 467 nx += freearr_x [i];
479 EXIT_PATH (dummy) = op->map->path; 468 ny += freearr_y [i];
480 EXIT_X (dummy) = op->x + freearr_x[i]; 469
481 EXIT_Y (dummy) = op->y + freearr_y[i]; 470 if (!xy_normalise (m, nx, ny))
482 enter_exit (pl->ob, dummy); 471 {
483 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);
484 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 477 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
485 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 478 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
486 479
487 return 1;
488}
489
490/**
491 * Teleport next to target player.
492 */
493
494/* mids 01/16/2002 */
495int
496command_teleport (object *op, char *params)
497{
498 int i;
499 object *dummy;
500 player *pl;
501
502 if (!op)
503 return 0;
504
505 if (params == NULL)
506 {
507 new_draw_info (NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
508 return 1;
509 }
510
511 pl = get_other_player_from_name (op, params);
512 if (!pl)
513 return 1;
514
515 i = find_free_spot (pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
516 if (i == -1)
517 {
518 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
519 return 1;
520 }
521
522 dummy = get_object ();
523 EXIT_PATH (dummy) = pl->ob->map->path;
524 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
525 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
526 enter_exit (op, dummy);
527 free_object (dummy);
528 if (!op->contr->hidden)
529 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
530 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
531 return 1; 480 return 1;
532} 481}
533 482
534/** 483/**
535 * This function is a real mess, because we're stucking getting 484 * This function is a real mess, because we're stucking getting
… …
549int 498int
550command_create (object *op, char *params) 499command_create (object *op, char *params)
551{ 500{
552 object *tmp = NULL; 501 object *tmp = NULL;
553 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;
554 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 503 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *endline;
555 archetype *at, *at_spell = NULL; 504 archetype *at, *at_spell = NULL;
556 artifact *art = NULL; 505 artifact *art = NULL;
557 506
558 if (!op) 507 if (!op)
559 return 0; 508 return 0;
… …
625 * we also set up spell_name which is only 574 * we also set up spell_name which is only
626 * the first word. 575 * the first word.
627 */ 576 */
628 577
629 at_spell = archetype::find (cp); 578 at_spell = archetype::find (cp);
630 if (!at_spell || at_spell->clone.type != SPELL) 579 if (!at_spell || at_spell->type != SPELL)
631 at_spell = find_archetype_by_object_name (cp); 580 at_spell = find_archetype_by_object_name (cp);
632 if (!at_spell || at_spell->clone.type != SPELL) 581 if (!at_spell || at_spell->type != SPELL)
633 { 582 {
634 strcpy (spell_name, cp); 583 assign (spell_name, cp);
635 fsp = strchr (spell_name, ' '); 584 fsp = strchr (spell_name, ' ');
636 if (fsp) 585 if (fsp)
637 { 586 {
638 *fsp = 0; 587 *fsp = 0;
639 fsp++; 588 fsp++;
640 at_spell = archetype::find (spell_name); 589 at_spell = archetype::find (spell_name);
641 590
642 /* Got a spell, update the first string pointer */ 591 /* Got a spell, update the first string pointer */
643 if (at_spell && at_spell->clone.type == SPELL) 592 if (at_spell && at_spell->type == SPELL)
644 bp2 = cp + strlen (spell_name) + 1; 593 bp2 = cp + strlen (spell_name) + 1;
645 else 594 else
646 at_spell = NULL; 595 at_spell = NULL;
647 } 596 }
648 } 597 }
… …
650 /* OK - we didn't find a spell - presume the 'of' 599 /* OK - we didn't find a spell - presume the 'of'
651 * in this case means its an artifact. 600 * in this case means its an artifact.
652 */ 601 */
653 if (!at_spell) 602 if (!at_spell)
654 { 603 {
655 if (find_artifactlist (at->clone.type) == NULL) 604 if (find_artifactlist (at->type) == NULL)
656 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);
657 else 606 else
658 { 607 {
659 art = find_artifactlist (at->clone.type)->items; 608 art = find_artifactlist (at->type)->items;
660 609
661 do 610 while (art)
662 { 611 {
663 if (!strcmp (art->item->name, cp)) 612 if (!strcmp (&art->item->name, cp))
664 break; 613 break;
614
665 art = art->next; 615 art = art->next;
666 } 616 }
667 while (art != NULL);
668 617
669 if (!art) 618 if (!art)
670 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);
671 } 620 }
672 621
673 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);
674 } 623 }
675 } /* if cp */ 624 } /* if cp */
676 625
677 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 626 if ((at->type == ROD || at->type == WAND || at->type == SCROLL ||
678 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) 627 at->type == HORN || at->type == SPELLBOOK) && !at_spell)
679 { 628 {
680 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);
681 return 1; 630 return 1;
682 } 631 }
683 632
684 /* 633 /*
685 * 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,
686 * just create one object, do all the processing, and then determine 635 * just create one object, do all the processing, and then determine
687 * 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.
688 */ 637 */
689 tmp = arch_to_object (at); 638 tmp = at->instance ();
690
691 if (settings.real_wiz == FALSE)
692 SET_FLAG (tmp, FLAG_WAS_WIZ);
693 639
694 if (set_magic) 640 if (set_magic)
695 set_abs_magic (tmp, magic); 641 set_abs_magic (tmp, magic);
696 642
697 if (art) 643 if (art)
698 give_artifact_abilities (tmp, art->item); 644 give_artifact_abilities (tmp, art->item);
699 645
700 if (need_identify (tmp)) 646 if (tmp->need_identify ())
701 { 647 {
702 SET_FLAG (tmp, FLAG_IDENTIFIED); 648 tmp->set_flag (FLAG_IDENTIFIED);
703 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 649 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
704 } 650 }
705 651
706 /* 652 /*
707 * This entire block here tries to find variable pairings, 653 * This entire block here tries to find variable pairings,
708 * 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
… …
710 * 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,
711 * any spaces there don't count. 657 * any spaces there don't count.
712 */ 658 */
713 while (*bp2 && bp2 <= endline) 659 while (*bp2 && bp2 <= endline)
714 { 660 {
715 bp4 = NULL;
716 gotspace = 0; 661 gotspace = 0;
717 gotquote = 0; 662 gotquote = 0;
718 663
719 /* find the first quote */ 664 /* find the first quote */
720 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) 665 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
… …
777 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);
778 723
779 bp2 = bp3 + 1; 724 bp2 = bp3 + 1;
780 } 725 }
781 726
782 if (at->clone.nrof) 727 if (at->nrof)
783 { 728 {
784 if (at_spell) 729 if (at_spell)
785 insert_ob_in_ob (arch_to_object (at_spell), tmp); 730 tmp->insert (at_spell->instance ());
786 731
787 tmp->x = op->x; 732 tmp->x = op->x;
788 tmp->y = op->y; 733 tmp->y = op->y;
734 tmp->map = op->map;
789 735
790 if (set_nrof) 736 if (set_nrof)
791 tmp->nrof = nrof; 737 tmp->nrof = nrof;
792 738
793 tmp->map = op->map; 739 op->insert (tmp);
794
795 tmp = insert_ob_in_ob (tmp, op);
796 esrv_send_item (op, tmp);
797 740
798 /* 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. */
799 dm_stack_push (op->contr, tmp->count); 742 dm_stack_push (op->contr, tmp->count);
800 743
801 return 1; 744 return 1;
802 } 745 }
803 else 746 else
804 { 747 {
805 for (i = 0; i < (set_nrof ? nrof : 1); i++) 748 for (i = 0; i < (set_nrof ? nrof : 1); i++)
806 { 749 {
807 archetype *atmp;
808 object *prev = 0, *head = 0; 750 object *prev = 0, *head = 0;
809 751
810 for (atmp = at; atmp; atmp = atmp->more) 752 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
811 { 753 {
812 object *dup = arch_to_object (atmp); 754 object *dup = atmp->instance ();
813 755
814 if (at_spell) 756 if (at_spell)
815 insert_ob_in_ob (arch_to_object (at_spell), dup); 757 insert_ob_in_ob (at_spell->instance (), dup);
816 758
817 /* 759 /*
818 * The head is what contains all the important bits, 760 * The head is what contains all the important bits,
819 * so just copying it over should be fine. 761 * so just copying it over should be fine.
820 */ 762 */
821 if (!head) 763 if (!head)
822 { 764 {
823 head = dup; 765 head = dup;
824 copy_object (tmp, dup); 766 tmp->copy_to (dup);
825 } 767 }
826 768
827 if (settings.real_wiz == FALSE)
828 SET_FLAG (dup, FLAG_WAS_WIZ);
829
830 dup->x = op->x + dup->arch->clone.x; 769 dup->x = op->x + dup->arch->x;
831 dup->y = op->y + dup->arch->clone.y; 770 dup->y = op->y + dup->arch->y;
832 dup->map = op->map; 771 dup->map = op->map;
833 772
834 if (head != dup) 773 if (head != dup)
835 { 774 {
836 dup->head = head; 775 dup->head = head;
… …
838 } 777 }
839 778
840 prev = dup; 779 prev = dup;
841 } 780 }
842 781
843 if (QUERY_FLAG (head, FLAG_ALIVE)) 782 if (head->flag [FLAG_ALIVE])
844 { 783 {
845 object *check = head; 784 object *check = head;
846 int size_x = 0; 785 int size_x = 0;
847 int size_y = 0; 786 int size_y = 0;
848 787
849 while (check) 788 while (check)
850 { 789 {
851 size_x = MAX (size_x, check->arch->clone.x); 790 size_x = max (size_x, check->arch->x);
852 size_y = MAX (size_y, check->arch->clone.y); 791 size_y = max (size_y, check->arch->y);
853 check = check->more; 792 check = check->more;
854 } 793 }
855 794
856 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))
857 { 796 {
858 if (head->x < size_x || head->y < size_y) 797 if (head->x < size_x || head->y < size_y)
859 { 798 {
860 dm_stack_pop (op->contr); 799 dm_stack_pop (op->contr);
861 free_object (head); 800 head->destroy ();
862 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.");
863 free_object (tmp); 802 tmp->destroy ();
864 return 1; 803 return 1;
865 } 804 }
866 805
867 check = head; 806 check = head;
868 807
… …
883 /* 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
884 * things like rods have nrof 0, we want to cover those. 823 * things like rods have nrof 0, we want to cover those.
885 */ 824 */
886 dm_stack_push (op->contr, head->count); 825 dm_stack_push (op->contr, head->count);
887 826
888 if (at->clone.randomitems != NULL && !at_spell) 827 if (at->randomitems && !at_spell)
889 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); 828 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
890
891 esrv_send_item (op, head);
892 } 829 }
893 830
894 /* free the one we used to copy */ 831 /* free the one we used to copy */
895 free_object (tmp); 832 tmp->destroy ();
896 } 833 }
897 834
898 return 1; 835 return 1;
899} 836}
900 837
… …
903 */ 840 */
904 841
905int 842int
906command_inventory (object *op, char *params) 843command_inventory (object *op, char *params)
907{ 844{
845 int i;
908 object *tmp; 846 object *tmp;
909 int i;
910 847
911 if (!params) 848 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
912 { 849 {
913 inventory (op, NULL); 850 op->contr->failmsg ("Inventory of what object (nr)?");
914 return 0; 851 return 1;
915 }
916
917 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
918 { 852 }
919 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
920 return 1;
921 }
922 853
923 inventory (op, tmp); 854 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
855
924 return 1; 856 return 1;
925} 857}
926 858
927/* just show player's their skills for now. Dm's can 859/* just show player's their skills for now. Dm's can
928 * already see skills w/ inventory command - b.t. 860 * already see skills w/ inventory command - b.t.
… …
942 874
943 tmp = get_dm_object (op->contr, &params, NULL); 875 tmp = get_dm_object (op->contr, &params, NULL);
944 if (!tmp) 876 if (!tmp)
945 return 1; 877 return 1;
946 878
947 dump_object (tmp); 879 char *dump = dump_object (tmp);
948 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 880 new_draw_info (NDI_UNIQUE, 0, op, dump);
949 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 881 free (dump);
882
883 if (tmp->flag [FLAG_OBJ_ORIGINAL])
950 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 884 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
951 return 1;
952}
953 885
954/**
955 * When DM is possessing a monster, flip aggression on and off, to allow
956 * better motion.
957 */
958int
959command_mon_aggr (object *op, char *params)
960{
961 if (op->enemy || !QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
962 {
963 op->enemy = NULL;
964 SET_FLAG (op, FLAG_UNAGGRESSIVE);
965 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned OFF");
966 }
967 else
968 {
969 CLEAR_FLAG (op, FLAG_FRIENDLY);
970 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
971 new_draw_info (NDI_UNIQUE, 0, op, "Aggression turned ON");
972 }
973
974 return 1;
975}
976
977/** DM can possess a monster. Basically, this tricks the client into thinking
978 * a given monster, is actually the player it controls. This allows a DM
979 * to inhabit a monster's body, and run around the game with it.
980 * This function is severely broken - it has tons of hardcoded values,
981 */
982int
983command_possess (object *op, char *params)
984{
985 object *victim, *curinv, *nextinv;
986 player *pl;
987 int i;
988 char buf[MAX_BUF];
989
990 victim = NULL;
991 if (params != NULL)
992 {
993 if (sscanf (params, "%d", &i))
994 victim = find_object (i);
995 else if (sscanf (params, "%s", buf))
996 victim = find_object_name (buf);
997 }
998 if (victim == NULL)
999 {
1000 new_draw_info (NDI_UNIQUE, 0, op, "Patch what object (nr)?");
1001 return 1;
1002 }
1003
1004 if (victim == op)
1005 {
1006 new_draw_info (NDI_UNIQUE, 0, op, "As insane as you are, I cannot " "allow you to possess yourself.");
1007 return 1;
1008 }
1009
1010 /* clear out the old inventory */
1011 curinv = op->inv;
1012 while (curinv != NULL)
1013 {
1014 nextinv = curinv->below;
1015 esrv_del_item (op->contr, curinv->count);
1016 curinv = nextinv;
1017 }
1018
1019 /* make the switch */
1020 pl = op->contr;
1021 victim->contr = pl;
1022 pl->ob = victim;
1023 victim->type = PLAYER;
1024 SET_FLAG (victim, FLAG_WIZ);
1025
1026 /* send the inventory to the client */
1027 curinv = victim->inv;
1028 while (curinv != NULL)
1029 {
1030 nextinv = curinv->below;
1031 esrv_send_item (victim, curinv);
1032 curinv = nextinv;
1033 }
1034 /* basic patchup */
1035 /* The use of hard coded values is terrible. Note
1036 * that really, to be fair, this shouldn't get changed at
1037 * all - if you are possessing a kobold, you should have the
1038 * same limitations. As it is, as more body locations are added,
1039 * this will give this player more locations than perhaps
1040 * they should be allowed.
1041 */
1042 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1043 if (i == 1 || i == 6 || i == 8 || i == 9)
1044 victim->body_info[i] = 2;
1045 else
1046 victim->body_info[i] = 1;
1047
1048 esrv_new_player (pl, 80); /* just pick a wieght, we don't care */
1049 esrv_send_inventory (victim, victim);
1050
1051 fix_player (victim);
1052
1053 do_some_living (victim);
1054 return 1; 886 return 1;
1055} 887}
1056 888
1057int 889int
1058command_patch (object *op, char *params) 890command_patch (object *op, char *params)
… …
1073 return 1; 905 return 1;
1074 } 906 }
1075 907
1076 if ((arg2 = strchr (arg, ' '))) 908 if ((arg2 = strchr (arg, ' ')))
1077 arg2++; 909 arg2++;
1078 if (settings.real_wiz == FALSE) 910
1079 SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */
1080 if (set_variable (tmp, arg) == -1) 911 if (set_variable (tmp, arg) == -1)
1081 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);
1082 else 913 else
1083 {
1084 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);
1085 }
1086 915
1087 return 1; 916 return 1;
1088} 917}
1089 918
1090int 919int
… …
1104 { 933 {
1105 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!");
1106 return 1; 935 return 1;
1107 } 936 }
1108 937
1109 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 938 if (tmp->flag [FLAG_REMOVED])
1110 { 939 {
1111 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));
1112 return 1; 941 return 1;
1113 } 942 }
1114 943
… …
1117 dm_stack_pop (op->contr); 946 dm_stack_pop (op->contr);
1118 947
1119 /* 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 */
1120 if (tmp->head) 949 if (tmp->head)
1121 tmp = tmp->head; 950 tmp = tmp->head;
1122 remove_ob (tmp); 951 tmp->remove ();
1123 return 1; 952 return 1;
1124} 953}
1125 954
1126int 955int
1127command_free (object *op, char *params) 956command_free (object *op, char *params)
… …
1139 968
1140 if (from != STACK_FROM_STACK) 969 if (from != STACK_FROM_STACK)
1141 /* 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 */
1142 dm_stack_pop (op->contr); 971 dm_stack_pop (op->contr);
1143 972
1144 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1145 {
1146 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1147 remove_ob (tmp);
1148 }
1149
1150 if (tmp->head) 973 if (tmp->head)
1151 tmp = tmp->head; 974 tmp = tmp->head;
1152 free_object (tmp); 975
976 tmp->destroy ();
1153 return 1; 977 return 1;
1154} 978}
1155 979
1156/** 980/**
1157 * 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.
1158 */ 982 */
1159int 983int
1160command_addexp (object *op, char *params) 984command_addexp (object *op, char *params)
1161{ 985{
1162 char buf[MAX_BUF], skill[MAX_BUF]; 986 char buf[MAX_BUF], skill[MAX_BUF];
1163 int i, q; 987 int q;
988 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
1164 object *skillob = NULL; 989 object *skillob = NULL;
1165 player *pl;
1166 990
1167 skill[0] = '\0'; 991 skill[0] = '\0';
1168 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))
1169 { 993 {
1170 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>].");
1171 return 1; 995 return 1;
1172 } 996 }
1173 997
1174 for (pl = first_player; pl != NULL; pl = pl->next) 998 for_all_players (pl)
1175 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 999 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1176 break;
1177
1178 if (pl == NULL)
1179 { 1000 {
1180 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1181 return 1;
1182 }
1183
1184 if (q >= 3) 1001 if (q >= 3)
1185 { 1002 {
1186 skillob = find_skill_by_name (pl->ob, skill); 1003 skillob = find_skill_by_name (pl->ob, skill);
1187 if (!skillob) 1004 if (!skillob)
1188 { 1005 {
1189 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
1190 return 1; 1020 return 1;
1191 } 1021 }
1192 1022
1193 i = check_exp_adjust (skillob, i); 1023 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1194 skillob->stats.exp += i;
1195 calc_perm_exp (skillob);
1196 player_lvl_adj (pl->ob, skillob);
1197 }
1198
1199 pl->ob->stats.exp += i;
1200 calc_perm_exp (pl->ob);
1201 player_lvl_adj (pl->ob, NULL);
1202
1203 if (settings.real_wiz == FALSE)
1204 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1205 return 1; 1024 return 1;
1206} 1025}
1207 1026
1208/**************************************************************************/ 1027/**************************************************************************/
1209 1028
… …
1214/**************************************************************************/ 1033/**************************************************************************/
1215 1034
1216int 1035int
1217command_stats (object *op, char *params) 1036command_stats (object *op, char *params)
1218{ 1037{
1219 char thing[20];
1220 player *pl;
1221 char buf[MAX_BUF]; 1038 char buf[MAX_BUF];
1222 1039
1223 thing[0] = '\0'; 1040 if (params == NULL || params[0] == '\0')
1224 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1225 { 1041 {
1226 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1042 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1227 return 1; 1043 return 1;
1228 } 1044 }
1229 1045
1230 for (pl = first_player; pl != NULL; pl = pl->next) 1046 for_all_players (pl)
1231 if (!strcmp (pl->ob->name, thing)) 1047 if (!strcmp (&pl->ob->name, params))
1232 { 1048 {
1233 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);
1234 new_draw_info (NDI_UNIQUE, 0, op, buf); 1050 new_draw_info (NDI_UNIQUE, 0, op, buf);
1235 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);
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1052 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 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);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1054 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 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);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1056 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 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);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1058 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 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);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1060 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 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);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1062 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 break; 1063 return 1;
1248 } 1064 }
1249 if (pl == NULL) 1065
1250 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1066 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1251 return 1; 1067 return 1;
1252} 1068}
1253 1069
1254int 1070int
1255command_abil (object *op, char *params) 1071command_abil (object *op, char *params)
1256{ 1072{
1257 char thing[20], thing2[20]; 1073 char thing[20], thing2[20];
1258 int iii; 1074 int iii;
1259 player *pl;
1260 char buf[MAX_BUF]; 1075 char buf[MAX_BUF];
1261 1076
1262 iii = 0; 1077 iii = 0;
1263 thing[0] = '\0'; 1078 thing[0] = '\0';
1264 thing2[0] = '\0'; 1079 thing2[0] = '\0';
… …
1278 { 1093 {
1279 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");
1280 return 1; 1095 return 1;
1281 } 1096 }
1282 1097
1283 for (pl = first_player; pl != NULL; pl = pl->next) 1098 for_all_players (pl)
1284 { 1099 {
1285 if (!strcmp (pl->ob->name, thing)) 1100 if (!strcmp (&pl->ob->name, thing))
1286 { 1101 {
1287 if (settings.real_wiz == FALSE)
1288 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1289 if (!strcmp ("str", thing2))
1290 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;
1291 if (!strcmp ("dex", thing2))
1292 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;
1293 if (!strcmp ("con", thing2))
1294 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;
1295 if (!strcmp ("wis", thing2))
1296 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;
1297 if (!strcmp ("cha", thing2))
1298 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;
1299 if (!strcmp ("int", thing2))
1300 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;
1301 if (!strcmp ("pow", thing2))
1302 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
1303 sprintf (buf, "%s has been altered.", &pl->ob->name); 1110 sprintf (buf, "%s has been altered.", &pl->ob->name);
1304 new_draw_info (NDI_UNIQUE, 0, op, buf); 1111 new_draw_info (NDI_UNIQUE, 0, op, buf);
1305 fix_player (pl->ob); 1112 pl->ob->update_stats ();
1306 return 1; 1113 return 1;
1307 } 1114 }
1308 } 1115 }
1309 1116
1310 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1117 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1311 return 1; 1118 return 1;
1312} 1119}
1313 1120
1314int 1121int
1315command_reset (object *op, char *params)
1316{
1317 maptile *m;
1318 object *dummy = NULL, *tmp = NULL;
1319
1320 if (params == NULL)
1321 {
1322 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1323 return 1;
1324 }
1325
1326 if (strcmp (params, ".") == 0)
1327 params = op->map->path;
1328 m = has_been_loaded (params);
1329 if (m == NULL)
1330 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1332 return 1;
1333 }
1334
1335 if (m->in_memory != MAP_SWAPPED)
1336 {
1337 if (m->in_memory != MAP_IN_MEMORY)
1338 {
1339 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1340 return 0;
1341 }
1342
1343 /*
1344 * Only attempt to remove the player that is doing the reset, and not other
1345 * players or wiz's.
1346 */
1347 if (op->map == m)
1348 {
1349 dummy = get_object ();
1350 dummy->map = NULL;
1351 EXIT_X (dummy) = op->x;
1352 EXIT_Y (dummy) = op->y;
1353 EXIT_PATH (dummy) = op->map->path;
1354 remove_ob (op);
1355 op->map = NULL;
1356 tmp = op;
1357 }
1358 swap_map (m);
1359 }
1360
1361 if (m->in_memory == MAP_SWAPPED)
1362 {
1363 LOG (llevDebug, "Resetting map %s.\n", m->path);
1364
1365 /* setting this effectively causes an immediate reload */
1366 m->reset_time = 1;
1367 flush_old_maps ();
1368 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1369 if (tmp)
1370 {
1371 enter_exit (tmp, dummy);
1372 free_object (dummy);
1373 }
1374 return 1;
1375 }
1376 else
1377 {
1378 player *pl;
1379 int playercount = 0;
1380
1381 /* Need to re-insert player if swap failed for some reason */
1382 if (tmp)
1383 {
1384 insert_ob_in_map (op, m, NULL, 0);
1385 free_object (dummy);
1386 }
1387
1388 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1389 for (pl = first_player; pl != NULL; pl = pl->next)
1390 {
1391 if (pl->ob->map == m && pl->ob != op)
1392 {
1393 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1394 playercount++;
1395 }
1396 }
1397 if (!playercount)
1398 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1399 return 1;
1400 }
1401}
1402
1403int
1404command_nowiz (object *op, char *params) 1122command_nowiz (object *op, char *params)
1405{ /* 'noadm' is alias */ 1123{ /* 'nodm' is alias */
1406 CLEAR_FLAG (op, FLAG_WIZ); 1124 op->clr_flag (FLAG_WIZ);
1407 CLEAR_FLAG (op, FLAG_WIZPASS); 1125 op->clr_flag (FLAG_WIZPASS);
1408 CLEAR_FLAG (op, FLAG_WIZCAST); 1126 op->clr_flag (FLAG_WIZCAST);
1127 op->clr_flag (FLAG_WIZLOOK);
1128 op->contr->do_los = 1;
1409 1129
1410 if (settings.real_wiz == TRUE)
1411 CLEAR_FLAG (op, FLAG_WAS_WIZ);
1412 if (op->contr->hidden) 1130 if (op->contr->hidden)
1413 { 1131 {
1414 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");
1415 op->map->players++; 1133 op->map->players++;
1416 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);
1417 op->contr->hidden = 0; 1135 op->contr->hidden = 0;
1418 op->invisible = 1; 1136 op->invisible = 1;
1419 } 1137 }
1420 else 1138 else
1421 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
1422 return 1; 1141 return 1;
1423} 1142}
1424 1143
1425/** 1144/**
1426 * object *op is trying to become dm. 1145 * object *op is trying to become dm.
… …
1463 } 1182 }
1464 fclose (dmfile); 1183 fclose (dmfile);
1465 return (0); 1184 return (0);
1466} 1185}
1467 1186
1468int 1187static int
1469do_wizard_dm (object *op, char *params, int silent) 1188do_wizard_dm (object *op, char *params, int silent)
1470{ 1189{
1471 if (!op->contr) 1190 if (!op->contr)
1472 return 0; 1191 return 0;
1473 1192
1474 if (QUERY_FLAG (op, FLAG_WIZ)) 1193 if (op->flag [FLAG_WIZ])
1475 { 1194 {
1476 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!");
1477 return 0; 1196 return 0;
1478 } 1197 }
1479 1198
1480 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1199 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1481 { 1200 {
1482 SET_FLAG (op, FLAG_WIZ); 1201 op->set_flag (FLAG_WIZ);
1483 SET_FLAG (op, FLAG_WAS_WIZ); 1202 op->set_flag (FLAG_WIZPASS);
1484 SET_FLAG (op, FLAG_WIZPASS); 1203 op->set_flag (FLAG_WIZCAST);
1485 SET_FLAG (op, FLAG_WIZCAST); 1204 op->set_flag (FLAG_WIZLOOK);
1205 op->contr->do_los = 1;
1206
1486 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!");
1487 /*
1488 * Remove setting flying here - that won't work, because next
1489 * fix_player() is called that will get cleared - proper solution
1490 * is probably something like a wiz_force which gives that and any
1491 * other desired abilities.
1492 */
1493 clear_los (op);
1494 op->contr->write_buf[0] = '\0'; 1208 op->contr->write_buf[0] = '\0';
1495 1209
1496 if (!silent) 1210 if (!silent)
1497 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!");
1498 1212
… …
1525command_invisible (object *op, char *params) 1239command_invisible (object *op, char *params)
1526{ 1240{
1527 if (op) 1241 if (op)
1528 { 1242 {
1529 op->invisible += 100; 1243 op->invisible += 100;
1530 update_object (op, UP_OBJ_FACE); 1244 update_object (op, UP_OBJ_CHANGE);
1531 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); 1245 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1532 } 1246 }
1533 1247
1534 return 0; 1248 return 0;
1535} 1249}
… …
1538 * Returns spell object (from archetypes) by name. 1252 * Returns spell object (from archetypes) by name.
1539 * Returns NULL if 0 or more than one spell matches. 1253 * Returns NULL if 0 or more than one spell matches.
1540 * Used for wizard's learn spell/prayer. 1254 * Used for wizard's learn spell/prayer.
1541 * 1255 *
1542 * op is the player issuing the command. 1256 * op is the player issuing the command.
1543 *
1544 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1545 * anymore (but may still be present in some player's inventories and thus
1546 * cannot be removed). We have to ignore them here since they have the same
1547 * name than other "spell_xxx" archetypes and would always conflict.
1548 */ 1257 */
1549static object * 1258static object *
1550get_spell_by_name (object *op, const char *spell_name) 1259get_spell_by_name (object *op, shstr_cmp spell_name)
1551{ 1260{
1552 archetype *ar;
1553 archetype *found;
1554 int conflict_found;
1555 size_t spell_name_length;
1556
1557 /* First check for full name matches. */ 1261 /* First check for full name matches. */
1558 conflict_found = 0; 1262 int conflict_found = 0;
1559 found = NULL; 1263 archetype *found = 0;
1560 for (ar = first_archetype; ar != NULL; ar = ar->next) 1264
1265 for_all_archetypes (at)
1561 { 1266 {
1562 if (ar->clone.type != SPELL) 1267 if (at->type != SPELL)
1563 continue; 1268 continue;
1564 1269
1565 if (strncmp (ar->name, "spelldirect_", 12) == 0) 1270 if (at->object::name != spell_name)
1566 continue; 1271 continue;
1567 1272
1568 if (strcmp (ar->clone.name, spell_name) != 0)
1569 continue;
1570
1571 if (found != NULL) 1273 if (found)
1572 { 1274 {
1573 if (!conflict_found) 1275 if (!conflict_found)
1574 { 1276 {
1575 conflict_found = 1; 1277 conflict_found = 1;
1576 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);
1577 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1578 } 1280 }
1281
1579 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1580 continue; 1283 return 0;
1581 } 1284 }
1582 1285
1583 found = ar; 1286 found = at;
1584 } 1287 }
1585
1586 /* No match if more more than one archetype matches. */
1587 if (conflict_found)
1588 return NULL;
1589 1288
1590 /* Return if exactly one archetype matches. */ 1289 /* Return if exactly one archetype matches. */
1591 if (found != NULL) 1290 if (found)
1592 return arch_to_object (found); 1291 return found->instance ();
1593
1594 /* No full match found: now check for partial matches. */
1595 spell_name_length = strlen (spell_name);
1596 conflict_found = 0;
1597 found = NULL;
1598 for (ar = first_archetype; ar != NULL; ar = ar->next)
1599 {
1600 if (ar->clone.type != SPELL)
1601 continue;
1602
1603 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1604 continue;
1605
1606 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1607 continue;
1608
1609 if (found != NULL)
1610 {
1611 if (!conflict_found)
1612 {
1613 conflict_found = 1;
1614 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1615 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1616 }
1617 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1618 continue;
1619 }
1620
1621 found = ar;
1622 }
1623
1624 /* No match if more more than one archetype matches. */
1625 if (conflict_found)
1626 return NULL;
1627
1628 /* Return if exactly one archetype matches. */
1629 if (found != NULL)
1630 return arch_to_object (found);
1631 1292
1632 /* No spell found: just print an error message. */ 1293 /* No spell found: just print an error message. */
1633 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
1634 return NULL; 1296 return 0;
1635} 1297}
1636 1298
1637static int 1299static int
1638command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1300command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1639{ 1301{
… …
1656 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);
1657 return 0; 1319 return 0;
1658 } 1320 }
1659 1321
1660 do_learn_spell (op, tmp, special_prayer); 1322 do_learn_spell (op, tmp, special_prayer);
1661 free_object (tmp); 1323 tmp->destroy ();
1662 return 1; 1324 return 1;
1663} 1325}
1664 1326
1665int 1327int
1666command_learn_spell (object *op, char *params) 1328command_learn_spell (object *op, char *params)
… …
1683 { 1345 {
1684 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?");
1685 return 0; 1347 return 0;
1686 } 1348 }
1687 1349
1688 spell = lookup_spell_by_name (op, params); 1350 spell = op->find_spell (params);
1689 if (spell == NULL) 1351 if (spell == NULL)
1690 { 1352 {
1691 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);
1692 return 0; 1354 return 0;
1693 } 1355 }
1694 1356
1695 do_forget_spell (op, spell->name); 1357 do_forget_spell (op, spell->name);
1696 return 1;
1697}
1698
1699/**
1700 * Lists all plugins currently loaded with their IDs and full names.
1701 */
1702int
1703command_listplugins (object *op, char *params)
1704{
1705 plugins_display_list (op);
1706 return 1;
1707}
1708
1709/**
1710 * Loads the given plugin. The DM specifies the name of the library to load (no
1711 * pathname is needed). Do not ever attempt to load the same plugin more than
1712 * once at a time, or bad things could happen.
1713 */
1714int
1715command_loadplugin (object *op, char *params)
1716{
1717 char buf[MAX_BUF];
1718
1719 if (params == NULL)
1720 {
1721 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1722 return 1;
1723 }
1724
1725 strcpy (buf, LIBDIR);
1726 strcat (buf, "/plugins/");
1727 strcat (buf, params);
1728 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1729 if (plugins_init_plugin (buf) == 0)
1730 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1731 else
1732 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1733 return 1;
1734}
1735
1736/**
1737 * Unloads the given plugin. The DM specified the ID of the library to unload.
1738 * Note that some things may behave strangely if the correct plugins are not
1739 * loaded.
1740 */
1741int
1742command_unloadplugin (object *op, char *params)
1743{
1744 if (params == NULL)
1745 {
1746 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1747 return 1;
1748 }
1749
1750 if (plugins_remove_plugin (params) == 0)
1751 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1752 else
1753 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1754 return 1; 1358 return 1;
1755} 1359}
1756 1360
1757/** 1361/**
1758 * A players wants to become DM and hide. 1362 * A players wants to become DM and hide.
… …
1766 return 0; 1370 return 0;
1767 1371
1768 do_wizard_hide (op, 1); 1372 do_wizard_hide (op, 1);
1769 1373
1770 return 1; 1374 return 1;
1771}
1772
1773void
1774dm_stack_pop (player *pl)
1775{
1776 if (!pl->stack_items || !pl->stack_position)
1777 {
1778 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1779 return;
1780 }
1781
1782 pl->stack_position--;
1783 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1784}
1785
1786/**
1787 * Get current stack top item for player.
1788 * Returns NULL if no stacked item.
1789 * If stacked item disappeared (freed), remove it.
1790 *
1791 * Ryo, august 2004
1792 */
1793object *
1794dm_stack_peek (player *pl)
1795{
1796 object *ob;
1797
1798 if (!pl->stack_position)
1799 {
1800 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1801 return NULL;
1802 }
1803
1804 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1805 if (!ob)
1806 {
1807 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1808 dm_stack_pop (pl);
1809 return NULL;
1810 }
1811
1812 return ob;
1813}
1814
1815/**
1816 * Push specified item on player stack.
1817 * Inform player of position.
1818 * Initializes variables if needed.
1819 */
1820void
1821dm_stack_push (player *pl, tag_t item)
1822{
1823 if (!pl->stack_items)
1824 {
1825 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1826 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1827 }
1828
1829 if (pl->stack_position == STACK_SIZE)
1830 {
1831 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1832 return;
1833 }
1834
1835 pl->stack_items[pl->stack_position] = item;
1836 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1837 pl->stack_position++;
1838}
1839
1840/**
1841 * Checks 'params' for object code.
1842 *
1843 * Can be:
1844 * * empty => get current object stack top for player
1845 * * number => get item with that tag, stack it for future use
1846 * * $number => get specified stack item
1847 * * "me" => player himself
1848 *
1849 * At function exit, params points to first non-object char
1850 *
1851 * 'from', if not NULL, contains at exit:
1852 * * STACK_FROM_NONE => object not found
1853 * * STACK_FROM_TOP => top item stack, may be NULL if stack was empty
1854 * * STACK_FROM_STACK => item from somewhere in the stack
1855 * * STACK_FROM_NUMBER => item by number, pushed on stack
1856 *
1857 * Ryo, august 2004
1858 */
1859object *
1860get_dm_object (player *pl, char **params, int *from)
1861{
1862 int item_tag, item_position;
1863 object *ob;
1864
1865 if (!pl)
1866 return NULL;
1867
1868 if (!params || !*params || **params == '\0')
1869 {
1870 if (from)
1871 *from = STACK_FROM_TOP;
1872 /* No parameter => get stack item */
1873 return dm_stack_peek (pl);
1874 }
1875
1876 /* Let's clean white spaces */
1877 while (**params == ' ')
1878 (*params)++;
1879
1880 /* Next case: number => item tag */
1881 if (sscanf (*params, "%d", &item_tag))
1882 {
1883 /* Move parameter to next item */
1884 while (isdigit (**params))
1885 (*params)++;
1886
1887 /* And skip blanks, too */
1888 while (**params == ' ')
1889 (*params)++;
1890
1891 /* Get item */
1892 ob = find_object (item_tag);
1893 if (!ob)
1894 {
1895 if (from)
1896 *from = STACK_FROM_NONE;
1897 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1898 return NULL;
1899 }
1900
1901 /* Got one, let's push it on stack */
1902 dm_stack_push (pl, item_tag);
1903 if (from)
1904 *from = STACK_FROM_NUMBER;
1905 return ob;
1906 }
1907
1908 /* Next case: $number => stack item */
1909 if (sscanf (*params, "$%d", &item_position))
1910 {
1911 /* Move parameter to next item */
1912 (*params)++;
1913
1914 while (isdigit (**params))
1915 (*params)++;
1916 while (**params == ' ')
1917 (*params)++;
1918
1919 if (item_position >= pl->stack_position)
1920 {
1921 if (from)
1922 *from = STACK_FROM_NONE;
1923 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1924 return NULL;
1925 }
1926
1927 ob = find_object (pl->stack_items[item_position]);
1928 if (!ob)
1929 {
1930 if (from)
1931 *from = STACK_FROM_NONE;
1932 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1933 return NULL;
1934 }
1935
1936 if (from)
1937 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1938 return ob;
1939 }
1940
1941 /* Next case: 'me' => return pl->ob */
1942 if (!strncmp (*params, "me", 2))
1943 {
1944 if (from)
1945 *from = STACK_FROM_NUMBER;
1946 dm_stack_push (pl, pl->ob->count);
1947
1948 /* Skip to next token */
1949 (*params) += 2;
1950 while (**params == ' ')
1951 (*params)++;
1952
1953 return pl->ob;
1954 }
1955
1956 /* Last case: get stack top */
1957 if (from)
1958 *from = STACK_FROM_TOP;
1959 return dm_stack_peek (pl);
1960} 1375}
1961 1376
1962/** 1377/**
1963 * Pop the stack top. 1378 * Pop the stack top.
1964 */ 1379 */
… …
2024} 1439}
2025 1440
2026int 1441int
2027command_insert_into (object *op, char *params) 1442command_insert_into (object *op, char *params)
2028{ 1443{
2029 object *left, *right, *inserted; 1444 object *left, *right;
2030 int left_from, right_from; 1445 int left_from, right_from;
2031 1446
2032 left = get_dm_object (op->contr, &params, &left_from); 1447 left = get_dm_object (op->contr, &params, &left_from);
2033 if (!left) 1448 if (!left)
2034 { 1449 {
… …
2077 { 1492 {
2078 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!");
2079 return 0; 1494 return 0;
2080 } 1495 }
2081 1496
2082 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1497 if (!right->flag [FLAG_REMOVED])
2083 remove_ob (right); 1498 right->remove ();
1499
2084 inserted = insert_ob_in_ob (right, left); 1500 object *inserted = insert_ob_in_ob (right, left);
2085 if (left->type == PLAYER)
2086 if (inserted == right)
2087 esrv_send_item (left, right);
2088 else
2089 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
2090 1501
2091 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));
2092 1503
2093 return 0; 1504 return 0;
2094 1505

Diff Legend

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