1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * 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 |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * 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, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * 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 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
32 | #include <bitset> |
33 | #include <bitset> |
33 | |
34 | |
34 | UUID UUID::cur; |
35 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
|
|
38 | uint32_t mapspace::smellcount = 10000; |
37 | |
39 | |
38 | objectvec objects; |
40 | objectvec objects; |
39 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
40 | |
44 | |
41 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
46 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
48 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
48 | 0, |
52 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
53 | -1, -1, 0, 1, 1, 1, 0, -1, |
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
54 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
51 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
55 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
52 | }; |
56 | }; |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
58 | }; |
|
|
59 | int freedir[SIZEOFFREE] = { |
57 | int freedir[SIZEOFFREE] = { |
60 | 0, |
58 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
59 | 1, 2, 3, 4, 5, 6, 7, 8, |
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
60 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
61 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
|
|
62 | }; |
|
|
63 | |
|
|
64 | static int maxfree[SIZEOFFREE] = { |
|
|
65 | 0, |
|
|
66 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
67 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
64 | }; |
69 | }; |
65 | |
70 | |
66 | static void |
71 | static void |
67 | write_uuid (uval64 skip, bool sync) |
72 | write_uuid (uval64 skip, bool sync) |
68 | { |
73 | { |
… | |
… | |
186 | || ob1->speed != ob2->speed |
191 | || ob1->speed != ob2->speed |
187 | || ob1->value != ob2->value |
192 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
193 | || ob1->name != ob2->name) |
189 | return 0; |
194 | return 0; |
190 | |
195 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
196 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
197 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
198 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
194 | * nrof values. |
|
|
195 | */ |
|
|
196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
197 | return 0; |
199 | return 0; |
198 | |
200 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
201 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | * This is to the comparison of the flags below will be OK. We |
202 | * This is to the comparison of the flags below will be OK. We |
201 | * just can't ignore the been applied or identified flags, as they |
203 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
208 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
209 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
210 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
211 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
212 | |
211 | if (ob1->arch->name != ob2->arch->name |
213 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
214 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
215 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
216 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
217 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
218 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
219 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
220 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
221 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
222 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
223 | || ob1->animation_id != ob2->animation_id |
|
|
224 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
225 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
226 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
227 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
228 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
229 | || ob1->move_type != ob2->move_type |
… | |
… | |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
238 | return 0; |
236 | |
239 | |
237 | if ((ob1->flag ^ ob2->flag) |
240 | if ((ob1->flag ^ ob2->flag) |
238 | .reset (FLAG_INV_LOCKED) |
241 | .reset (FLAG_INV_LOCKED) |
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
242 | .reset (FLAG_REMOVED) |
241 | .any ()) |
243 | .any ()) |
242 | return 0; |
244 | return 0; |
243 | |
245 | |
244 | /* This is really a spellbook check - we should in general |
246 | /* This is really a spellbook check - we should in general |
… | |
… | |
326 | { |
328 | { |
327 | // see if we are in a container of sorts |
329 | // see if we are in a container of sorts |
328 | if (env) |
330 | if (env) |
329 | { |
331 | { |
330 | // the player inventory itself is always visible |
332 | // the player inventory itself is always visible |
331 | if (env->type == PLAYER) |
333 | if (env->is_player ()) |
332 | return env; |
334 | return env; |
333 | |
335 | |
334 | // else a player could have our env open |
336 | // else a player could have our env open |
335 | object *envest = env->outer_env (); |
337 | object *envest = env->outer_env_or_self (); |
336 | |
338 | |
337 | // the player itself is always on a map, so we will find him here |
339 | // the player itself is always on a map, so we will find him here |
338 | // even if our inv is in a player. |
340 | // even if our inv is in a player. |
339 | if (envest->is_on_map ()) |
341 | if (envest->is_on_map ()) |
340 | if (object *pl = envest->ms ().player ()) |
342 | if (object *pl = envest->ms ().player ()) |
341 | if (pl->container == env) |
343 | if (pl->container_ () == env) |
342 | return pl; |
344 | return pl; |
343 | } |
345 | } |
344 | else |
346 | else |
345 | { |
347 | { |
346 | // maybe there is a player standing on the same mapspace |
348 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
349 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
350 | if (object *pl = ms ().player ()) |
349 | if (!pl->container || this == pl->container) |
351 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
352 | || pl->container_ () == this) |
350 | return pl; |
353 | return pl; |
351 | } |
354 | } |
352 | } |
355 | } |
353 | |
356 | |
354 | return 0; |
357 | return 0; |
355 | } |
358 | } |
356 | |
359 | |
357 | // adjust weight per container type ("of holding") |
360 | // adjust weight per container type ("of holding") |
358 | static sint32 |
361 | static sint32 |
359 | weight_adjust (object *op, sint32 weight) |
362 | weight_adjust_for (object *op, sint32 weight) |
360 | { |
363 | { |
361 | return op->type == CONTAINER |
364 | return op->type == CONTAINER |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
365 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | : weight; |
366 | : weight; |
364 | } |
367 | } |
… | |
… | |
370 | static void |
373 | static void |
371 | adjust_weight (object *op, sint32 weight) |
374 | adjust_weight (object *op, sint32 weight) |
372 | { |
375 | { |
373 | while (op) |
376 | while (op) |
374 | { |
377 | { |
|
|
378 | // adjust by actual difference to account for rounding errors |
|
|
379 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
375 | weight = weight_adjust (op, weight); |
380 | weight = weight_adjust_for (op, op->carrying) |
|
|
381 | - weight_adjust_for (op, op->carrying - weight); |
376 | |
382 | |
377 | if (!weight) |
383 | if (!weight) |
378 | return; |
384 | return; |
379 | |
385 | |
380 | op->carrying += weight; |
386 | op->carrying += weight; |
… | |
… | |
403 | op->update_weight (); |
409 | op->update_weight (); |
404 | |
410 | |
405 | sum += op->total_weight (); |
411 | sum += op->total_weight (); |
406 | } |
412 | } |
407 | |
413 | |
408 | sum = weight_adjust (this, sum); |
414 | sum = weight_adjust_for (this, sum); |
409 | |
415 | |
410 | if (sum != carrying) |
416 | if (sum != carrying) |
411 | { |
417 | { |
412 | carrying = sum; |
418 | carrying = sum; |
413 | |
419 | |
… | |
… | |
429 | object_freezer freezer; |
435 | object_freezer freezer; |
430 | op->write (freezer); |
436 | op->write (freezer); |
431 | return freezer.as_string (); |
437 | return freezer.as_string (); |
432 | } |
438 | } |
433 | |
439 | |
434 | /* |
440 | char * |
435 | * get_nearest_part(multi-object, object 2) returns the part of the |
441 | object::as_string () |
436 | * multi-object 1 which is closest to the second object. |
|
|
437 | * If it's not a multi-object, it is returned. |
|
|
438 | */ |
|
|
439 | object * |
|
|
440 | get_nearest_part (object *op, const object *pl) |
|
|
441 | { |
442 | { |
442 | object *tmp, *closest; |
443 | return dump_object (this); |
443 | int last_dist, i; |
|
|
444 | |
|
|
445 | if (!op->more) |
|
|
446 | return op; |
|
|
447 | |
|
|
448 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
449 | tmp; |
|
|
450 | tmp = tmp->more) |
|
|
451 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
452 | closest = tmp, last_dist = i; |
|
|
453 | |
|
|
454 | return closest; |
|
|
455 | } |
444 | } |
456 | |
445 | |
457 | /* |
446 | /* |
458 | * Returns the object which has the count-variable equal to the argument. |
447 | * Returns the object which has the count-variable equal to the argument. |
459 | * VERRRY slow. |
448 | * VERRRY slow. |
… | |
… | |
475 | */ |
464 | */ |
476 | object * |
465 | object * |
477 | find_object_name (const char *str) |
466 | find_object_name (const char *str) |
478 | { |
467 | { |
479 | shstr_cmp str_ (str); |
468 | shstr_cmp str_ (str); |
480 | object *op; |
|
|
481 | |
469 | |
|
|
470 | if (str_) |
482 | for_all_objects (op) |
471 | for_all_objects (op) |
483 | if (op->name == str_) |
472 | if (op->name == str_) |
484 | break; |
473 | return op; |
485 | |
474 | |
486 | return op; |
475 | return 0; |
487 | } |
476 | } |
488 | |
477 | |
489 | /* |
478 | /* |
490 | * Sets the owner and sets the skill and exp pointers to owner's current |
479 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * skill and experience objects. |
480 | * skill and experience objects. |
… | |
… | |
553 | update_stats (); |
542 | update_stats (); |
554 | |
543 | |
555 | new_draw_info_format (NDI_UNIQUE, 0, this, |
544 | new_draw_info_format (NDI_UNIQUE, 0, this, |
556 | "You try to balance all your items at once, " |
545 | "You try to balance all your items at once, " |
557 | "but the %s is just too much for your body. " |
546 | "but the %s is just too much for your body. " |
558 | "[You need to unapply some items first.]", &ob->name); |
547 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
548 | "how many items you cna wera on a specific body part.]", &ob->name); |
559 | return false; |
549 | return false; |
560 | } |
550 | } |
561 | |
551 | |
562 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
552 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
563 | } |
553 | } |
… | |
… | |
635 | } |
625 | } |
636 | |
626 | |
637 | if (speed < 0) |
627 | if (speed < 0) |
638 | dst->speed_left -= rndm (); |
628 | dst->speed_left -= rndm (); |
639 | |
629 | |
640 | dst->set_speed (dst->speed); |
630 | dst->activate (); |
641 | } |
631 | } |
642 | |
632 | |
643 | void |
633 | void |
644 | object::instantiate () |
634 | object::instantiate () |
645 | { |
635 | { |
… | |
… | |
757 | else if (action == UP_OBJ_INSERT) |
747 | else if (action == UP_OBJ_INSERT) |
758 | { |
748 | { |
759 | // this is likely overkill, TODO: revisit (schmorp) |
749 | // this is likely overkill, TODO: revisit (schmorp) |
760 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
750 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
761 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
751 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
762 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
752 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
763 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
753 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
764 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
754 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
765 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
755 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (m.move_on | op->move_on ) != m.move_on |
756 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_off | op->move_off ) != m.move_off |
757 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_slow | op->move_slow) != m.move_slow |
758 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | /* This isn't perfect, but I don't expect a lot of objects to |
759 | /* This isn't perfect, but I don't expect a lot of objects to |
770 | * to have move_allow right now. |
760 | * have move_allow right now. |
771 | */ |
761 | */ |
772 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
762 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
773 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
763 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
774 | m.flags_ = 0; |
764 | m.invalidate (); |
775 | } |
765 | } |
776 | /* if the object is being removed, we can't make intelligent |
766 | /* if the object is being removed, we can't make intelligent |
777 | * decisions, because remove_ob can't really pass the object |
767 | * decisions, because remove_ob can't really pass the object |
778 | * that is being removed. |
768 | * that is being removed. |
779 | */ |
769 | */ |
780 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
770 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
781 | m.flags_ = 0; |
771 | m.invalidate (); |
782 | else if (action == UP_OBJ_FACE) |
772 | else if (action == UP_OBJ_FACE) |
783 | /* Nothing to do for that case */ ; |
773 | /* Nothing to do for that case */ ; |
784 | else |
774 | else |
785 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
775 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
786 | |
776 | |
… | |
… | |
790 | |
780 | |
791 | object::object () |
781 | object::object () |
792 | { |
782 | { |
793 | SET_FLAG (this, FLAG_REMOVED); |
783 | SET_FLAG (this, FLAG_REMOVED); |
794 | |
784 | |
795 | expmul = 1.0; |
785 | //expmul = 1.0; declared const for the time being |
796 | face = blank_face; |
786 | face = blank_face; |
797 | } |
787 | } |
798 | |
788 | |
799 | object::~object () |
789 | object::~object () |
800 | { |
790 | { |
… | |
… | |
830 | /* If already on active list, don't do anything */ |
820 | /* If already on active list, don't do anything */ |
831 | if (active) |
821 | if (active) |
832 | return; |
822 | return; |
833 | |
823 | |
834 | if (has_active_speed ()) |
824 | if (has_active_speed ()) |
|
|
825 | { |
|
|
826 | if (flag [FLAG_FREED]) |
|
|
827 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
828 | |
835 | actives.insert (this); |
829 | actives.insert (this); |
|
|
830 | } |
836 | } |
831 | } |
837 | |
832 | |
838 | void |
833 | void |
839 | object::activate_recursive () |
834 | object::activate_recursive () |
840 | { |
835 | { |
… | |
… | |
901 | * drop on that space. |
896 | * drop on that space. |
902 | */ |
897 | */ |
903 | if (!drop_to_ground |
898 | if (!drop_to_ground |
904 | || !map |
899 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
900 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
901 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
902 | || ms ().move_block == MOVE_ALL) |
908 | { |
903 | { |
909 | while (inv) |
904 | while (inv) |
910 | { |
|
|
911 | inv->destroy_inv (false); |
|
|
912 | inv->destroy (); |
905 | inv->destroy (); |
913 | } |
|
|
914 | } |
906 | } |
915 | else |
907 | else |
916 | { /* Put objects in inventory onto this space */ |
908 | { /* Put objects in inventory onto this space */ |
917 | while (inv) |
909 | while (inv) |
918 | { |
910 | { |
… | |
… | |
922 | || op->flag [FLAG_NO_DROP] |
914 | || op->flag [FLAG_NO_DROP] |
923 | || op->type == RUNE |
915 | || op->type == RUNE |
924 | || op->type == TRAP |
916 | || op->type == TRAP |
925 | || op->flag [FLAG_IS_A_TEMPLATE] |
917 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
918 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | op->destroy (true); |
919 | op->destroy (); |
928 | else |
920 | else |
929 | map->insert (op, x, y); |
921 | map->insert (op, x, y); |
930 | } |
922 | } |
931 | } |
923 | } |
932 | } |
924 | } |
… | |
… | |
940 | |
932 | |
941 | static struct freed_map : maptile |
933 | static struct freed_map : maptile |
942 | { |
934 | { |
943 | freed_map () |
935 | freed_map () |
944 | { |
936 | { |
945 | path = "<freed objects map>"; |
937 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
938 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
939 | width = 3; |
948 | height = 3; |
940 | height = 3; |
949 | nodrop = 1; |
941 | no_drop = 1; |
|
|
942 | no_reset = 1; |
950 | |
943 | |
951 | alloc (); |
944 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
945 | in_memory = MAP_ACTIVE; |
953 | } |
946 | } |
954 | |
947 | |
… | |
… | |
960 | |
953 | |
961 | void |
954 | void |
962 | object::do_destroy () |
955 | object::do_destroy () |
963 | { |
956 | { |
964 | if (flag [FLAG_IS_LINKED]) |
957 | if (flag [FLAG_IS_LINKED]) |
965 | remove_button_link (this); |
958 | remove_link (); |
966 | |
959 | |
967 | if (flag [FLAG_FRIENDLY]) |
960 | if (flag [FLAG_FRIENDLY]) |
968 | remove_friendly_object (this); |
961 | remove_friendly_object (this); |
969 | |
962 | |
970 | remove (); |
963 | remove (); |
… | |
… | |
995 | attacked_by = 0; |
988 | attacked_by = 0; |
996 | current_weapon = 0; |
989 | current_weapon = 0; |
997 | } |
990 | } |
998 | |
991 | |
999 | void |
992 | void |
1000 | object::destroy (bool destroy_inventory) |
993 | object::destroy () |
1001 | { |
994 | { |
1002 | if (destroyed ()) |
995 | if (destroyed ()) |
1003 | return; |
996 | return; |
1004 | |
997 | |
1005 | if (!is_head () && !head->destroyed ()) |
998 | if (!is_head () && !head->destroyed ()) |
1006 | { |
999 | { |
1007 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1000 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1008 | head->destroy (destroy_inventory); |
1001 | head->destroy (); |
1009 | return; |
1002 | return; |
1010 | } |
1003 | } |
1011 | |
1004 | |
1012 | destroy_inv (!destroy_inventory); |
1005 | destroy_inv (false); |
1013 | |
1006 | |
1014 | if (is_head ()) |
1007 | if (is_head ()) |
1015 | if (sound_destroy) |
1008 | if (sound_destroy) |
1016 | play_sound (sound_destroy); |
1009 | play_sound (sound_destroy); |
1017 | else if (flag [FLAG_MONSTER]) |
1010 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1028 | * the previous environment. |
1021 | * the previous environment. |
1029 | */ |
1022 | */ |
1030 | void |
1023 | void |
1031 | object::do_remove () |
1024 | object::do_remove () |
1032 | { |
1025 | { |
1033 | object *tmp, *last = 0; |
|
|
1034 | object *otmp; |
|
|
1035 | |
|
|
1036 | if (flag [FLAG_REMOVED]) |
1026 | if (flag [FLAG_REMOVED]) |
1037 | return; |
1027 | return; |
1038 | |
1028 | |
1039 | INVOKE_OBJECT (REMOVE, this); |
1029 | INVOKE_OBJECT (REMOVE, this); |
1040 | |
1030 | |
… | |
… | |
1054 | esrv_del_item (pl->contr, count); |
1044 | esrv_del_item (pl->contr, count); |
1055 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1045 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1056 | |
1046 | |
1057 | adjust_weight (env, -total_weight ()); |
1047 | adjust_weight (env, -total_weight ()); |
1058 | |
1048 | |
1059 | *(above ? &above->below : &env->inv) = below; |
1049 | object *pl = in_player (); |
1060 | |
|
|
1061 | if (below) |
|
|
1062 | below->above = above; |
|
|
1063 | |
1050 | |
1064 | /* we set up values so that it could be inserted into |
1051 | /* we set up values so that it could be inserted into |
1065 | * the map, but we don't actually do that - it is up |
1052 | * the map, but we don't actually do that - it is up |
1066 | * to the caller to decide what we want to do. |
1053 | * to the caller to decide what we want to do. |
1067 | */ |
1054 | */ |
1068 | map = env->map; |
1055 | map = env->map; |
1069 | x = env->x; |
1056 | x = env->x; |
1070 | y = env->y; |
1057 | y = env->y; |
|
|
1058 | |
|
|
1059 | // make sure cmov optimisation is applicable |
|
|
1060 | *(above ? &above->below : &env->inv) = below; |
|
|
1061 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1062 | |
1071 | above = 0; |
1063 | above = 0; |
1072 | below = 0; |
1064 | below = 0; |
1073 | env = 0; |
1065 | env = 0; |
1074 | |
1066 | |
1075 | /* NO_FIX_PLAYER is set when a great many changes are being |
1067 | /* NO_FIX_PLAYER is set when a great many changes are being |
1076 | * made to players inventory. If set, avoiding the call |
1068 | * made to players inventory. If set, avoiding the call |
1077 | * to save cpu time. |
1069 | * to save cpu time. |
1078 | */ |
1070 | */ |
1079 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1071 | if (pl) |
|
|
1072 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1073 | { |
1080 | otmp->update_stats (); |
1074 | pl->update_stats (); |
|
|
1075 | |
|
|
1076 | if (glow_radius && pl->is_on_map ()) |
|
|
1077 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1078 | } |
1081 | } |
1079 | } |
1082 | else if (map) |
1080 | else if (map) |
1083 | { |
1081 | { |
1084 | map->dirty = true; |
1082 | map->dirty = true; |
1085 | mapspace &ms = this->ms (); |
1083 | mapspace &ms = this->ms (); |
1086 | |
1084 | |
1087 | if (object *pl = ms.player ()) |
1085 | if (object *pl = ms.player ()) |
1088 | { |
1086 | { |
1089 | if (type == PLAYER) // this == pl(!) |
1087 | if (is_player ()) |
1090 | { |
1088 | { |
|
|
1089 | if (!flag [FLAG_WIZPASS]) |
|
|
1090 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1091 | |
1091 | // leaving a spot always closes any open container on the ground |
1092 | // leaving a spot always closes any open container on the ground |
1092 | if (container && !container->env) |
1093 | if (container && !container->env) |
1093 | // this causes spurious floorbox updates, but it ensures |
1094 | // this causes spurious floorbox updates, but it ensures |
1094 | // that the CLOSE event is being sent. |
1095 | // that the CLOSE event is being sent. |
1095 | close_container (); |
1096 | close_container (); |
1096 | |
1097 | |
1097 | --map->players; |
1098 | --map->players; |
1098 | map->touch (); |
1099 | map->touch (); |
1099 | } |
1100 | } |
1100 | else if (pl->container == this) |
1101 | else if (pl->container_ () == this) |
1101 | { |
1102 | { |
1102 | // removing a container should close it |
1103 | // removing a container should close it |
1103 | close_container (); |
1104 | close_container (); |
1104 | } |
1105 | } |
1105 | |
1106 | |
1106 | esrv_del_item (pl->contr, count); |
1107 | esrv_del_item (pl->contr, count); |
1107 | } |
1108 | } |
1108 | |
1109 | |
1109 | /* link the object above us */ |
1110 | /* link the object above us */ |
1110 | if (above) |
1111 | // re-link, make sure compiler can easily use cmove |
1111 | above->below = below; |
1112 | *(above ? &above->below : &ms.top) = below; |
1112 | else |
1113 | *(below ? &below->above : &ms.bot) = above; |
1113 | ms.top = below; /* we were top, set new top */ |
|
|
1114 | |
|
|
1115 | /* Relink the object below us, if there is one */ |
|
|
1116 | if (below) |
|
|
1117 | below->above = above; |
|
|
1118 | else |
|
|
1119 | { |
|
|
1120 | /* Nothing below, which means we need to relink map object for this space |
|
|
1121 | * use translated coordinates in case some oddness with map tiling is |
|
|
1122 | * evident |
|
|
1123 | */ |
|
|
1124 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1125 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1126 | |
|
|
1127 | ms.bot = above; /* goes on above it. */ |
|
|
1128 | } |
|
|
1129 | |
1114 | |
1130 | above = 0; |
1115 | above = 0; |
1131 | below = 0; |
1116 | below = 0; |
1132 | |
1117 | |
|
|
1118 | ms.invalidate (); |
|
|
1119 | |
1133 | if (map->in_memory == MAP_SAVING) |
1120 | if (map->in_memory == MAP_SAVING) |
1134 | return; |
1121 | return; |
1135 | |
1122 | |
1136 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1123 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1137 | |
1124 | |
1138 | if (object *pl = ms.player ()) |
1125 | if (object *pl = ms.player ()) |
1139 | { |
1126 | { |
1140 | if (pl->container == this) |
1127 | if (pl->container_ () == this) |
1141 | /* If a container that the player is currently using somehow gets |
1128 | /* If a container that the player is currently using somehow gets |
1142 | * removed (most likely destroyed), update the player view |
1129 | * removed (most likely destroyed), update the player view |
1143 | * appropriately. |
1130 | * appropriately. |
1144 | */ |
1131 | */ |
1145 | pl->close_container (); |
1132 | pl->close_container (); |
… | |
… | |
1149 | //TODO: update floorbox to preserve ordering |
1136 | //TODO: update floorbox to preserve ordering |
1150 | if (pl->contr->ns) |
1137 | if (pl->contr->ns) |
1151 | pl->contr->ns->floorbox_update (); |
1138 | pl->contr->ns->floorbox_update (); |
1152 | } |
1139 | } |
1153 | |
1140 | |
|
|
1141 | if (check_walk_off) |
1154 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1142 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1155 | { |
1143 | { |
|
|
1144 | above = tmp->above; |
|
|
1145 | |
1156 | /* No point updating the players look faces if he is the object |
1146 | /* No point updating the players look faces if he is the object |
1157 | * being removed. |
1147 | * being removed. |
1158 | */ |
1148 | */ |
1159 | |
1149 | |
1160 | /* See if object moving off should effect something */ |
1150 | /* See if object moving off should effect something */ |
1161 | if (check_walk_off |
|
|
1162 | && ((move_type & tmp->move_off) |
1151 | if ((move_type & tmp->move_off) |
1163 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1152 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1164 | { |
|
|
1165 | move_apply (tmp, this, 0); |
1153 | move_apply (tmp, this, 0); |
1166 | |
|
|
1167 | if (destroyed ()) |
|
|
1168 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1169 | } |
1154 | } |
1170 | |
1155 | |
1171 | last = tmp; |
1156 | if (affects_los ()) |
1172 | } |
|
|
1173 | |
|
|
1174 | /* last == NULL if there are no objects on this space */ |
|
|
1175 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1176 | if (!last) |
|
|
1177 | map->at (x, y).flags_ = 0; |
|
|
1178 | else |
|
|
1179 | update_object (last, UP_OBJ_REMOVE); |
|
|
1180 | |
|
|
1181 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1182 | update_all_los (map, x, y); |
1157 | update_all_los (map, x, y); |
1183 | } |
1158 | } |
1184 | } |
1159 | } |
1185 | |
1160 | |
1186 | /* |
1161 | /* |
… | |
… | |
1210 | esrv_update_item (UPD_NROF, pl, top); |
1185 | esrv_update_item (UPD_NROF, pl, top); |
1211 | |
1186 | |
1212 | op->weight = 0; // cancel the addition above |
1187 | op->weight = 0; // cancel the addition above |
1213 | op->carrying = 0; // must be 0 already |
1188 | op->carrying = 0; // must be 0 already |
1214 | |
1189 | |
1215 | op->destroy (1); |
1190 | op->destroy (); |
1216 | |
1191 | |
1217 | return top; |
1192 | return top; |
1218 | } |
1193 | } |
1219 | |
1194 | |
1220 | return 0; |
1195 | return 0; |
… | |
… | |
1248 | * job preparing multi-part monsters. |
1223 | * job preparing multi-part monsters. |
1249 | */ |
1224 | */ |
1250 | object * |
1225 | object * |
1251 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1226 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1252 | { |
1227 | { |
|
|
1228 | op->remove (); |
|
|
1229 | |
1253 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1230 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1254 | { |
1231 | { |
1255 | tmp->x = x + tmp->arch->x; |
1232 | tmp->x = x + tmp->arch->x; |
1256 | tmp->y = y + tmp->arch->y; |
1233 | tmp->y = y + tmp->arch->y; |
1257 | } |
1234 | } |
… | |
… | |
1280 | * just 'op' otherwise |
1257 | * just 'op' otherwise |
1281 | */ |
1258 | */ |
1282 | object * |
1259 | object * |
1283 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1260 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1284 | { |
1261 | { |
1285 | assert (!op->flag [FLAG_FREED]); |
|
|
1286 | |
|
|
1287 | op->remove (); |
1262 | op->remove (); |
|
|
1263 | |
|
|
1264 | if (m == &freed_map)//D TODO: remove soon |
|
|
1265 | {//D |
|
|
1266 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1267 | }//D |
1288 | |
1268 | |
1289 | /* Ideally, the caller figures this out. However, it complicates a lot |
1269 | /* Ideally, the caller figures this out. However, it complicates a lot |
1290 | * of areas of callers (eg, anything that uses find_free_spot would now |
1270 | * of areas of callers (eg, anything that uses find_free_spot would now |
1291 | * need extra work |
1271 | * need extra work |
1292 | */ |
1272 | */ |
|
|
1273 | maptile *newmap = m; |
1293 | if (!xy_normalise (m, op->x, op->y)) |
1274 | if (!xy_normalise (newmap, op->x, op->y)) |
1294 | { |
1275 | { |
1295 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1276 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1296 | return 0; |
1277 | return 0; |
1297 | } |
1278 | } |
1298 | |
1279 | |
1299 | if (object *more = op->more) |
1280 | if (object *more = op->more) |
1300 | if (!insert_ob_in_map (more, m, originator, flag)) |
1281 | if (!insert_ob_in_map (more, m, originator, flag)) |
1301 | return 0; |
1282 | return 0; |
1302 | |
1283 | |
1303 | CLEAR_FLAG (op, FLAG_REMOVED); |
1284 | op->flag [FLAG_REMOVED] = false; |
1304 | |
1285 | op->env = 0; |
1305 | op->map = m; |
1286 | op->map = newmap; |
|
|
1287 | |
1306 | mapspace &ms = op->ms (); |
1288 | mapspace &ms = op->ms (); |
1307 | |
1289 | |
1308 | /* this has to be done after we translate the coordinates. |
1290 | /* this has to be done after we translate the coordinates. |
1309 | */ |
1291 | */ |
1310 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1292 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1311 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1293 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1312 | if (object::can_merge (op, tmp)) |
1294 | if (object::can_merge (op, tmp)) |
1313 | { |
1295 | { |
1314 | // TODO: we atcually want to update tmp, not op, |
1296 | // TODO: we actually want to update tmp, not op, |
1315 | // but some caller surely breaks when we return tmp |
1297 | // but some caller surely breaks when we return tmp |
1316 | // from here :/ |
1298 | // from here :/ |
1317 | op->nrof += tmp->nrof; |
1299 | op->nrof += tmp->nrof; |
1318 | tmp->destroy (1); |
1300 | tmp->destroy (); |
1319 | } |
1301 | } |
1320 | |
1302 | |
1321 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1303 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1322 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1304 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1323 | |
1305 | |
… | |
… | |
1330 | { |
1312 | { |
1331 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1313 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1332 | abort (); |
1314 | abort (); |
1333 | } |
1315 | } |
1334 | |
1316 | |
|
|
1317 | if (!originator->is_on_map ()) |
|
|
1318 | { |
|
|
1319 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1320 | op->debug_desc (), originator->debug_desc ()); |
|
|
1321 | abort (); |
|
|
1322 | } |
|
|
1323 | |
1335 | op->above = originator; |
1324 | op->above = originator; |
1336 | op->below = originator->below; |
1325 | op->below = originator->below; |
1337 | |
|
|
1338 | if (op->below) |
|
|
1339 | op->below->above = op; |
|
|
1340 | else |
|
|
1341 | ms.bot = op; |
|
|
1342 | |
|
|
1343 | /* since *below* originator, no need to update top */ |
|
|
1344 | originator->below = op; |
1326 | originator->below = op; |
|
|
1327 | |
|
|
1328 | *(op->below ? &op->below->above : &ms.bot) = op; |
1345 | } |
1329 | } |
1346 | else |
1330 | else |
1347 | { |
1331 | { |
1348 | object *top, *floor = NULL; |
1332 | object *floor = 0; |
1349 | |
1333 | object *top = ms.top; |
1350 | top = ms.bot; |
|
|
1351 | |
1334 | |
1352 | /* If there are other objects, then */ |
1335 | /* If there are other objects, then */ |
1353 | if (top) |
1336 | if (top) |
1354 | { |
1337 | { |
1355 | object *last = 0; |
|
|
1356 | |
|
|
1357 | /* |
1338 | /* |
1358 | * If there are multiple objects on this space, we do some trickier handling. |
1339 | * If there are multiple objects on this space, we do some trickier handling. |
1359 | * We've already dealt with merging if appropriate. |
1340 | * We've already dealt with merging if appropriate. |
1360 | * Generally, we want to put the new object on top. But if |
1341 | * Generally, we want to put the new object on top. But if |
1361 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1342 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1364 | * once we get to them. This reduces the need to traverse over all of |
1345 | * once we get to them. This reduces the need to traverse over all of |
1365 | * them when adding another one - this saves quite a bit of cpu time |
1346 | * them when adding another one - this saves quite a bit of cpu time |
1366 | * when lots of spells are cast in one area. Currently, it is presumed |
1347 | * when lots of spells are cast in one area. Currently, it is presumed |
1367 | * that flying non pickable objects are spell objects. |
1348 | * that flying non pickable objects are spell objects. |
1368 | */ |
1349 | */ |
1369 | for (top = ms.bot; top; top = top->above) |
1350 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1370 | { |
1351 | { |
1371 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1352 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1372 | floor = top; |
1353 | floor = tmp; |
1373 | |
1354 | |
1374 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1355 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1375 | { |
1356 | { |
1376 | /* We insert above top, so we want this object below this */ |
1357 | /* We insert above top, so we want this object below this */ |
1377 | top = top->below; |
1358 | top = tmp->below; |
1378 | break; |
1359 | break; |
1379 | } |
1360 | } |
1380 | |
1361 | |
1381 | last = top; |
1362 | top = tmp; |
1382 | } |
1363 | } |
1383 | |
|
|
1384 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1385 | top = last; |
|
|
1386 | |
1364 | |
1387 | /* We let update_position deal with figuring out what the space |
1365 | /* We let update_position deal with figuring out what the space |
1388 | * looks like instead of lots of conditions here. |
1366 | * looks like instead of lots of conditions here. |
1389 | * makes things faster, and effectively the same result. |
1367 | * makes things faster, and effectively the same result. |
1390 | */ |
1368 | */ |
… | |
… | |
1397 | */ |
1375 | */ |
1398 | if (!(flag & INS_ON_TOP) |
1376 | if (!(flag & INS_ON_TOP) |
1399 | && ms.flags () & P_BLOCKSVIEW |
1377 | && ms.flags () & P_BLOCKSVIEW |
1400 | && (op->face && !faces [op->face].visibility)) |
1378 | && (op->face && !faces [op->face].visibility)) |
1401 | { |
1379 | { |
|
|
1380 | object *last; |
|
|
1381 | |
1402 | for (last = top; last != floor; last = last->below) |
1382 | for (last = top; last != floor; last = last->below) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1383 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1404 | break; |
1384 | break; |
1405 | |
1385 | |
1406 | /* Check to see if we found the object that blocks view, |
1386 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1414 | } /* If objects on this space */ |
1394 | } /* If objects on this space */ |
1415 | |
1395 | |
1416 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1396 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1417 | top = floor; |
1397 | top = floor; |
1418 | |
1398 | |
1419 | /* Top is the object that our object (op) is going to get inserted above. |
1399 | // insert object above top, or bottom-most if top = 0 |
1420 | */ |
|
|
1421 | |
|
|
1422 | /* First object on this space */ |
|
|
1423 | if (!top) |
1400 | if (!top) |
1424 | { |
1401 | { |
|
|
1402 | op->below = 0; |
1425 | op->above = ms.bot; |
1403 | op->above = ms.bot; |
1426 | |
|
|
1427 | if (op->above) |
|
|
1428 | op->above->below = op; |
|
|
1429 | |
|
|
1430 | op->below = 0; |
|
|
1431 | ms.bot = op; |
1404 | ms.bot = op; |
|
|
1405 | |
|
|
1406 | *(op->above ? &op->above->below : &ms.top) = op; |
1432 | } |
1407 | } |
1433 | else |
1408 | else |
1434 | { /* get inserted into the stack above top */ |
1409 | { |
1435 | op->above = top->above; |
1410 | op->above = top->above; |
1436 | |
|
|
1437 | if (op->above) |
|
|
1438 | op->above->below = op; |
1411 | top->above = op; |
1439 | |
1412 | |
1440 | op->below = top; |
1413 | op->below = top; |
1441 | top->above = op; |
1414 | *(op->above ? &op->above->below : &ms.top) = op; |
1442 | } |
1415 | } |
|
|
1416 | } |
1443 | |
1417 | |
1444 | if (!op->above) |
1418 | if (op->is_player ()) |
1445 | ms.top = op; |
|
|
1446 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1447 | |
|
|
1448 | if (op->type == PLAYER) |
|
|
1449 | { |
1419 | { |
1450 | op->contr->do_los = 1; |
1420 | op->contr->do_los = 1; |
1451 | ++op->map->players; |
1421 | ++op->map->players; |
1452 | op->map->touch (); |
1422 | op->map->touch (); |
1453 | } |
1423 | } |
… | |
… | |
1468 | * be far away from this change and not affected in any way - |
1438 | * be far away from this change and not affected in any way - |
1469 | * this should get redone to only look for players within range, |
1439 | * this should get redone to only look for players within range, |
1470 | * or just updating the P_UPTODATE for spaces within this area |
1440 | * or just updating the P_UPTODATE for spaces within this area |
1471 | * of effect may be sufficient. |
1441 | * of effect may be sufficient. |
1472 | */ |
1442 | */ |
1473 | if (op->map->darkness && (op->glow_radius != 0)) |
1443 | if (op->affects_los ()) |
|
|
1444 | { |
|
|
1445 | op->ms ().invalidate (); |
1474 | update_all_los (op->map, op->x, op->y); |
1446 | update_all_los (op->map, op->x, op->y); |
|
|
1447 | } |
1475 | |
1448 | |
1476 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1477 | update_object (op, UP_OBJ_INSERT); |
1450 | update_object (op, UP_OBJ_INSERT); |
1478 | |
1451 | |
1479 | INVOKE_OBJECT (INSERT, op); |
1452 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1486 | * blocked() and wall() work properly), and these flags are updated by |
1459 | * blocked() and wall() work properly), and these flags are updated by |
1487 | * update_object(). |
1460 | * update_object(). |
1488 | */ |
1461 | */ |
1489 | |
1462 | |
1490 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1463 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1491 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1464 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1492 | { |
1465 | { |
1493 | if (check_move_on (op, originator)) |
1466 | if (check_move_on (op, originator)) |
1494 | return 0; |
1467 | return 0; |
1495 | |
1468 | |
1496 | /* If we are a multi part object, lets work our way through the check |
1469 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1507 | /* this function inserts an object in the map, but if it |
1480 | /* this function inserts an object in the map, but if it |
1508 | * finds an object of its own type, it'll remove that one first. |
1481 | * finds an object of its own type, it'll remove that one first. |
1509 | * op is the object to insert it under: supplies x and the map. |
1482 | * op is the object to insert it under: supplies x and the map. |
1510 | */ |
1483 | */ |
1511 | void |
1484 | void |
1512 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1485 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1513 | { |
1486 | { |
1514 | /* first search for itself and remove any old instances */ |
1487 | /* first search for itself and remove any old instances */ |
1515 | |
1488 | |
1516 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1489 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1517 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1490 | if (tmp->arch->archname == archname) /* same archetype */ |
1518 | tmp->destroy (1); |
1491 | tmp->destroy (); |
1519 | |
1492 | |
1520 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1493 | object *tmp = arch_to_object (archetype::find (archname)); |
1521 | |
1494 | |
1522 | tmp->x = op->x; |
1495 | tmp->x = op->x; |
1523 | tmp->y = op->y; |
1496 | tmp->y = op->y; |
1524 | |
1497 | |
1525 | insert_ob_in_map (tmp, op->map, op, 0); |
1498 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1547 | if (!nr) |
1520 | if (!nr) |
1548 | return true; |
1521 | return true; |
1549 | |
1522 | |
1550 | nr = min (nr, nrof); |
1523 | nr = min (nr, nrof); |
1551 | |
1524 | |
|
|
1525 | if (nrof > nr) |
|
|
1526 | { |
1552 | nrof -= nr; |
1527 | nrof -= nr; |
1553 | |
|
|
1554 | if (nrof) |
|
|
1555 | { |
|
|
1556 | adjust_weight (env, -weight * nr); // carrying == 0 |
1528 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1557 | |
1529 | |
1558 | if (object *pl = visible_to ()) |
1530 | if (object *pl = visible_to ()) |
1559 | esrv_update_item (UPD_NROF, pl, this); |
1531 | esrv_update_item (UPD_NROF, pl, this); |
1560 | |
1532 | |
1561 | return true; |
1533 | return true; |
1562 | } |
1534 | } |
1563 | else |
1535 | else |
1564 | { |
1536 | { |
1565 | destroy (1); |
1537 | destroy (); |
1566 | return false; |
1538 | return false; |
1567 | } |
1539 | } |
1568 | } |
1540 | } |
1569 | |
1541 | |
1570 | /* |
1542 | /* |
… | |
… | |
1647 | if (object *pl = tmp->visible_to ()) |
1619 | if (object *pl = tmp->visible_to ()) |
1648 | esrv_update_item (UPD_NROF, pl, tmp); |
1620 | esrv_update_item (UPD_NROF, pl, tmp); |
1649 | |
1621 | |
1650 | adjust_weight (this, op->total_weight ()); |
1622 | adjust_weight (this, op->total_weight ()); |
1651 | |
1623 | |
1652 | op->destroy (1); |
1624 | op->destroy (); |
1653 | op = tmp; |
1625 | op = tmp; |
1654 | goto inserted; |
1626 | goto inserted; |
1655 | } |
1627 | } |
1656 | |
1628 | |
1657 | op->owner = 0; // it's his/hers now. period. |
1629 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1675 | |
1647 | |
1676 | adjust_weight (this, op->total_weight ()); |
1648 | adjust_weight (this, op->total_weight ()); |
1677 | |
1649 | |
1678 | inserted: |
1650 | inserted: |
1679 | /* reset the light list and los of the players on the map */ |
1651 | /* reset the light list and los of the players on the map */ |
1680 | if (op->glow_radius && map && map->darkness) |
1652 | if (op->glow_radius && is_on_map ()) |
|
|
1653 | { |
|
|
1654 | update_stats (); |
1681 | update_all_los (map, x, y); |
1655 | update_all_los (map, x, y); |
1682 | |
1656 | } |
|
|
1657 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1683 | // if this is a player's inventory, update stats |
1658 | // if this is a player's inventory, update stats |
1684 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1685 | update_stats (); |
1659 | update_stats (); |
1686 | |
1660 | |
1687 | INVOKE_OBJECT (INSERT, this); |
1661 | INVOKE_OBJECT (INSERT, this); |
1688 | |
1662 | |
1689 | return op; |
1663 | return op; |
… | |
… | |
1710 | * on top. |
1684 | * on top. |
1711 | */ |
1685 | */ |
1712 | int |
1686 | int |
1713 | check_move_on (object *op, object *originator) |
1687 | check_move_on (object *op, object *originator) |
1714 | { |
1688 | { |
|
|
1689 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1690 | return 0; |
|
|
1691 | |
1715 | object *tmp; |
1692 | object *tmp; |
1716 | maptile *m = op->map; |
1693 | maptile *m = op->map; |
1717 | int x = op->x, y = op->y; |
1694 | int x = op->x, y = op->y; |
1718 | |
1695 | |
1719 | MoveType move_on, move_slow, move_block; |
1696 | mapspace &ms = m->at (x, y); |
1720 | |
1697 | |
1721 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1698 | ms.update (); |
1722 | return 0; |
|
|
1723 | |
1699 | |
1724 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1700 | MoveType move_on = ms.move_on; |
1725 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1701 | MoveType move_slow = ms.move_slow; |
1726 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1702 | MoveType move_block = ms.move_block; |
1727 | |
1703 | |
1728 | /* if nothing on this space will slow op down or be applied, |
1704 | /* if nothing on this space will slow op down or be applied, |
1729 | * no need to do checking below. have to make sure move_type |
1705 | * no need to do checking below. have to make sure move_type |
1730 | * is set, as lots of objects don't have it set - we treat that |
1706 | * is set, as lots of objects don't have it set - we treat that |
1731 | * as walking. |
1707 | * as walking. |
… | |
… | |
1742 | return 0; |
1718 | return 0; |
1743 | |
1719 | |
1744 | /* The objects have to be checked from top to bottom. |
1720 | /* The objects have to be checked from top to bottom. |
1745 | * Hence, we first go to the top: |
1721 | * Hence, we first go to the top: |
1746 | */ |
1722 | */ |
1747 | |
1723 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1748 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1749 | { |
|
|
1750 | /* Trim the search when we find the first other spell effect |
|
|
1751 | * this helps performance so that if a space has 50 spell objects, |
|
|
1752 | * we don't need to check all of them. |
|
|
1753 | */ |
|
|
1754 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1755 | break; |
|
|
1756 | } |
1724 | { |
|
|
1725 | next = tmp->below; |
1757 | |
1726 | |
1758 | for (; tmp; tmp = tmp->below) |
|
|
1759 | { |
|
|
1760 | if (tmp == op) |
1727 | if (tmp == op) |
1761 | continue; /* Can't apply yourself */ |
1728 | continue; /* Can't apply yourself */ |
1762 | |
1729 | |
1763 | /* Check to see if one of the movement types should be slowed down. |
1730 | /* Check to see if one of the movement types should be slowed down. |
1764 | * Second check makes sure that the movement types not being slowed |
1731 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1769 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1736 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1770 | { |
1737 | { |
1771 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1738 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1772 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1739 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1773 | { |
1740 | { |
1774 | |
|
|
1775 | float |
|
|
1776 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1741 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1777 | |
1742 | |
1778 | if (op->type == PLAYER) |
1743 | if (op->is_player ()) |
1779 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1744 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1780 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1745 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1781 | diff /= 4.0; |
1746 | diff /= 4.0; |
1782 | |
1747 | |
1783 | op->speed_left -= diff; |
1748 | op->speed_left -= diff; |
1784 | } |
1749 | } |
1785 | } |
1750 | } |
… | |
… | |
1991 | * head of the object should correspond for the entire object. |
1956 | * head of the object should correspond for the entire object. |
1992 | */ |
1957 | */ |
1993 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1958 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1994 | continue; |
1959 | continue; |
1995 | |
1960 | |
1996 | if (ob->blocked (m, pos.x, pos.y)) |
1961 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1997 | continue; |
1962 | continue; |
1998 | |
1963 | |
1999 | altern [index++] = i; |
1964 | altern [index++] = i; |
2000 | } |
1965 | } |
2001 | |
1966 | |
… | |
… | |
2069 | * there is capable of. |
2034 | * there is capable of. |
2070 | */ |
2035 | */ |
2071 | int |
2036 | int |
2072 | find_dir (maptile *m, int x, int y, object *exclude) |
2037 | find_dir (maptile *m, int x, int y, object *exclude) |
2073 | { |
2038 | { |
2074 | int i, max = SIZEOFFREE, mflags; |
2039 | int max = SIZEOFFREE, mflags; |
2075 | |
|
|
2076 | sint16 nx, ny; |
|
|
2077 | object *tmp; |
|
|
2078 | maptile *mp; |
|
|
2079 | |
|
|
2080 | MoveType blocked, move_type; |
2040 | MoveType move_type; |
2081 | |
2041 | |
2082 | if (exclude && exclude->head_ () != exclude) |
2042 | if (exclude && exclude->head_ () != exclude) |
2083 | { |
2043 | { |
2084 | exclude = exclude->head; |
2044 | exclude = exclude->head; |
2085 | move_type = exclude->move_type; |
2045 | move_type = exclude->move_type; |
… | |
… | |
2088 | { |
2048 | { |
2089 | /* If we don't have anything, presume it can use all movement types. */ |
2049 | /* If we don't have anything, presume it can use all movement types. */ |
2090 | move_type = MOVE_ALL; |
2050 | move_type = MOVE_ALL; |
2091 | } |
2051 | } |
2092 | |
2052 | |
2093 | for (i = 1; i < max; i++) |
2053 | for (int i = 1; i < max; i++) |
2094 | { |
2054 | { |
2095 | mp = m; |
2055 | mapxy pos (m, x, y); |
2096 | nx = x + freearr_x[i]; |
2056 | pos.move (i); |
2097 | ny = y + freearr_y[i]; |
|
|
2098 | |
2057 | |
2099 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2058 | if (!pos.normalise ()) |
2100 | |
|
|
2101 | if (mflags & P_OUT_OF_MAP) |
|
|
2102 | max = maxfree[i]; |
2059 | max = maxfree[i]; |
2103 | else |
2060 | else |
2104 | { |
2061 | { |
2105 | mapspace &ms = mp->at (nx, ny); |
2062 | mapspace &ms = *pos; |
2106 | |
2063 | |
2107 | blocked = ms.move_block; |
|
|
2108 | |
|
|
2109 | if ((move_type & blocked) == move_type) |
2064 | if ((move_type & ms.move_block) == move_type) |
2110 | max = maxfree[i]; |
2065 | max = maxfree [i]; |
2111 | else if (mflags & P_IS_ALIVE) |
2066 | else if (ms.flags () & P_IS_ALIVE) |
2112 | { |
2067 | { |
2113 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2068 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2114 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2069 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2115 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2070 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2116 | break; |
|
|
2117 | |
|
|
2118 | if (tmp) |
|
|
2119 | return freedir[i]; |
2071 | return freedir [i]; |
2120 | } |
2072 | } |
2121 | } |
2073 | } |
2122 | } |
2074 | } |
2123 | |
2075 | |
2124 | return 0; |
2076 | return 0; |
… | |
… | |
2199 | * This basically means that if direction is 15, then it could either go |
2151 | * This basically means that if direction is 15, then it could either go |
2200 | * direction 4, 14, or 16 to get back to where we are. |
2152 | * direction 4, 14, or 16 to get back to where we are. |
2201 | * Moved from spell_util.c to object.c with the other related direction |
2153 | * Moved from spell_util.c to object.c with the other related direction |
2202 | * functions. |
2154 | * functions. |
2203 | */ |
2155 | */ |
2204 | int reduction_dir[SIZEOFFREE][3] = { |
2156 | static const int reduction_dir[SIZEOFFREE][3] = { |
2205 | {0, 0, 0}, /* 0 */ |
2157 | {0, 0, 0}, /* 0 */ |
2206 | {0, 0, 0}, /* 1 */ |
2158 | {0, 0, 0}, /* 1 */ |
2207 | {0, 0, 0}, /* 2 */ |
2159 | {0, 0, 0}, /* 2 */ |
2208 | {0, 0, 0}, /* 3 */ |
2160 | {0, 0, 0}, /* 3 */ |
2209 | {0, 0, 0}, /* 4 */ |
2161 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2305 | int |
2257 | int |
2306 | can_pick (const object *who, const object *item) |
2258 | can_pick (const object *who, const object *item) |
2307 | { |
2259 | { |
2308 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2260 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2309 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2261 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2310 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2262 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2311 | } |
2263 | } |
2312 | |
2264 | |
2313 | /* |
2265 | /* |
2314 | * create clone from object to another |
2266 | * create clone from object to another |
2315 | */ |
2267 | */ |
… | |
… | |
2347 | return tmp; |
2299 | return tmp; |
2348 | |
2300 | |
2349 | return 0; |
2301 | return 0; |
2350 | } |
2302 | } |
2351 | |
2303 | |
2352 | const shstr & |
2304 | shstr_tmp |
2353 | object::kv_get (const shstr &key) const |
2305 | object::kv_get (shstr_tmp key) const |
2354 | { |
2306 | { |
2355 | for (key_value *kv = key_values; kv; kv = kv->next) |
2307 | for (key_value *kv = key_values; kv; kv = kv->next) |
2356 | if (kv->key == key) |
2308 | if (kv->key == key) |
2357 | return kv->value; |
2309 | return kv->value; |
2358 | |
2310 | |
2359 | return shstr_null; |
2311 | return shstr (); |
2360 | } |
2312 | } |
2361 | |
2313 | |
2362 | void |
2314 | void |
2363 | object::kv_set (const shstr &key, const shstr &value) |
2315 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2364 | { |
2316 | { |
2365 | for (key_value *kv = key_values; kv; kv = kv->next) |
2317 | for (key_value *kv = key_values; kv; kv = kv->next) |
2366 | if (kv->key == key) |
2318 | if (kv->key == key) |
2367 | { |
2319 | { |
2368 | kv->value = value; |
2320 | kv->value = value; |
… | |
… | |
2377 | |
2329 | |
2378 | key_values = kv; |
2330 | key_values = kv; |
2379 | } |
2331 | } |
2380 | |
2332 | |
2381 | void |
2333 | void |
2382 | object::kv_del (const shstr &key) |
2334 | object::kv_del (shstr_tmp key) |
2383 | { |
2335 | { |
2384 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2336 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2385 | if ((*kvp)->key == key) |
2337 | if ((*kvp)->key == key) |
2386 | { |
2338 | { |
2387 | key_value *kv = *kvp; |
2339 | key_value *kv = *kvp; |
… | |
… | |
2446 | { |
2398 | { |
2447 | char flagdesc[512]; |
2399 | char flagdesc[512]; |
2448 | char info2[256 * 4]; |
2400 | char info2[256 * 4]; |
2449 | char *p = info; |
2401 | char *p = info; |
2450 | |
2402 | |
2451 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2403 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2452 | count, |
2404 | count, |
2453 | uuid.c_str (), |
2405 | uuid.c_str (), |
2454 | &name, |
2406 | &name, |
2455 | title ? "\",title:\"" : "", |
2407 | title ? ",title:\"" : "", |
2456 | title ? (const char *)title : "", |
2408 | title ? (const char *)title : "", |
|
|
2409 | title ? "\"" : "", |
2457 | flag_desc (flagdesc, 512), type); |
2410 | flag_desc (flagdesc, 512), type); |
2458 | |
2411 | |
2459 | if (!flag[FLAG_REMOVED] && env) |
2412 | if (!flag[FLAG_REMOVED] && env) |
2460 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2413 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2461 | |
2414 | |
… | |
… | |
2517 | container = 0; |
2470 | container = 0; |
2518 | |
2471 | |
2519 | // client needs item update to make it work, client bug requires this to be separate |
2472 | // client needs item update to make it work, client bug requires this to be separate |
2520 | esrv_update_item (UPD_FLAGS, this, old_container); |
2473 | esrv_update_item (UPD_FLAGS, this, old_container); |
2521 | |
2474 | |
2522 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2475 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2523 | play_sound (sound_find ("chest_close")); |
2476 | play_sound (sound_find ("chest_close")); |
2524 | } |
2477 | } |
2525 | |
2478 | |
2526 | if (new_container) |
2479 | if (new_container) |
2527 | { |
2480 | { |
… | |
… | |
2537 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2490 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2538 | new_container->insert (closer); |
2491 | new_container->insert (closer); |
2539 | } |
2492 | } |
2540 | #endif |
2493 | #endif |
2541 | |
2494 | |
2542 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2495 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2543 | |
2496 | |
2544 | // make sure the container is available, client bug requires this to be separate |
2497 | // make sure the container is available, client bug requires this to be separate |
2545 | esrv_send_item (this, new_container); |
2498 | esrv_send_item (this, new_container); |
2546 | |
2499 | |
2547 | new_container->flag [FLAG_APPLIED] = true; |
2500 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2555 | // else if (!old_container->env && contr && contr->ns) |
2508 | // else if (!old_container->env && contr && contr->ns) |
2556 | // contr->ns->floorbox_reset (); |
2509 | // contr->ns->floorbox_reset (); |
2557 | } |
2510 | } |
2558 | |
2511 | |
2559 | object * |
2512 | object * |
2560 | object::force_find (const shstr name) |
2513 | object::force_find (shstr_tmp name) |
2561 | { |
2514 | { |
2562 | /* cycle through his inventory to look for the MARK we want to |
2515 | /* cycle through his inventory to look for the MARK we want to |
2563 | * place |
2516 | * place |
2564 | */ |
2517 | */ |
2565 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2518 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2567 | return splay (tmp); |
2520 | return splay (tmp); |
2568 | |
2521 | |
2569 | return 0; |
2522 | return 0; |
2570 | } |
2523 | } |
2571 | |
2524 | |
|
|
2525 | //-GPL |
|
|
2526 | |
2572 | void |
2527 | void |
|
|
2528 | object::force_set_timer (int duration) |
|
|
2529 | { |
|
|
2530 | this->duration = 1; |
|
|
2531 | this->speed_left = -1.f; |
|
|
2532 | |
|
|
2533 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2534 | } |
|
|
2535 | |
|
|
2536 | object * |
2573 | object::force_add (const shstr name, int duration) |
2537 | object::force_add (shstr_tmp name, int duration) |
2574 | { |
2538 | { |
2575 | if (object *force = force_find (name)) |
2539 | if (object *force = force_find (name)) |
2576 | force->destroy (); |
2540 | force->destroy (); |
2577 | |
2541 | |
2578 | object *force = get_archetype (FORCE_NAME); |
2542 | object *force = get_archetype (FORCE_NAME); |
2579 | |
2543 | |
2580 | force->slaying = name; |
2544 | force->slaying = name; |
2581 | force->stats.food = 1; |
2545 | force->force_set_timer (duration); |
2582 | force->speed_left = -1.f; |
|
|
2583 | |
|
|
2584 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2585 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2586 | force->flag [FLAG_APPLIED] = true; |
2546 | force->flag [FLAG_APPLIED] = true; |
2587 | |
2547 | |
2588 | insert (force); |
2548 | return insert (force); |
2589 | } |
2549 | } |
2590 | |
2550 | |
2591 | void |
2551 | void |
2592 | object::play_sound (faceidx sound) |
2552 | object::play_sound (faceidx sound) const |
2593 | { |
2553 | { |
2594 | if (!sound) |
2554 | if (!sound) |
2595 | return; |
2555 | return; |
2596 | |
2556 | |
2597 | if (flag [FLAG_REMOVED]) |
2557 | if (is_on_map ()) |
|
|
2558 | map->play_sound (sound, x, y); |
|
|
2559 | else if (object *pl = in_player ()) |
|
|
2560 | pl->contr->play_sound (sound); |
|
|
2561 | } |
|
|
2562 | |
|
|
2563 | void |
|
|
2564 | object::say_msg (const char *msg) const |
|
|
2565 | { |
|
|
2566 | if (is_on_map ()) |
|
|
2567 | map->say_msg (msg, x, y); |
|
|
2568 | else if (object *pl = in_player ()) |
|
|
2569 | pl->contr->play_sound (sound); |
|
|
2570 | } |
|
|
2571 | |
|
|
2572 | void |
|
|
2573 | object::make_noise () |
|
|
2574 | { |
|
|
2575 | // we do not model noise in the map, so instead put |
|
|
2576 | // a temporary light into the noise source |
|
|
2577 | // could use the map instead, but that's less reliable for our |
|
|
2578 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2579 | |
|
|
2580 | // currently only works sensibly for players |
|
|
2581 | if (!is_player ()) |
2598 | return; |
2582 | return; |
2599 | |
2583 | |
2600 | if (env) |
2584 | // find old force, or create new one |
2601 | { |
2585 | object *force = force_find (shstr_noise_force); |
2602 | if (object *pl = in_player ()) |
2586 | |
2603 | pl->contr->play_sound (sound); |
2587 | if (force) |
2604 | } |
2588 | force->speed_left = -1.f; // patch old speed up |
2605 | else |
2589 | else |
2606 | map->play_sound (sound, x, y); |
2590 | { |
2607 | } |
2591 | force = archetype::get (shstr_noise_force); |
2608 | |
2592 | |
|
|
2593 | force->slaying = shstr_noise_force; |
|
|
2594 | force->stats.food = 1; |
|
|
2595 | force->speed_left = -1.f; |
|
|
2596 | |
|
|
2597 | force->set_speed (1.f / 4.f); |
|
|
2598 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2599 | force->flag [FLAG_APPLIED] = true; |
|
|
2600 | |
|
|
2601 | insert (force); |
|
|
2602 | } |
|
|
2603 | } |
|
|
2604 | |