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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
8 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
12 | * option) any later version. |
12 | * |
13 | * |
13 | * This program is distributed in the hope that it will be useful, |
14 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
17 | * GNU General Public License for more details. |
17 | * |
18 | * |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * You should have received a copy of the Affero GNU General Public License |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * and the GNU General Public License along with this program. If not, see |
20 | * <http://www.gnu.org/licenses/>. |
21 | * <http://www.gnu.org/licenses/>. |
21 | * |
22 | * |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
24 | */ |
24 | |
25 | |
25 | #include <global.h> |
26 | #include <global.h> |
26 | #include <stdio.h> |
27 | #include <stdio.h> |
… | |
… | |
45 | uint32_t object::create_count; |
46 | uint32_t object::create_count; |
46 | uint32_t object::destroy_count; |
47 | uint32_t object::destroy_count; |
47 | |
48 | |
48 | //+GPL |
49 | //+GPL |
49 | |
50 | |
50 | short freearr_x[SIZEOFFREE] = { |
51 | int freearr_x[SIZEOFFREE] = { |
51 | 0, |
52 | 0, |
52 | 0, 1, 1, 1, 0, -1, -1, -1, |
53 | 0, 1, 1, 1, 0, -1, -1, -1, |
53 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
54 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
54 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
55 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
55 | }; |
56 | }; |
56 | short freearr_y[SIZEOFFREE] = { |
57 | int freearr_y[SIZEOFFREE] = { |
57 | 0, |
58 | 0, |
58 | -1, -1, 0, 1, 1, 1, 0, -1, |
59 | -1, -1, 0, 1, 1, 1, 0, -1, |
59 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
60 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
60 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
61 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
61 | }; |
62 | }; |
… | |
… | |
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
74 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
74 | }; |
75 | }; |
75 | |
76 | |
76 | const char *wall_suffix[16] = { |
77 | const char *wall_suffix[16] = { |
77 | "0", |
78 | "0", |
78 | "1_3", |
79 | "1_3", |
79 | "1_4", |
80 | "1_4", |
80 | "2_1_2", |
81 | "2_1_2", |
81 | "1_2", |
82 | "1_2", |
82 | "2_2_4", |
83 | "2_2_4", |
83 | "2_2_1", |
84 | "2_2_1", |
84 | "3_1", |
85 | "3_1", |
85 | "1_1", |
86 | "1_1", |
86 | "2_2_3", |
87 | "2_2_3", |
87 | "2_2_2", |
88 | "2_2_2", |
88 | "3_3", |
89 | "3_3", |
89 | "2_1_1", |
90 | "2_1_1", |
90 | "3_4", |
91 | "3_4", |
91 | "3_2", |
92 | "3_2", |
92 | "4" |
93 | "4" |
93 | }; |
94 | }; |
94 | |
95 | |
95 | static void |
96 | static void |
96 | write_uuid (uval64 skip, bool sync) |
97 | write_uuid (uval64 skip, bool sync) |
97 | { |
98 | { |
… | |
… | |
235 | static bool |
236 | static bool |
236 | compare_ob_value_lists_one (const object *wants, const object *has) |
237 | compare_ob_value_lists_one (const object *wants, const object *has) |
237 | { |
238 | { |
238 | /* n-squared behaviour (see kv.get), but I'm hoping both |
239 | /* n-squared behaviour (see kv.get), but I'm hoping both |
239 | * objects with lists are rare, and lists stay short. If not, use a |
240 | * objects with lists are rare, and lists stay short. If not, use a |
240 | * different structure or at least keep the lists sorted... |
241 | * different structure or at least keep the lists sorted... |
241 | */ |
242 | */ |
242 | |
243 | |
243 | /* For each field in wants, */ |
244 | /* For each field in wants, */ |
244 | for (key_value *kv = wants->kv.first; kv; kv = kv->next) |
245 | for (key_value *kv = wants->kv.first; kv; kv = kv->next) |
245 | if (has->kv.get (kv->key) != kv->value) |
246 | if (has->kv.get (kv->key) != kv->value) |
… | |
… | |
351 | /* inventory ok - still need to check rest of this object to see |
352 | /* inventory ok - still need to check rest of this object to see |
352 | * if it is valid. |
353 | * if it is valid. |
353 | */ |
354 | */ |
354 | } |
355 | } |
355 | |
356 | |
356 | /* Don't merge objects that are applied. With the new 'body' code, |
357 | /* Don't merge objects that are applied. With the new 'body' code, |
357 | * it is possible for most any character to have more than one of |
358 | * it is possible for most any character to have more than one of |
358 | * some items equipped, and we don't want those to merge. |
359 | * some items equipped, and we don't want those to merge. |
359 | */ |
360 | */ |
360 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
361 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
361 | return 0; |
362 | return 0; |
362 | |
363 | |
363 | /* Note sure why the following is the case - either the object has to |
364 | /* Not sure why the following is the case - either the object has to |
364 | * be animated or have a very low speed. Is this an attempted monster |
365 | * be animated or have a very low speed. Is this an attempted monster |
365 | * check? |
366 | * check? |
366 | */ |
367 | */ |
367 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
368 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
368 | return 0; |
369 | return 0; |
369 | |
370 | |
… | |
… | |
446 | |
447 | |
447 | return 0; |
448 | return 0; |
448 | } |
449 | } |
449 | |
450 | |
450 | // adjust weight per container type ("of holding") |
451 | // adjust weight per container type ("of holding") |
451 | static uint32 |
452 | static weight_t |
452 | weight_adjust_for (object *op, uint32 weight) |
453 | weight_adjust_for (object *op, weight_t weight) |
453 | { |
454 | { |
454 | return op->type == CONTAINER |
455 | if (op->type == CONTAINER) |
455 | ? weight - weight * op->stats.Str / 100 |
456 | weight -= weight * op->stats.Str / 100; |
456 | : weight; |
457 | |
|
|
458 | return weight; |
457 | } |
459 | } |
458 | |
460 | |
459 | /* |
461 | /* |
460 | * subtracts, then adds, the specified weight to an object, |
462 | * subtracts, then adds, the specified weight to an object, |
461 | * and also updates how much the environment(s) is/are carrying. |
463 | * and also updates how much the environment(s) is/are carrying. |
462 | */ |
464 | */ |
463 | static void |
465 | static void |
464 | adjust_weight (object *op, sint32 sub, sint32 add) |
466 | adjust_weight (object *op, weight_t sub, weight_t add) |
465 | { |
467 | { |
466 | while (op) |
468 | while (op) |
467 | { |
469 | { |
468 | sint32 ocarrying = op->carrying; |
470 | weight_t carrying = (weight_t)op->carrying |
|
|
471 | - weight_adjust_for (op, sub) |
|
|
472 | + weight_adjust_for (op, add); |
469 | |
473 | |
470 | op->carrying -= weight_adjust_for (op, sub); |
474 | sub = op->carrying; |
471 | op->carrying += weight_adjust_for (op, add); |
475 | op->carrying = carrying; |
|
|
476 | add = op->carrying; |
472 | |
477 | |
473 | if (object *pl = op->visible_to ()) |
478 | if (object *pl = op->visible_to ()) |
474 | if (pl != op) // player is handled lazily |
479 | if (pl != op) // player is handled lazily |
475 | esrv_update_item (UPD_WEIGHT, pl, op); |
480 | esrv_update_item (UPD_WEIGHT, pl, op); |
476 | |
481 | |
477 | sub = ocarrying; |
|
|
478 | add = op->carrying; |
|
|
479 | |
|
|
480 | op = op->env; |
482 | op = op->env; |
481 | } |
483 | } |
482 | } |
484 | } |
483 | |
485 | |
484 | /* |
486 | /* |
… | |
… | |
487 | * containers are carrying, and sums it up. |
489 | * containers are carrying, and sums it up. |
488 | */ |
490 | */ |
489 | void |
491 | void |
490 | object::update_weight () |
492 | object::update_weight () |
491 | { |
493 | { |
492 | sint32 sum = 0; |
494 | weight_t sum = 0; |
493 | |
495 | |
494 | for (object *op = inv; op; op = op->below) |
496 | for (object *op = inv; op; op = op->below) |
495 | { |
497 | { |
496 | op->update_weight (); |
498 | op->update_weight (); |
497 | |
499 | |
… | |
… | |
635 | speed_left = -1.; |
637 | speed_left = -1.; |
636 | |
638 | |
637 | /* copy the body_info to the body_used - this is only really |
639 | /* copy the body_info to the body_used - this is only really |
638 | * need for monsters, but doesn't hurt to do it for everything. |
640 | * need for monsters, but doesn't hurt to do it for everything. |
639 | * by doing so, when a monster is created, it has good starting |
641 | * by doing so, when a monster is created, it has good starting |
640 | * values for the body_used info, so when items are created |
642 | * values for the body_used info, so when items are created |
641 | * for it, they can be properly equipped. |
643 | * for it, they can be properly equipped. |
642 | */ |
644 | */ |
643 | for (int i = NUM_BODY_LOCATIONS; i--; ) |
645 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
644 | slot[i].used = slot[i].info; |
646 | slot[i].used = slot[i].info; |
645 | |
647 | |
646 | attachable::instantiate (); |
648 | attachable::instantiate (); |
647 | } |
649 | } |
648 | |
650 | |
… | |
… | |
752 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
754 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
753 | || (m.move_on | op->move_on ) != m.move_on |
755 | || (m.move_on | op->move_on ) != m.move_on |
754 | || (m.move_off | op->move_off ) != m.move_off |
756 | || (m.move_off | op->move_off ) != m.move_off |
755 | || (m.move_slow | op->move_slow) != m.move_slow |
757 | || (m.move_slow | op->move_slow) != m.move_slow |
756 | /* This isn't perfect, but I don't expect a lot of objects to |
758 | /* This isn't perfect, but I don't expect a lot of objects to |
757 | * have move_allow right now. |
759 | * have move_allow right now. |
758 | */ |
760 | */ |
759 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
761 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
760 | m.invalidate (); |
762 | m.invalidate (); |
761 | #else |
763 | #else |
762 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
764 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
… | |
… | |
842 | op->activate_recursive (); |
844 | op->activate_recursive (); |
843 | } |
845 | } |
844 | |
846 | |
845 | /* This function removes object 'op' from the list of active |
847 | /* This function removes object 'op' from the list of active |
846 | * objects. |
848 | * objects. |
847 | * This should only be used for style maps or other such |
849 | * This should only be used for style maps or other such |
848 | * reference maps where you don't want an object that isn't |
850 | * reference maps where you don't want an object that isn't |
849 | * in play chewing up cpu time getting processed. |
851 | * in play chewing up cpu time getting processed. |
850 | * The reverse of this is to call update_ob_speed, which |
852 | * The reverse of this is to call update_ob_speed, which |
851 | * will do the right thing based on the speed of the object. |
853 | * will do the right thing based on the speed of the object. |
852 | */ |
854 | */ |
… | |
… | |
1087 | flag [FLAG_REMOVED] = true; |
1089 | flag [FLAG_REMOVED] = true; |
1088 | |
1090 | |
1089 | if (more) |
1091 | if (more) |
1090 | more->remove (); |
1092 | more->remove (); |
1091 | |
1093 | |
1092 | /* |
1094 | /* |
1093 | * In this case, the object to be removed is in someones |
1095 | * In this case, the object to be removed is in someones |
1094 | * inventory. |
1096 | * inventory. |
1095 | */ |
1097 | */ |
1096 | if (env) |
1098 | if (env) |
1097 | { |
1099 | { |
… | |
… | |
1402 | * We've already dealt with merging if appropriate. |
1404 | * We've already dealt with merging if appropriate. |
1403 | * Generally, we want to put the new object on top. But if |
1405 | * Generally, we want to put the new object on top. But if |
1404 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1406 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1405 | * floor, we want to insert above that and no further. |
1407 | * floor, we want to insert above that and no further. |
1406 | * Also, if there are spell objects on this space, we stop processing |
1408 | * Also, if there are spell objects on this space, we stop processing |
1407 | * once we get to them. This reduces the need to traverse over all of |
1409 | * once we get to them. This reduces the need to traverse over all of |
1408 | * them when adding another one - this saves quite a bit of cpu time |
1410 | * them when adding another one - this saves quite a bit of cpu time |
1409 | * when lots of spells are cast in one area. Currently, it is presumed |
1411 | * when lots of spells are cast in one area. Currently, it is presumed |
1410 | * that flying non pickable objects are spell objects. |
1412 | * that flying non pickable objects are spell objects. |
1411 | */ |
1413 | */ |
1412 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1414 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
… | |
… | |
1538 | |
1540 | |
1539 | return op; |
1541 | return op; |
1540 | } |
1542 | } |
1541 | |
1543 | |
1542 | /* this function inserts an object in the map, but if it |
1544 | /* this function inserts an object in the map, but if it |
1543 | * finds an object of its own type, it'll remove that one first. |
1545 | * finds an object of its own type, it'll remove that one first. |
1544 | * op is the object to insert it under: supplies x and the map. |
1546 | * op is the object to insert it under: supplies x and the map. |
1545 | */ |
1547 | */ |
1546 | void |
1548 | void |
1547 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1549 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1548 | { |
1550 | { |
… | |
… | |
1580 | if (!items // testing !items ensures we can drop at least one item |
1582 | if (!items // testing !items ensures we can drop at least one item |
1581 | || (items < m->max_items |
1583 | || (items < m->max_items |
1582 | && ms.volume () < m->max_volume)) |
1584 | && ms.volume () < m->max_volume)) |
1583 | return true; |
1585 | return true; |
1584 | |
1586 | |
1585 | if (originator && originator->is_player ()) |
1587 | if (originator) |
1586 | originator->contr->failmsgf ( |
1588 | originator->failmsgf ( |
1587 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1589 | "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>", |
1588 | query_name () |
1590 | query_name () |
1589 | ); |
1591 | ); |
1590 | |
1592 | |
1591 | return false; |
1593 | return false; |
1592 | } |
1594 | } |
… | |
… | |
1606 | |
1608 | |
1607 | nr = min (nr, nrof); |
1609 | nr = min (nr, nrof); |
1608 | |
1610 | |
1609 | if (nrof > nr) |
1611 | if (nrof > nr) |
1610 | { |
1612 | { |
1611 | sint64 oweight = total_weight (); |
1613 | weight_t oweight = total_weight (); |
1612 | |
1614 | |
1613 | nrof -= nr; |
1615 | nrof -= nr; |
1614 | |
1616 | |
1615 | if (object *pl = visible_to ()) |
1617 | if (object *pl = visible_to ()) |
1616 | esrv_update_item (UPD_NROF, pl, this); |
1618 | esrv_update_item (UPD_NROF, pl, this); |
… | |
… | |
1677 | /* |
1679 | /* |
1678 | * env->insert (op) |
1680 | * env->insert (op) |
1679 | * This function inserts the object op in the linked list |
1681 | * This function inserts the object op in the linked list |
1680 | * inside the object environment. |
1682 | * inside the object environment. |
1681 | * |
1683 | * |
1682 | * The function returns now pointer to inserted item, and return value can |
1684 | * The function returns now pointer to inserted item, and return value can |
1683 | * be != op, if items are merged. -Tero |
1685 | * be != op, if items are merged. -Tero |
1684 | */ |
1686 | */ |
1685 | object * |
1687 | object * |
1686 | object::insert (object *op) |
1688 | object::insert (object *op) |
1687 | { |
1689 | { |
… | |
… | |
1700 | if (object::can_merge (tmp, op)) |
1702 | if (object::can_merge (tmp, op)) |
1701 | { |
1703 | { |
1702 | /* return the original object and remove inserted object |
1704 | /* return the original object and remove inserted object |
1703 | (client prefers the original object) */ |
1705 | (client prefers the original object) */ |
1704 | |
1706 | |
1705 | // carring must be 0 for mergable objects |
1707 | // carrying must be 0 for mergable objects |
1706 | sint64 oweight = tmp->weight * tmp->nrof; |
1708 | weight_t oweight = weight_t (tmp->weight) * tmp->nrof; |
1707 | |
1709 | |
1708 | tmp->nrof += op->nrof; |
1710 | tmp->nrof += op->nrof; |
1709 | |
1711 | |
1710 | if (object *pl = tmp->visible_to ()) |
1712 | if (object *pl = tmp->visible_to ()) |
1711 | esrv_update_item (UPD_NROF, pl, tmp); |
1713 | esrv_update_item (UPD_NROF, pl, tmp); |
1712 | |
1714 | |
1713 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1715 | adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof); |
1714 | |
1716 | |
1715 | op->destroy (); |
1717 | op->destroy (); |
1716 | op = tmp; |
1718 | op = tmp; |
1717 | goto inserted; |
1719 | goto inserted; |
1718 | } |
1720 | } |
… | |
… | |
1807 | */ |
1809 | */ |
1808 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1810 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1809 | return 0; |
1811 | return 0; |
1810 | |
1812 | |
1811 | /* The objects have to be checked from top to bottom. |
1813 | /* The objects have to be checked from top to bottom. |
1812 | * Hence, we first go to the top: |
1814 | * Hence, we first go to the top: |
1813 | */ |
1815 | */ |
1814 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1816 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1815 | { |
1817 | { |
1816 | next = tmp->below; |
1818 | next = tmp->below; |
1817 | |
1819 | |
… | |
… | |
2001 | * inform the caller. However, insert_ob_in_map will update as |
2003 | * inform the caller. However, insert_ob_in_map will update as |
2002 | * necessary, so the caller shouldn't need to do any special work. |
2004 | * necessary, so the caller shouldn't need to do any special work. |
2003 | * Note - updated to take an object instead of archetype - this is necessary |
2005 | * Note - updated to take an object instead of archetype - this is necessary |
2004 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2006 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2005 | * to know if the space in question will block the object. We can't use |
2007 | * to know if the space in question will block the object. We can't use |
2006 | * the archetype because that isn't correct if the monster has been |
2008 | * the archetype because that isn't correct if the monster has been |
2007 | * customized, changed states, etc. |
2009 | * customized, changed states, etc. |
2008 | */ |
2010 | */ |
2009 | int |
2011 | int |
2010 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2012 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2011 | { |
2013 | { |
… | |
… | |
2034 | continue; |
2036 | continue; |
2035 | } |
2037 | } |
2036 | |
2038 | |
2037 | /* Basically, if we find a wall on a space, we cut down the search size. |
2039 | /* Basically, if we find a wall on a space, we cut down the search size. |
2038 | * In this way, we won't return spaces that are on another side of a wall. |
2040 | * In this way, we won't return spaces that are on another side of a wall. |
2039 | * This mostly work, but it cuts down the search size in all directions - |
2041 | * This mostly work, but it cuts down the search size in all directions - |
2040 | * if the space being examined only has a wall to the north and empty |
2042 | * if the space being examined only has a wall to the north and empty |
2041 | * spaces in all the other directions, this will reduce the search space |
2043 | * spaces in all the other directions, this will reduce the search space |
2042 | * to only the spaces immediately surrounding the target area, and |
2044 | * to only the spaces immediately surrounding the target area, and |
2043 | * won't look 2 spaces south of the target space. |
2045 | * won't look 2 spaces south of the target space. |
2044 | */ |
2046 | */ |
… | |
… | |
2074 | */ |
2076 | */ |
2075 | int |
2077 | int |
2076 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2078 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2077 | { |
2079 | { |
2078 | for (int i = 0; i < SIZEOFFREE; i++) |
2080 | for (int i = 0; i < SIZEOFFREE; i++) |
2079 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2081 | if (!ob->blocked (m, x + DIRX (i), y + DIRY (i))) |
2080 | return i; |
2082 | return i; |
2081 | |
2083 | |
2082 | return -1; |
2084 | return -1; |
2083 | } |
2085 | } |
2084 | |
2086 | |
… | |
… | |
2095 | |
2097 | |
2096 | while (--end) |
2098 | while (--end) |
2097 | swap (arr [end], arr [rndm (end + 1)]); |
2099 | swap (arr [end], arr [rndm (end + 1)]); |
2098 | } |
2100 | } |
2099 | |
2101 | |
2100 | /* new function to make monster searching more efficient, and effective! |
2102 | /* new function to make monster searching more efficient, and effective! |
2101 | * This basically returns a randomized array (in the passed pointer) of |
2103 | * This basically returns a randomized array (in the passed pointer) of |
2102 | * the spaces to find monsters. In this way, it won't always look for |
2104 | * the spaces to find monsters. In this way, it won't always look for |
2103 | * monsters to the north first. However, the size of the array passed |
2105 | * monsters to the north first. However, the size of the array passed |
2104 | * covers all the spaces, so within that size, all the spaces within |
2106 | * covers all the spaces, so within that size, all the spaces within |
2105 | * the 3x3 area will be searched, just not in a predictable order. |
2107 | * the 3x3 area will be searched, just not in a predictable order. |
… | |
… | |
2349 | int mflags; |
2351 | int mflags; |
2350 | |
2352 | |
2351 | if (dir < 0) |
2353 | if (dir < 0) |
2352 | return 0; /* exit condition: invalid direction */ |
2354 | return 0; /* exit condition: invalid direction */ |
2353 | |
2355 | |
2354 | dx = x + freearr_x[dir]; |
2356 | dx = x + DIRX (dir); |
2355 | dy = y + freearr_y[dir]; |
2357 | dy = y + DIRY (dir); |
2356 | |
2358 | |
2357 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2359 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2358 | |
2360 | |
2359 | /* This functional arguably was incorrect before - it was |
2361 | /* This functional arguably was incorrect before - it was |
2360 | * checking for P_WALL - that was basically seeing if |
2362 | * checking for P_WALL - that was basically seeing if |
… | |
… | |
2433 | |
2435 | |
2434 | return 0; |
2436 | return 0; |
2435 | } |
2437 | } |
2436 | |
2438 | |
2437 | /* Zero the key_values on op, decrementing the shared-string |
2439 | /* Zero the key_values on op, decrementing the shared-string |
2438 | * refcounts and freeing the links. |
2440 | * refcounts and freeing the links. |
2439 | */ |
2441 | */ |
2440 | void |
2442 | void |
2441 | key_values::clear () |
2443 | key_values::clear () |
2442 | { |
2444 | { |
2443 | for (key_value *kvp = first; kvp; ) |
2445 | for (key_value *kvp = first; kvp; ) |
… | |
… | |
2718 | //+GPL |
2720 | //+GPL |
2719 | |
2721 | |
2720 | object * |
2722 | object * |
2721 | object::force_find (shstr_tmp name) |
2723 | object::force_find (shstr_tmp name) |
2722 | { |
2724 | { |
2723 | /* cycle through his inventory to look for the MARK we want to |
2725 | /* cycle through his inventory to look for the MARK we want to |
2724 | * place |
2726 | * place |
2725 | */ |
2727 | */ |
2726 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2728 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2727 | if (tmp->type == FORCE && tmp->slaying == name) |
2729 | if (tmp->type == FORCE && tmp->slaying == name) |
2728 | return splay (tmp); |
2730 | return splay (tmp); |
2729 | |
2731 | |