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

Diff Legend

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