1 | |
|
|
2 | /* |
1 | /* |
3 | * static char *rcsid_c_wiz_c = |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
4 | * "$Id: c_wiz.C,v 1.11 2006/09/14 21:16:12 root Exp $"; |
3 | * |
5 | */ |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
6 | |
|
|
7 | /* |
|
|
8 | CrossFire, A Multiplayer game for X-windows |
|
|
9 | |
|
|
10 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
11 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
12 | |
7 | * |
13 | This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
14 | it under the terms of the GNU General Public License as published by |
9 | * under the terms of the GNU General Public License as published by the Free |
15 | the Free Software Foundation; either version 2 of the License, or |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
16 | (at your option) any later version. |
11 | * 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, but |
19 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
20 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
21 | GNU General Public License for more details. |
16 | * 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 GNU General Public License along |
24 | along with this program; if not, write to the Free Software |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
25 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
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 <crossfire@schmorp.de> |
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 **/ |
… | |
… | |
53 | * other player, or NULL otherwise. |
46 | * other player, or NULL otherwise. |
54 | */ |
47 | */ |
55 | static player * |
48 | static player * |
56 | get_other_player_from_name (object *op, char *name) |
49 | get_other_player_from_name (object *op, char *name) |
57 | { |
50 | { |
58 | player *pl; |
|
|
59 | |
|
|
60 | if (!name) |
51 | if (!name) |
61 | return NULL; |
52 | return NULL; |
62 | |
53 | |
63 | for (pl = first_player; pl != NULL; pl = pl->next) |
54 | for_all_players (pl) |
64 | if (!strncmp (pl->ob->name, name, MAX_NAME)) |
55 | if (!strncmp (pl->ob->name, name, MAX_NAME)) |
65 | break; |
|
|
66 | |
|
|
67 | if (pl == NULL) |
|
|
68 | { |
56 | { |
69 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
|
|
70 | return NULL; |
|
|
71 | } |
|
|
72 | |
|
|
73 | if (pl->ob == op) |
57 | if (pl->ob == op) |
74 | { |
58 | { |
75 | new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); |
59 | new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); |
76 | return NULL; |
60 | return NULL; |
77 | } |
61 | } |
|
|
62 | |
78 | if (pl->state != ST_PLAYING) |
63 | if (pl->ns->state != ST_PLAYING) |
79 | { |
64 | { |
80 | new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); |
65 | new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); |
81 | return NULL; |
66 | return NULL; |
82 | } |
|
|
83 | return pl; |
|
|
84 | } |
|
|
85 | |
|
|
86 | /** |
|
|
87 | * This command will stress server. |
|
|
88 | */ |
|
|
89 | int |
|
|
90 | command_loadtest (object *op, char *params) |
|
|
91 | { |
|
|
92 | uint32 x, y; |
|
|
93 | char buf[1024]; |
|
|
94 | |
|
|
95 | new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting"); |
|
|
96 | new_draw_info (NDI_UNIQUE, 0, op, "at different map places."); |
|
|
97 | new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks."); |
|
|
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; |
|
|
104 | |
|
|
105 | if (strncmp (params, "TRUE", 4)) |
|
|
106 | return 0; |
|
|
107 | |
|
|
108 | new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo"); |
|
|
109 | |
|
|
110 | for (x = 0; x < settings.worldmaptilesx; x++) |
|
|
111 | { |
|
|
112 | for (y = 0; y < settings.worldmaptilesy; y++) |
|
|
113 | { |
|
|
114 | sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty); |
|
|
115 | command_goto (op, buf); |
|
|
116 | } |
67 | } |
|
|
68 | |
|
|
69 | return pl; |
117 | } |
70 | } |
118 | |
71 | |
|
|
72 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
119 | return 0; |
73 | return 0; |
120 | } |
74 | } |
121 | |
75 | |
122 | /** |
76 | /** |
123 | * Actually hides specified player (obviously a DM). |
77 | * Actually hides specified player (obviously a DM). |
… | |
… | |
132 | op->contr->hidden = 0; |
86 | op->contr->hidden = 0; |
133 | op->invisible = 1; |
87 | op->invisible = 1; |
134 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
88 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
135 | op->map->players++; |
89 | op->map->players++; |
136 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
90 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
|
|
91 | |
137 | if (!silent_dm) |
92 | if (!silent_dm) |
138 | { |
|
|
139 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
93 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
140 | } |
|
|
141 | } |
94 | } |
142 | else |
95 | else |
143 | { |
96 | { |
144 | op->contr->hidden = 1; |
97 | op->contr->hidden = 1; |
145 | new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); |
98 | new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); |
146 | op->map->players--; |
99 | op->map->players--; |
|
|
100 | |
147 | if (!silent_dm) |
101 | if (!silent_dm) |
148 | { |
|
|
149 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); |
102 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); |
150 | } |
103 | |
151 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); |
104 | 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); |
105 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); |
153 | } |
106 | } |
154 | } |
107 | } |
155 | |
108 | |
… | |
… | |
219 | |
172 | |
220 | become_follower (ob, god); |
173 | become_follower (ob, god); |
221 | return 1; |
174 | return 1; |
222 | } |
175 | } |
223 | |
176 | |
224 | /** |
177 | // TODO: Rewrite banish in perl and get rid of the following two functions |
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 | */ |
|
|
231 | int |
|
|
232 | command_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 | |
|
|
274 | int |
178 | int |
275 | command_kick (object *op, char *params) |
179 | command_kick (object *op, char *params) |
276 | { |
180 | { |
277 | struct pl *pl; |
181 | for_all_players (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))) |
182 | if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) |
281 | { |
183 | { |
282 | object *op = pl->ob; |
184 | object *op = pl->ob; |
283 | |
185 | |
284 | if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) |
186 | if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) |
285 | { |
187 | { |
286 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); |
188 | 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"); |
189 | strcpy (op->contr->killer, "kicked"); |
288 | } |
190 | } |
289 | |
191 | |
290 | pl->socket.status = Ns_Dead; |
192 | pl->ns->destroy (); |
291 | } |
193 | } |
292 | |
194 | |
293 | return 1; |
195 | return 1; |
294 | } |
196 | } |
295 | |
197 | |
|
|
198 | //TODO |
|
|
199 | #if 0 |
296 | int |
200 | int |
297 | command_save_overlay (object *op, char *params) |
201 | command_save_overlay (object *op, char *params) |
298 | { |
202 | { |
299 | if (!op) |
203 | if (!op) |
300 | return 0; |
204 | return 0; |
… | |
… | |
311 | |
215 | |
312 | ready_map_name (op->map->path, 0); |
216 | ready_map_name (op->map->path, 0); |
313 | |
217 | |
314 | return 1; |
218 | return 1; |
315 | } |
219 | } |
316 | |
220 | #endif |
317 | int |
|
|
318 | command_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 | |
|
|
340 | int |
|
|
341 | command_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 */ |
|
|
372 | int |
|
|
373 | command_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; |
|
|
397 | } |
|
|
398 | |
221 | |
399 | int |
222 | int |
400 | command_freeze (object *op, char *params) |
223 | command_freeze (object *op, char *params) |
401 | { |
224 | { |
402 | int ticks; |
225 | int ticks; |
… | |
… | |
438 | object *dummy; |
261 | object *dummy; |
439 | player *pl; |
262 | player *pl; |
440 | |
263 | |
441 | if (!op) |
264 | if (!op) |
442 | return 0; |
265 | return 0; |
|
|
266 | |
443 | if (params == NULL) |
267 | if (params == NULL) |
444 | { |
268 | { |
445 | new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); |
269 | new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); |
446 | return 1; |
270 | return 1; |
447 | } |
271 | } |
|
|
272 | |
448 | pl = get_other_player_from_name (op, params); |
273 | pl = get_other_player_from_name (op, params); |
449 | if (!pl) |
274 | if (!pl) |
450 | return 1; |
275 | return 1; |
|
|
276 | |
451 | dummy = get_jail_exit (pl->ob); |
277 | dummy = get_jail_exit (pl->ob); |
452 | if (!dummy) |
278 | if (!dummy) |
453 | { |
279 | { |
454 | /* we have nowhere to send the prisoner.... */ |
280 | /* 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"); |
281 | new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); |
456 | return 0; |
282 | return 0; |
457 | } |
283 | } |
458 | enter_exit (pl->ob, dummy); |
284 | |
459 | free_object (dummy); |
285 | pl->ob->enter_exit (dummy); |
|
|
286 | dummy->destroy (); |
460 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); |
287 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); |
461 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
288 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
462 | LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); |
289 | LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); |
463 | return 1; |
290 | return 1; |
464 | } |
291 | } |
… | |
… | |
488 | { |
315 | { |
489 | new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); |
316 | new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); |
490 | return 1; |
317 | return 1; |
491 | } |
318 | } |
492 | |
319 | |
493 | dummy = get_object (); |
320 | dummy = object::create (); |
494 | EXIT_PATH (dummy) = op->map->path; |
321 | EXIT_PATH (dummy) = op->map->path; |
495 | EXIT_X (dummy) = op->x + freearr_x[i]; |
322 | EXIT_X (dummy) = op->x + freearr_x[i]; |
496 | EXIT_Y (dummy) = op->y + freearr_y[i]; |
323 | EXIT_Y (dummy) = op->y + freearr_y[i]; |
497 | enter_exit (pl->ob, dummy); |
324 | pl->ob->enter_exit (dummy); |
498 | free_object (dummy); |
325 | dummy->destroy (); |
499 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); |
326 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); |
500 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
327 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
501 | |
328 | |
502 | return 1; |
|
|
503 | } |
|
|
504 | |
|
|
505 | /** |
|
|
506 | * Teleport next to target player. |
|
|
507 | */ |
|
|
508 | |
|
|
509 | /* mids 01/16/2002 */ |
|
|
510 | int |
|
|
511 | command_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; |
329 | return 1; |
547 | } |
330 | } |
548 | |
331 | |
549 | /** |
332 | /** |
550 | * This function is a real mess, because we're stucking getting |
333 | * This function is a real mess, because we're stucking getting |
… | |
… | |
640 | * we also set up spell_name which is only |
423 | * we also set up spell_name which is only |
641 | * the first word. |
424 | * the first word. |
642 | */ |
425 | */ |
643 | |
426 | |
644 | at_spell = archetype::find (cp); |
427 | at_spell = archetype::find (cp); |
645 | if (!at_spell || at_spell->clone.type != SPELL) |
428 | if (!at_spell || at_spell->type != SPELL) |
646 | at_spell = find_archetype_by_object_name (cp); |
429 | at_spell = find_archetype_by_object_name (cp); |
647 | if (!at_spell || at_spell->clone.type != SPELL) |
430 | if (!at_spell || at_spell->type != SPELL) |
648 | { |
431 | { |
649 | strcpy (spell_name, cp); |
432 | assign (spell_name, cp); |
650 | fsp = strchr (spell_name, ' '); |
433 | fsp = strchr (spell_name, ' '); |
651 | if (fsp) |
434 | if (fsp) |
652 | { |
435 | { |
653 | *fsp = 0; |
436 | *fsp = 0; |
654 | fsp++; |
437 | fsp++; |
655 | at_spell = archetype::find (spell_name); |
438 | at_spell = archetype::find (spell_name); |
656 | |
439 | |
657 | /* Got a spell, update the first string pointer */ |
440 | /* Got a spell, update the first string pointer */ |
658 | if (at_spell && at_spell->clone.type == SPELL) |
441 | if (at_spell && at_spell->type == SPELL) |
659 | bp2 = cp + strlen (spell_name) + 1; |
442 | bp2 = cp + strlen (spell_name) + 1; |
660 | else |
443 | else |
661 | at_spell = NULL; |
444 | at_spell = NULL; |
662 | } |
445 | } |
663 | } |
446 | } |
… | |
… | |
665 | /* OK - we didn't find a spell - presume the 'of' |
448 | /* OK - we didn't find a spell - presume the 'of' |
666 | * in this case means its an artifact. |
449 | * in this case means its an artifact. |
667 | */ |
450 | */ |
668 | if (!at_spell) |
451 | if (!at_spell) |
669 | { |
452 | { |
670 | if (find_artifactlist (at->clone.type) == NULL) |
453 | 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); |
454 | new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->type); |
672 | else |
455 | else |
673 | { |
456 | { |
674 | art = find_artifactlist (at->clone.type)->items; |
457 | art = find_artifactlist (at->type)->items; |
675 | |
458 | |
676 | do |
459 | while (art) |
677 | { |
460 | { |
678 | if (!strcmp (art->item->name, cp)) |
461 | if (!strcmp (art->item->name, cp)) |
679 | break; |
462 | break; |
|
|
463 | |
680 | art = art->next; |
464 | art = art->next; |
681 | } |
465 | } |
682 | while (art != NULL); |
|
|
683 | |
466 | |
684 | if (!art) |
467 | if (!art) |
685 | new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp); |
468 | new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->type, cp); |
686 | } |
469 | } |
687 | |
470 | |
688 | LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); |
471 | LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); |
689 | } |
472 | } |
690 | } /* if cp */ |
473 | } /* if cp */ |
691 | |
474 | |
692 | if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || |
475 | if ((at->type == ROD || at->type == WAND || at->type == SCROLL || |
693 | at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) |
476 | at->type == HORN || at->type == SPELLBOOK) && !at_spell) |
694 | { |
477 | { |
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); |
478 | 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; |
479 | return 1; |
697 | } |
480 | } |
698 | |
481 | |
… | |
… | |
700 | * Rather than have two different blocks with a lot of similar code, |
483 | * Rather than have two different blocks with a lot of similar code, |
701 | * just create one object, do all the processing, and then determine |
484 | * 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. |
485 | * if that one object should be inserted or if we need to make copies. |
703 | */ |
486 | */ |
704 | tmp = arch_to_object (at); |
487 | tmp = arch_to_object (at); |
705 | |
|
|
706 | if (settings.real_wiz == FALSE) |
|
|
707 | SET_FLAG (tmp, FLAG_WAS_WIZ); |
|
|
708 | |
488 | |
709 | if (set_magic) |
489 | if (set_magic) |
710 | set_abs_magic (tmp, magic); |
490 | set_abs_magic (tmp, magic); |
711 | |
491 | |
712 | if (art) |
492 | if (art) |
… | |
… | |
792 | new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); |
572 | new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2); |
793 | |
573 | |
794 | bp2 = bp3 + 1; |
574 | bp2 = bp3 + 1; |
795 | } |
575 | } |
796 | |
576 | |
797 | if (at->clone.nrof) |
577 | if (at->nrof) |
798 | { |
578 | { |
799 | if (at_spell) |
579 | if (at_spell) |
800 | insert_ob_in_ob (arch_to_object (at_spell), tmp); |
580 | insert_ob_in_ob (arch_to_object (at_spell), tmp); |
801 | |
581 | |
802 | tmp->x = op->x; |
582 | tmp->x = op->x; |
… | |
… | |
817 | } |
597 | } |
818 | else |
598 | else |
819 | { |
599 | { |
820 | for (i = 0; i < (set_nrof ? nrof : 1); i++) |
600 | for (i = 0; i < (set_nrof ? nrof : 1); i++) |
821 | { |
601 | { |
822 | archetype *atmp; |
|
|
823 | object *prev = 0, *head = 0; |
602 | object *prev = 0, *head = 0; |
824 | |
603 | |
825 | for (atmp = at; atmp; atmp = atmp->more) |
604 | for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) |
826 | { |
605 | { |
827 | object *dup = arch_to_object (atmp); |
606 | object *dup = arch_to_object (atmp); |
828 | |
607 | |
829 | if (at_spell) |
608 | if (at_spell) |
830 | insert_ob_in_ob (arch_to_object (at_spell), dup); |
609 | insert_ob_in_ob (arch_to_object (at_spell), dup); |
… | |
… | |
834 | * so just copying it over should be fine. |
613 | * so just copying it over should be fine. |
835 | */ |
614 | */ |
836 | if (!head) |
615 | if (!head) |
837 | { |
616 | { |
838 | head = dup; |
617 | head = dup; |
839 | copy_object (tmp, dup); |
618 | tmp->copy_to (dup); |
840 | } |
619 | } |
841 | |
620 | |
842 | if (settings.real_wiz == FALSE) |
|
|
843 | SET_FLAG (dup, FLAG_WAS_WIZ); |
|
|
844 | |
|
|
845 | dup->x = op->x + dup->arch->clone.x; |
621 | dup->x = op->x + dup->arch->x; |
846 | dup->y = op->y + dup->arch->clone.y; |
622 | dup->y = op->y + dup->arch->y; |
847 | dup->map = op->map; |
623 | dup->map = op->map; |
848 | |
624 | |
849 | if (head != dup) |
625 | if (head != dup) |
850 | { |
626 | { |
851 | dup->head = head; |
627 | dup->head = head; |
… | |
… | |
861 | int size_x = 0; |
637 | int size_x = 0; |
862 | int size_y = 0; |
638 | int size_y = 0; |
863 | |
639 | |
864 | while (check) |
640 | while (check) |
865 | { |
641 | { |
866 | size_x = MAX (size_x, check->arch->clone.x); |
642 | size_x = MAX (size_x, check->arch->x); |
867 | size_y = MAX (size_y, check->arch->clone.y); |
643 | size_y = MAX (size_y, check->arch->y); |
868 | check = check->more; |
644 | check = check->more; |
869 | } |
645 | } |
870 | |
646 | |
871 | if (out_of_map (op->map, head->x + size_x, head->y + size_y)) |
647 | if (out_of_map (op->map, head->x + size_x, head->y + size_y)) |
872 | { |
648 | { |
873 | if (head->x < size_x || head->y < size_y) |
649 | if (head->x < size_x || head->y < size_y) |
874 | { |
650 | { |
875 | dm_stack_pop (op->contr); |
651 | dm_stack_pop (op->contr); |
876 | free_object (head); |
652 | head->destroy (); |
877 | new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); |
653 | new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); |
878 | free_object (tmp); |
654 | tmp->destroy (); |
879 | return 1; |
655 | return 1; |
880 | } |
656 | } |
881 | |
657 | |
882 | check = head; |
658 | check = head; |
883 | |
659 | |
… | |
… | |
898 | /* Wonder if we really want to push all of these, but since |
674 | /* Wonder if we really want to push all of these, but since |
899 | * things like rods have nrof 0, we want to cover those. |
675 | * things like rods have nrof 0, we want to cover those. |
900 | */ |
676 | */ |
901 | dm_stack_push (op->contr, head->count); |
677 | dm_stack_push (op->contr, head->count); |
902 | |
678 | |
903 | if (at->clone.randomitems != NULL && !at_spell) |
679 | if (at->randomitems != NULL && !at_spell) |
904 | create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0); |
680 | create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); |
905 | |
681 | |
906 | esrv_send_item (op, head); |
682 | esrv_send_item (op, head); |
907 | } |
683 | } |
908 | |
684 | |
909 | /* free the one we used to copy */ |
685 | /* free the one we used to copy */ |
910 | free_object (tmp); |
686 | tmp->destroy (); |
911 | } |
687 | } |
912 | |
688 | |
913 | return 1; |
689 | return 1; |
914 | } |
690 | } |
915 | |
691 | |
… | |
… | |
957 | |
733 | |
958 | tmp = get_dm_object (op->contr, ¶ms, NULL); |
734 | tmp = get_dm_object (op->contr, ¶ms, NULL); |
959 | if (!tmp) |
735 | if (!tmp) |
960 | return 1; |
736 | return 1; |
961 | |
737 | |
962 | dump_object (tmp); |
738 | char *dump = dump_object (tmp); |
963 | new_draw_info (NDI_UNIQUE, 0, op, errmsg); |
739 | new_draw_info (NDI_UNIQUE, 0, op, dump); |
|
|
740 | free (dump); |
|
|
741 | |
964 | if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) |
742 | if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) |
965 | new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); |
743 | new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); |
966 | return 1; |
|
|
967 | } |
|
|
968 | |
744 | |
969 | /** |
|
|
970 | * When DM is possessing a monster, flip aggression on and off, to allow |
|
|
971 | * better motion. |
|
|
972 | */ |
|
|
973 | int |
|
|
974 | command_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 | */ |
|
|
997 | int |
|
|
998 | command_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; |
745 | return 1; |
1070 | } |
746 | } |
1071 | |
747 | |
1072 | int |
748 | int |
1073 | command_patch (object *op, char *params) |
749 | command_patch (object *op, char *params) |
… | |
… | |
1088 | return 1; |
764 | return 1; |
1089 | } |
765 | } |
1090 | |
766 | |
1091 | if ((arg2 = strchr (arg, ' '))) |
767 | if ((arg2 = strchr (arg, ' '))) |
1092 | arg2++; |
768 | arg2++; |
1093 | if (settings.real_wiz == FALSE) |
769 | |
1094 | SET_FLAG (tmp, FLAG_WAS_WIZ); /* To avoid cheating */ |
|
|
1095 | if (set_variable (tmp, arg) == -1) |
770 | if (set_variable (tmp, arg) == -1) |
1096 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); |
771 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg); |
1097 | else |
772 | else |
1098 | { |
|
|
1099 | new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); |
773 | new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2); |
1100 | } |
|
|
1101 | |
774 | |
1102 | return 1; |
775 | return 1; |
1103 | } |
776 | } |
1104 | |
777 | |
1105 | int |
778 | int |
… | |
… | |
1132 | dm_stack_pop (op->contr); |
805 | dm_stack_pop (op->contr); |
1133 | |
806 | |
1134 | /* Always work on the head - otherwise object will get in odd state */ |
807 | /* Always work on the head - otherwise object will get in odd state */ |
1135 | if (tmp->head) |
808 | if (tmp->head) |
1136 | tmp = tmp->head; |
809 | tmp = tmp->head; |
1137 | remove_ob (tmp); |
810 | tmp->remove (); |
1138 | return 1; |
811 | return 1; |
1139 | } |
812 | } |
1140 | |
813 | |
1141 | int |
814 | int |
1142 | command_free (object *op, char *params) |
815 | command_free (object *op, char *params) |
… | |
… | |
1154 | |
827 | |
1155 | if (from != STACK_FROM_STACK) |
828 | if (from != STACK_FROM_STACK) |
1156 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
829 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
1157 | dm_stack_pop (op->contr); |
830 | dm_stack_pop (op->contr); |
1158 | |
831 | |
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) |
832 | if (tmp->head) |
1166 | tmp = tmp->head; |
833 | tmp = tmp->head; |
1167 | free_object (tmp); |
834 | |
|
|
835 | tmp->destroy (); |
1168 | return 1; |
836 | return 1; |
1169 | } |
837 | } |
1170 | |
838 | |
1171 | /** |
839 | /** |
1172 | * This adds exp to a player. We now allow adding to a specific skill. |
840 | * This adds exp to a player. We now allow adding to a specific skill. |
… | |
… | |
1175 | command_addexp (object *op, char *params) |
843 | command_addexp (object *op, char *params) |
1176 | { |
844 | { |
1177 | char buf[MAX_BUF], skill[MAX_BUF]; |
845 | char buf[MAX_BUF], skill[MAX_BUF]; |
1178 | int i, q; |
846 | int i, q; |
1179 | object *skillob = NULL; |
847 | object *skillob = NULL; |
1180 | player *pl; |
|
|
1181 | |
848 | |
1182 | skill[0] = '\0'; |
849 | skill[0] = '\0'; |
1183 | if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) |
850 | if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) |
1184 | { |
851 | { |
1185 | new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); |
852 | new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); |
1186 | return 1; |
853 | return 1; |
1187 | } |
854 | } |
1188 | |
855 | |
1189 | for (pl = first_player; pl != NULL; pl = pl->next) |
856 | for_all_players (pl) |
1190 | if (!strncmp (pl->ob->name, buf, MAX_NAME)) |
857 | if (!strncmp (pl->ob->name, buf, MAX_NAME)) |
1191 | break; |
|
|
1192 | |
|
|
1193 | if (pl == NULL) |
|
|
1194 | { |
858 | { |
1195 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
|
|
1196 | return 1; |
|
|
1197 | } |
|
|
1198 | |
|
|
1199 | if (q >= 3) |
859 | if (q >= 3) |
1200 | { |
860 | { |
1201 | skillob = find_skill_by_name (pl->ob, skill); |
861 | skillob = find_skill_by_name (pl->ob, skill); |
1202 | if (!skillob) |
862 | if (!skillob) |
1203 | { |
863 | { |
1204 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); |
864 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); |
|
|
865 | return 1; |
|
|
866 | } |
|
|
867 | |
|
|
868 | i = check_exp_adjust (skillob, i); |
|
|
869 | skillob->stats.exp += i; |
|
|
870 | calc_perm_exp (skillob); |
|
|
871 | player_lvl_adj (pl->ob, skillob); |
|
|
872 | } |
|
|
873 | |
|
|
874 | pl->ob->stats.exp += i; |
|
|
875 | calc_perm_exp (pl->ob); |
|
|
876 | player_lvl_adj (pl->ob, NULL); |
|
|
877 | |
1205 | return 1; |
878 | return 1; |
1206 | } |
879 | } |
1207 | |
880 | |
1208 | i = check_exp_adjust (skillob, i); |
881 | 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; |
882 | return 1; |
1221 | } |
883 | } |
1222 | |
884 | |
1223 | /**************************************************************************/ |
885 | /**************************************************************************/ |
1224 | |
886 | |
… | |
… | |
1230 | |
892 | |
1231 | int |
893 | int |
1232 | command_stats (object *op, char *params) |
894 | command_stats (object *op, char *params) |
1233 | { |
895 | { |
1234 | char thing[20]; |
896 | char thing[20]; |
1235 | player *pl; |
|
|
1236 | char buf[MAX_BUF]; |
897 | char buf[MAX_BUF]; |
1237 | |
898 | |
1238 | thing[0] = '\0'; |
899 | thing[0] = '\0'; |
1239 | if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) |
900 | if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) |
1240 | { |
901 | { |
1241 | new_draw_info (NDI_UNIQUE, 0, op, "Who?"); |
902 | new_draw_info (NDI_UNIQUE, 0, op, "Who?"); |
1242 | return 1; |
903 | return 1; |
1243 | } |
904 | } |
1244 | |
905 | |
1245 | for (pl = first_player; pl != NULL; pl = pl->next) |
906 | for_all_players (pl) |
1246 | if (!strcmp (pl->ob->name, thing)) |
907 | if (!strcmp (pl->ob->name, thing)) |
1247 | { |
908 | { |
1248 | sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); |
909 | 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); |
910 | 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); |
911 | 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); |
912 | 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); |
913 | 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); |
914 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1254 | sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); |
915 | sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); |
1255 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
916 | 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); |
917 | sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp); |
1257 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
918 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1258 | sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); |
919 | sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); |
1259 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
920 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1260 | sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); |
921 | sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); |
1261 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
922 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1262 | break; |
923 | return 1; |
1263 | } |
924 | } |
1264 | if (pl == NULL) |
925 | |
1265 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
926 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
1266 | return 1; |
927 | return 1; |
1267 | } |
928 | } |
1268 | |
929 | |
1269 | int |
930 | int |
1270 | command_abil (object *op, char *params) |
931 | command_abil (object *op, char *params) |
1271 | { |
932 | { |
1272 | char thing[20], thing2[20]; |
933 | char thing[20], thing2[20]; |
1273 | int iii; |
934 | int iii; |
1274 | player *pl; |
|
|
1275 | char buf[MAX_BUF]; |
935 | char buf[MAX_BUF]; |
1276 | |
936 | |
1277 | iii = 0; |
937 | iii = 0; |
1278 | thing[0] = '\0'; |
938 | thing[0] = '\0'; |
1279 | thing2[0] = '\0'; |
939 | thing2[0] = '\0'; |
… | |
… | |
1293 | { |
953 | { |
1294 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); |
954 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); |
1295 | return 1; |
955 | return 1; |
1296 | } |
956 | } |
1297 | |
957 | |
1298 | for (pl = first_player; pl != NULL; pl = pl->next) |
958 | for_all_players (pl) |
1299 | { |
959 | { |
1300 | if (!strcmp (pl->ob->name, thing)) |
960 | if (!strcmp (pl->ob->name, thing)) |
1301 | { |
961 | { |
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; |
962 | 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; |
963 | 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; |
964 | 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; |
965 | 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; |
966 | 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; |
967 | 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; |
968 | if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; |
|
|
969 | |
1318 | sprintf (buf, "%s has been altered.", &pl->ob->name); |
970 | sprintf (buf, "%s has been altered.", &pl->ob->name); |
1319 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
971 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1320 | fix_player (pl->ob); |
972 | pl->ob->update_stats (); |
1321 | return 1; |
973 | return 1; |
1322 | } |
974 | } |
1323 | } |
975 | } |
1324 | |
976 | |
1325 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
977 | new_draw_info (NDI_UNIQUE, 0, op, "No such player."); |
1326 | return 1; |
978 | return 1; |
1327 | } |
979 | } |
1328 | |
980 | |
1329 | int |
981 | int |
1330 | command_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 | |
|
|
1418 | int |
|
|
1419 | command_nowiz (object *op, char *params) |
982 | command_nowiz (object *op, char *params) |
1420 | { /* 'noadm' is alias */ |
983 | { /* 'nodm' is alias */ |
1421 | CLEAR_FLAG (op, FLAG_WIZ); |
984 | CLEAR_FLAG (op, FLAG_WIZ); |
1422 | CLEAR_FLAG (op, FLAG_WIZPASS); |
985 | CLEAR_FLAG (op, FLAG_WIZPASS); |
1423 | CLEAR_FLAG (op, FLAG_WIZCAST); |
986 | CLEAR_FLAG (op, FLAG_WIZCAST); |
1424 | |
987 | |
1425 | if (settings.real_wiz == TRUE) |
|
|
1426 | CLEAR_FLAG (op, FLAG_WAS_WIZ); |
|
|
1427 | if (op->contr->hidden) |
988 | if (op->contr->hidden) |
1428 | { |
989 | { |
1429 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
990 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
1430 | op->map->players++; |
991 | op->map->players++; |
1431 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
992 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
… | |
… | |
1490 | { |
1051 | { |
1491 | new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); |
1052 | new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); |
1492 | return 0; |
1053 | return 0; |
1493 | } |
1054 | } |
1494 | |
1055 | |
1495 | if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) |
1056 | if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) |
1496 | { |
1057 | { |
1497 | SET_FLAG (op, FLAG_WIZ); |
1058 | SET_FLAG (op, FLAG_WIZ); |
1498 | SET_FLAG (op, FLAG_WAS_WIZ); |
|
|
1499 | SET_FLAG (op, FLAG_WIZPASS); |
1059 | SET_FLAG (op, FLAG_WIZPASS); |
1500 | SET_FLAG (op, FLAG_WIZCAST); |
1060 | SET_FLAG (op, FLAG_WIZCAST); |
|
|
1061 | |
1501 | new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); |
1062 | new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); |
1502 | /* |
1063 | /* |
1503 | * Remove setting flying here - that won't work, because next |
1064 | * Remove setting flying here - that won't work, because next |
1504 | * fix_player() is called that will get cleared - proper solution |
1065 | * fix_player() is called that will get cleared - proper solution |
1505 | * is probably something like a wiz_force which gives that and any |
1066 | * is probably something like a wiz_force which gives that and any |
1506 | * other desired abilities. |
1067 | * other desired abilities. |
1507 | */ |
1068 | */ |
1508 | clear_los (op); |
1069 | clear_los (op->contr); |
1509 | op->contr->write_buf[0] = '\0'; |
1070 | op->contr->write_buf[0] = '\0'; |
1510 | |
1071 | |
1511 | if (!silent) |
1072 | if (!silent) |
1512 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
1073 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
1513 | |
1074 | |
… | |
… | |
1540 | command_invisible (object *op, char *params) |
1101 | command_invisible (object *op, char *params) |
1541 | { |
1102 | { |
1542 | if (op) |
1103 | if (op) |
1543 | { |
1104 | { |
1544 | op->invisible += 100; |
1105 | op->invisible += 100; |
1545 | update_object (op, UP_OBJ_FACE); |
1106 | update_object (op, UP_OBJ_CHANGE); |
1546 | new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); |
1107 | new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible."); |
1547 | } |
1108 | } |
1548 | |
1109 | |
1549 | return 0; |
1110 | return 0; |
1550 | } |
1111 | } |
… | |
… | |
1562 | * name than other "spell_xxx" archetypes and would always conflict. |
1123 | * name than other "spell_xxx" archetypes and would always conflict. |
1563 | */ |
1124 | */ |
1564 | static object * |
1125 | static object * |
1565 | get_spell_by_name (object *op, const char *spell_name) |
1126 | get_spell_by_name (object *op, const char *spell_name) |
1566 | { |
1127 | { |
1567 | archetype *ar; |
1128 | archetype *at; |
1568 | archetype *found; |
1129 | archetype *found; |
1569 | int conflict_found; |
1130 | int conflict_found; |
1570 | size_t spell_name_length; |
1131 | size_t spell_name_length; |
1571 | |
1132 | |
1572 | /* First check for full name matches. */ |
1133 | /* First check for full name matches. */ |
1573 | conflict_found = 0; |
1134 | conflict_found = 0; |
1574 | found = NULL; |
1135 | found = NULL; |
1575 | for (ar = first_archetype; ar != NULL; ar = ar->next) |
1136 | for_all_archetypes (at) |
1576 | { |
1137 | { |
1577 | if (ar->clone.type != SPELL) |
1138 | if (at->type != SPELL) |
1578 | continue; |
1139 | continue; |
1579 | |
1140 | |
1580 | if (strncmp (ar->name, "spelldirect_", 12) == 0) |
1141 | if (strncmp (at->archname, "spelldirect_", 12) == 0) |
1581 | continue; |
1142 | continue; |
1582 | |
1143 | |
1583 | if (strcmp (ar->clone.name, spell_name) != 0) |
1144 | if (strcmp (at->object::name, spell_name) != 0) |
1584 | continue; |
1145 | continue; |
1585 | |
1146 | |
1586 | if (found != NULL) |
1147 | if (found != NULL) |
1587 | { |
1148 | { |
1588 | if (!conflict_found) |
1149 | if (!conflict_found) |
1589 | { |
1150 | { |
1590 | conflict_found = 1; |
1151 | conflict_found = 1; |
1591 | new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); |
1152 | 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); |
1153 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); |
1593 | } |
1154 | } |
|
|
1155 | |
1594 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name); |
1156 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); |
1595 | continue; |
1157 | continue; |
1596 | } |
1158 | } |
1597 | |
1159 | |
1598 | found = ar; |
1160 | found = at; |
1599 | } |
1161 | } |
1600 | |
1162 | |
1601 | /* No match if more more than one archetype matches. */ |
1163 | /* No match if more more than one archetype matches. */ |
1602 | if (conflict_found) |
1164 | if (conflict_found) |
1603 | return NULL; |
1165 | return NULL; |
… | |
… | |
1608 | |
1170 | |
1609 | /* No full match found: now check for partial matches. */ |
1171 | /* No full match found: now check for partial matches. */ |
1610 | spell_name_length = strlen (spell_name); |
1172 | spell_name_length = strlen (spell_name); |
1611 | conflict_found = 0; |
1173 | conflict_found = 0; |
1612 | found = NULL; |
1174 | found = NULL; |
1613 | for (ar = first_archetype; ar != NULL; ar = ar->next) |
1175 | for_all_archetypes (at) |
1614 | { |
1176 | { |
1615 | if (ar->clone.type != SPELL) |
1177 | if (at->type != SPELL) |
1616 | continue; |
1178 | continue; |
1617 | |
1179 | |
1618 | if (strncmp (ar->name, "spelldirect_", 12) == 0) |
1180 | if (strncmp (at->archname, "spelldirect_", 12) == 0) |
1619 | continue; |
1181 | continue; |
1620 | |
1182 | |
1621 | if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0) |
1183 | if (strncmp (at->object::name, spell_name, spell_name_length) != 0) |
1622 | continue; |
1184 | continue; |
1623 | |
1185 | |
1624 | if (found != NULL) |
1186 | if (found != NULL) |
1625 | { |
1187 | { |
1626 | if (!conflict_found) |
1188 | if (!conflict_found) |
1627 | { |
1189 | { |
1628 | conflict_found = 1; |
1190 | conflict_found = 1; |
1629 | new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); |
1191 | 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); |
1192 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name); |
1631 | } |
1193 | } |
1632 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); |
1194 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name); |
1633 | continue; |
1195 | continue; |
1634 | } |
1196 | } |
1635 | |
1197 | |
1636 | found = ar; |
1198 | found = at; |
1637 | } |
1199 | } |
1638 | |
1200 | |
1639 | /* No match if more more than one archetype matches. */ |
1201 | /* No match if more more than one archetype matches. */ |
1640 | if (conflict_found) |
1202 | if (conflict_found) |
1641 | return NULL; |
1203 | return NULL; |
… | |
… | |
1671 | new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); |
1233 | new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); |
1672 | return 0; |
1234 | return 0; |
1673 | } |
1235 | } |
1674 | |
1236 | |
1675 | do_learn_spell (op, tmp, special_prayer); |
1237 | do_learn_spell (op, tmp, special_prayer); |
1676 | free_object (tmp); |
1238 | tmp->destroy (); |
1677 | return 1; |
1239 | return 1; |
1678 | } |
1240 | } |
1679 | |
1241 | |
1680 | int |
1242 | int |
1681 | command_learn_spell (object *op, char *params) |
1243 | command_learn_spell (object *op, char *params) |
… | |
… | |
2093 | new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); |
1655 | new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); |
2094 | return 0; |
1656 | return 0; |
2095 | } |
1657 | } |
2096 | |
1658 | |
2097 | if (!QUERY_FLAG (right, FLAG_REMOVED)) |
1659 | if (!QUERY_FLAG (right, FLAG_REMOVED)) |
2098 | remove_ob (right); |
1660 | right->remove (); |
2099 | inserted = insert_ob_in_ob (right, left); |
1661 | inserted = insert_ob_in_ob (right, left); |
2100 | if (left->type == PLAYER) |
1662 | if (left->type == PLAYER) |
2101 | if (inserted == right) |
1663 | if (inserted == right) |
2102 | esrv_send_item (left, right); |
1664 | esrv_send_item (left, right); |
2103 | else |
1665 | else |