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.9 by root, Sun Sep 10 14:15:34 2006 UTC vs.
Revision 1.88 by root, Fri Jan 27 22:00:40 2012 UTC

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

Diff Legend

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