ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC vs.
Revision 1.354 by root, Mon Oct 29 23:55:52 2012 UTC

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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * 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 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * 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 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <stdio.h> 26#include <stdio.h>
… …
71 9, 10, 13, 14, 17, 18, 21, 22, 71 9, 10, 13, 14, 17, 18, 21, 22,
72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, 72 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 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}; 74};
75 75
76const char *wall_suffix[16] = {
77 "0",
78 "1_3",
79 "1_4",
80 "2_1_2",
81 "1_2",
82 "2_2_4",
83 "2_2_1",
84 "3_1",
85 "1_1",
86 "2_2_3",
87 "2_2_2",
88 "3_3",
89 "2_1_1",
90 "3_4",
91 "3_2",
92 "4"
93};
94
76static void 95static void
77write_uuid (uval64 skip, bool sync) 96write_uuid (uval64 skip, bool sync)
78{ 97{
79 CALL_BEGIN (2); 98 CALL_BEGIN (2);
80 CALL_ARG_SV (newSVval64 (skip)); 99 CALL_ARG_SV (newSVval64 (skip));
… …
214 233
215/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 234/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
216static bool 235static bool
217compare_ob_value_lists_one (const object *wants, const object *has) 236compare_ob_value_lists_one (const object *wants, const object *has)
218{ 237{
219 /* n-squared behaviour (see kv_get), but I'm hoping both 238 /* n-squared behaviour (see kv.get), but I'm hoping both
220 * objects with lists are rare, and lists stay short. If not, use a 239 * objects with lists are rare, and lists stay short. If not, use a
221 * different structure or at least keep the lists sorted... 240 * different structure or at least keep the lists sorted...
222 */ 241 */
223 242
224 /* For each field in wants, */ 243 /* For each field in wants, */
225 for (key_value *kv = wants->key_values; kv; kv = kv->next) 244 for (key_value *kv = wants->kv.first; kv; kv = kv->next)
226 if (has->kv_get (kv->key) != kv->value) 245 if (has->kv.get (kv->key) != kv->value)
227 return false; 246 return false;
228 247
229 /* If we get here, every field in wants has a matching field in has. */ 248 /* If we get here, every field in wants has a matching field in has. */
230 return true; 249 return true;
231} 250}
… …
255 */ 274 */
256bool object::can_merge_slow (object *ob1, object *ob2) 275bool object::can_merge_slow (object *ob1, object *ob2)
257{ 276{
258 /* A couple quick sanity checks */ 277 /* A couple quick sanity checks */
259 if (ob1 == ob2 278 if (ob1 == ob2
260 || ob1->type != ob2->type 279 || ob1->type != ob2->type
261 || ob1->value != ob2->value 280 || ob1->value != ob2->value
262 || ob1->name != ob2->name 281 || ob1->name != ob2->name
282 || ob1->custom_name != ob2->custom_name
263 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) 283 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
264 return 0; 284 return 0;
265 285
266 /* Do not merge objects if nrof would overflow, assume nrof 286 /* Do not merge objects if nrof would overflow, assume nrof
267 * is always 0 .. 2**31-1 */ 287 * is always 0 .. 2**31-1 */
… …
353 if (ob1->level != ob2->level) 373 if (ob1->level != ob2->level)
354 return 0; 374 return 0;
355 break; 375 break;
356 } 376 }
357 377
358 if (ob1->key_values || ob2->key_values) 378 if (!ob1->kv.empty () || !ob2->kv.empty ())
359 { 379 {
360 /* At least one of these has key_values. */ 380 /* At least one of these has key_values. */
361 if ((!ob1->key_values) != (!ob2->key_values)) 381 if (ob1->kv.empty () != ob2->kv.empty ())
362 return 0; /* One has fields, but the other one doesn't. */ 382 return 0; /* One has fields, but the other one doesn't. */
363 383
364 if (!compare_ob_value_lists (ob1, ob2)) 384 if (!compare_ob_value_lists (ob1, ob2))
365 return 0; 385 return 0;
366 } 386 }
… …
426 446
427 return 0; 447 return 0;
428} 448}
429 449
430// adjust weight per container type ("of holding") 450// adjust weight per container type ("of holding")
431static sint32 451static uint32
432weight_adjust_for (object *op, sint32 weight) 452weight_adjust_for (object *op, uint32 weight)
433{ 453{
434 return op->type == CONTAINER 454 return op->type == CONTAINER
435 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 455 ? weight - weight * op->stats.Str / 100
436 : weight; 456 : weight;
437} 457}
438 458
439/* 459/*
440 * adjust_weight(object, weight) adds the specified weight to an object, 460 * subtracts, then adds, the specified weight to an object,
441 * and also updates how much the environment(s) is/are carrying. 461 * and also updates how much the environment(s) is/are carrying.
442 */ 462 */
443static void 463static void
444adjust_weight (object *op, sint32 weight) 464adjust_weight (object *op, sint32 sub, sint32 add)
445{ 465{
446 while (op) 466 while (op)
447 { 467 {
448 // adjust by actual difference to account for rounding errors 468 sint32 ocarrying = op->carrying;
449 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
450 weight = weight_adjust_for (op, op->carrying)
451 - weight_adjust_for (op, op->carrying - weight);
452 469
453 if (!weight) 470 op->carrying -= weight_adjust_for (op, sub);
454 return; 471 op->carrying += weight_adjust_for (op, add);
455
456 op->carrying += weight;
457 472
458 if (object *pl = op->visible_to ()) 473 if (object *pl = op->visible_to ())
459 if (pl != op) // player is handled lazily 474 if (pl != op) // player is handled lazily
460 esrv_update_item (UPD_WEIGHT, pl, op); 475 esrv_update_item (UPD_WEIGHT, pl, op);
461 476
477 sub = ocarrying;
478 add = op->carrying;
479
462 op = op->env; 480 op = op->env;
463 } 481 }
464} 482}
465 483
466/* 484/*
… …
473{ 491{
474 sint32 sum = 0; 492 sint32 sum = 0;
475 493
476 for (object *op = inv; op; op = op->below) 494 for (object *op = inv; op; op = op->below)
477 { 495 {
478 if (op->inv)
479 op->update_weight (); 496 op->update_weight ();
480 497
481 sum += op->total_weight (); 498 sum += weight_adjust_for (this, op->total_weight ());
482 } 499 }
483
484 sum = weight_adjust_for (this, sum);
485 500
486 if (sum != carrying) 501 if (sum != carrying)
487 { 502 {
503 if (carrying != sum && carrying)//D
504 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
505 (long long)sum, (long long)carrying, debug_desc ());
506
488 carrying = sum; 507 carrying = sum;
489 508
490 if (object *pl = visible_to ()) 509 if (object *pl = visible_to ())
491 if (pl != this) // player is handled lazily 510 if (pl != this) // player is handled lazily
492 esrv_update_item (UPD_WEIGHT, pl, this); 511 esrv_update_item (UPD_WEIGHT, pl, this);
… …
578 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 597 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
579 return; 598 return;
580 } 599 }
581 600
582 this->owner = owner; 601 this->owner = owner;
583}
584
585/* Zero the key_values on op, decrementing the shared-string
586 * refcounts and freeing the links.
587 */
588static void
589free_key_values (object *op)
590{
591 for (key_value *i = op->key_values; i; )
592 {
593 key_value *next = i->next;
594 delete i;
595
596 i = next;
597 }
598
599 op->key_values = 0;
600} 602}
601 603
602/* 604/*
603 * copy_to first frees everything allocated by the dst object, 605 * copy_to first frees everything allocated by the dst object,
604 * and then copies the contents of itself into the second 606 * and then copies the contents of itself into the second
… …
610void 612void
611object::copy_to (object *dst) 613object::copy_to (object *dst)
612{ 614{
613 dst->remove (); 615 dst->remove ();
614 *(object_copy *)dst = *this; 616 *(object_copy *)dst = *this;
617
618 // maybe move to object_copy?
619 dst->kv = kv;
620
615 dst->flag [FLAG_REMOVED] = true; 621 dst->flag [FLAG_REMOVED] = true;
616
617 /* Copy over key_values, if any. */
618 if (key_values)
619 {
620 key_value *tail = 0;
621 dst->key_values = 0;
622
623 for (key_value *i = key_values; i; i = i->next)
624 {
625 key_value *new_link = new key_value;
626
627 new_link->next = 0;
628 new_link->key = i->key;
629 new_link->value = i->value;
630
631 /* Try and be clever here, too. */
632 if (!dst->key_values)
633 {
634 dst->key_values = new_link;
635 tail = new_link;
636 }
637 else
638 {
639 tail->next = new_link;
640 tail = new_link;
641 }
642 }
643 }
644
645 dst->activate (); 622 dst->activate ();
646} 623}
647 624
648void 625void
649object::instantiate () 626object::instantiate ()
650{ 627{
651 if (!uuid.seq) // HACK 628 if (!uuid.seq) // HACK
652 uuid = UUID::gen (); 629 uuid = UUID::gen ();
653 630
654 // TODO: unclean state changes, should nt be done in copy_to AND instantiate 631 // TODO: unclean state changes, should not be done in copy_to AND instantiate
655 if (flag [FLAG_RANDOM_SPEED] && speed) 632 if (flag [FLAG_RANDOM_SPEED] && speed)
656 speed_left = - speed - rndm (); // TODO animation 633 speed_left = - speed - rndm (); // TODO animation
657 else 634 else
658 speed_left = -1.; 635 speed_left = -1.;
659 636
… …
760 } 737 }
761 738
762 mapspace &m = op->ms (); 739 mapspace &m = op->ms ();
763 740
764 if (!(m.flags_ & P_UPTODATE)) 741 if (!(m.flags_ & P_UPTODATE))
765 /* nop */; 742 m.update_up (); // nothing to do except copy up
766 else if (action == UP_OBJ_INSERT) 743 else if (action == UP_OBJ_INSERT)
767 { 744 {
768#if 0 745#if 0
769 // this is likely overkill, TODO: revisit (schmorp) 746 // this is likely overkill, TODO: revisit (schmorp)
770 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) 747 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
… …
791 * that is being removed. 768 * that is being removed.
792 */ 769 */
793 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
794 m.invalidate (); 771 m.invalidate ();
795 else if (action == UP_OBJ_FACE) 772 else if (action == UP_OBJ_FACE)
796 /* Nothing to do for that case */ ; 773 m.update_up (); // nothing to do for that case, except copy up
797 else 774 else
798 LOG (llevError, "update_object called with invalid action: %d\n", action); 775 LOG (llevError, "update_object called with invalid action: %d\n", action);
799 776
800 if (op->more) 777 if (op->more)
801 update_object (op->more, action); 778 update_object (op->more, action);
… …
812 789
813object::~object () 790object::~object ()
814{ 791{
815 unlink (); 792 unlink ();
816 793
817 free_key_values (this); 794 kv.clear ();
818} 795}
819 796
820void object::link () 797void object::link ()
821{ 798{
822 assert (!index);//D 799 assert (!index);//D
… …
921 * if some form of movement is allowed, let objects 898 * if some form of movement is allowed, let objects
922 * drop on that space. 899 * drop on that space.
923 */ 900 */
924 if (!drop_to_ground 901 if (!drop_to_ground
925 || !map 902 || !map
926 || map->in_memory != MAP_ACTIVE 903 || !map->linkable ()
927 || map->no_drop 904 || map->no_drop
928 || ms ().move_block == MOVE_ALL) 905 || ms ().move_block == MOVE_ALL)
929 { 906 {
930 while (inv) 907 while (inv)
931 inv->destroy (); 908 inv->destroy ();
… …
1028 1005
1029 freelist = li; 1006 freelist = li;
1030 ++free_count; 1007 ++free_count;
1031} 1008}
1032 1009
1033static struct freed_map : maptile
1034{
1035 freed_map ()
1036 {
1037 path = "<freed objects map>";
1038 name = "/internal/freed_objects_map";
1039 width = 3;
1040 height = 3;
1041 no_drop = 1;
1042 no_reset = 1;
1043
1044 alloc ();
1045 in_memory = MAP_ACTIVE;
1046 }
1047
1048 ~freed_map ()
1049 {
1050 destroy ();
1051 }
1052} freed_map; // freed objects are moved here to avoid crashes
1053
1054void 1010void
1055object::do_destroy () 1011object::do_destroy ()
1056{ 1012{
1057 if (flag [FLAG_IS_LINKED]) 1013 if (flag [FLAG_IS_LINKED])
1058 remove_link (); 1014 remove_link ();
… …
1142 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed 1098 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1143 if (object *pl = visible_to ()) 1099 if (object *pl = visible_to ())
1144 esrv_del_item (pl->contr, count); 1100 esrv_del_item (pl->contr, count);
1145 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1101 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1146 1102
1147 adjust_weight (env, -total_weight ()); 1103 adjust_weight (env, total_weight (), 0);
1148 1104
1149 object *pl = in_player (); 1105 object *pl = in_player ();
1150 1106
1151 /* we set up values so that it could be inserted into 1107 /* we set up values so that it could be inserted into
1152 * the map, but we don't actually do that - it is up 1108 * the map, but we don't actually do that - it is up
… …
1166 1122
1167 if (pl && pl->is_player ()) 1123 if (pl && pl->is_player ())
1168 { 1124 {
1169 if (expect_false (pl->contr->combat_ob == this)) 1125 if (expect_false (pl->contr->combat_ob == this))
1170 { 1126 {
1171 pl->apply (pl->contr->combat_ob, AP_UNAPPLY); 1127 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1172 pl->contr->combat_ob = 0; 1128 pl->contr->combat_ob = 0;
1173 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); 1129 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1174 } 1130 }
1175 1131
1176 if (expect_false (pl->contr->ranged_ob == this)) 1132 if (expect_false (pl->contr->ranged_ob == this))
1177 { 1133 {
1178 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); 1134 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1179 pl->contr->ranged_ob = 0; 1135 pl->contr->ranged_ob = 0;
1180 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); 1136 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1181 } 1137 }
1182 1138
1183 pl->contr->queue_stats_update (); 1139 pl->contr->queue_stats_update ();
… …
1223 1179
1224 above = 0; 1180 above = 0;
1225 below = 0; 1181 below = 0;
1226 1182
1227 ms.invalidate (); 1183 ms.invalidate ();
1228
1229 if (map->in_memory == MAP_SAVING)
1230 return;
1231 1184
1232 int check_walk_off = !flag [FLAG_NO_APPLY]; 1185 int check_walk_off = !flag [FLAG_NO_APPLY];
1233 1186
1234 if (object *pl = ms.player ()) 1187 if (object *pl = ms.player ())
1235 { 1188 {
… …
1370{ 1323{
1371 op->remove (); 1324 op->remove ();
1372 1325
1373 if (m == &freed_map)//D TODO: remove soon 1326 if (m == &freed_map)//D TODO: remove soon
1374 {//D 1327 {//D
1375 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1328 LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1376 }//D 1329 }//D
1377 1330
1378 /* Ideally, the caller figures this out. However, it complicates a lot 1331 /* Ideally, the caller figures this out. However, it complicates a lot
1379 * of areas of callers (eg, anything that uses find_free_spot would now 1332 * of areas of callers (eg, anything that uses find_free_spot would now
1380 * need extra work 1333 * need extra work
… …
1570 */ 1523 */
1571 1524
1572 /* if this is not the head or flag has been passed, don't check walk on status */ 1525 /* if this is not the head or flag has been passed, don't check walk on status */
1573 if (!(flag & INS_NO_WALK_ON) && op->is_head ()) 1526 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1574 { 1527 {
1575 if (check_move_on (op, originator)) 1528 if (check_move_on (op, originator, flag))
1576 return 0; 1529 return 0;
1577 1530
1578 /* If we are a multi part object, lets work our way through the check 1531 /* If we are a multi part object, let's work our way through the check
1579 * walk on's. 1532 * walk on's.
1580 */ 1533 */
1581 for (object *tmp = op->more; tmp; tmp = tmp->more) 1534 for (object *tmp = op->more; tmp; tmp = tmp->more)
1582 if (check_move_on (tmp, originator)) 1535 if (check_move_on (tmp, originator, flag))
1583 return 0; 1536 return 0;
1584 } 1537 }
1585 1538
1586 return op; 1539 return op;
1587} 1540}
… …
1653 1606
1654 nr = min (nr, nrof); 1607 nr = min (nr, nrof);
1655 1608
1656 if (nrof > nr) 1609 if (nrof > nr)
1657 { 1610 {
1611 sint64 oweight = total_weight ();
1612
1658 nrof -= nr; 1613 nrof -= nr;
1659 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1660 1614
1661 if (object *pl = visible_to ()) 1615 if (object *pl = visible_to ())
1662 esrv_update_item (UPD_NROF, pl, this); 1616 esrv_update_item (UPD_NROF, pl, this);
1617
1618 adjust_weight (env, oweight, total_weight ());
1663 1619
1664 return true; 1620 return true;
1665 } 1621 }
1666 else 1622 else
1667 { 1623 {
… …
1742 if (op->nrof) 1698 if (op->nrof)
1743 for (object *tmp = inv; tmp; tmp = tmp->below) 1699 for (object *tmp = inv; tmp; tmp = tmp->below)
1744 if (object::can_merge (tmp, op)) 1700 if (object::can_merge (tmp, op))
1745 { 1701 {
1746 /* return the original object and remove inserted object 1702 /* return the original object and remove inserted object
1747 (client needs the original object) */ 1703 (client prefers the original object) */
1704
1705 // carring must be 0 for mergable objects
1706 sint64 oweight = tmp->weight * tmp->nrof;
1707
1748 tmp->nrof += op->nrof; 1708 tmp->nrof += op->nrof;
1749 1709
1750 if (object *pl = tmp->visible_to ()) 1710 if (object *pl = tmp->visible_to ())
1751 esrv_update_item (UPD_NROF, pl, tmp); 1711 esrv_update_item (UPD_NROF, pl, tmp);
1752 1712
1753 adjust_weight (this, op->total_weight ()); 1713 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1754 1714
1755 op->destroy (); 1715 op->destroy ();
1756 op = tmp; 1716 op = tmp;
1757 goto inserted; 1717 goto inserted;
1758 } 1718 }
… …
1774 op->flag [FLAG_REMOVED] = 0; 1734 op->flag [FLAG_REMOVED] = 0;
1775 1735
1776 if (object *pl = op->visible_to ()) 1736 if (object *pl = op->visible_to ())
1777 esrv_send_item (pl, op); 1737 esrv_send_item (pl, op);
1778 1738
1779 adjust_weight (this, op->total_weight ()); 1739 adjust_weight (this, 0, op->total_weight ());
1780 1740
1781inserted: 1741inserted:
1782 /* reset the light list and los of the players on the map */ 1742 /* reset the light list and los of the players on the map */
1783 if (op->glow_radius && is_on_map ()) 1743 if (op->glow_radius && is_on_map ())
1784 { 1744 {
… …
1813 * MSW 2001-07-08: Check all objects on space, not just those below 1773 * MSW 2001-07-08: Check all objects on space, not just those below
1814 * object being inserted. insert_ob_in_map may not put new objects 1774 * object being inserted. insert_ob_in_map may not put new objects
1815 * on top. 1775 * on top.
1816 */ 1776 */
1817int 1777int
1818check_move_on (object *op, object *originator) 1778check_move_on (object *op, object *originator, int flags)
1819{ 1779{
1820 if (op->flag [FLAG_NO_APPLY]) 1780 if (op->flag [FLAG_NO_APPLY])
1821 return 0; 1781 return 0;
1822 1782
1823 object *tmp; 1783 object *tmp;
… …
1882 1842
1883 /* Basically same logic as above, except now for actual apply. */ 1843 /* Basically same logic as above, except now for actual apply. */
1884 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1844 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1885 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1845 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1886 { 1846 {
1847 if ((flags & INS_NO_AUTO_EXIT)
1848 && (tmp->type == EXIT || tmp->type == TELEPORTER
1849 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1850 continue;
1851
1887 move_apply (tmp, op, originator); 1852 move_apply (tmp, op, originator);
1888 1853
1889 if (op->destroyed ()) 1854 if (op->destroyed ())
1890 return 1; 1855 return 1;
1891 1856
… …
2043 */ 2008 */
2044int 2009int
2045find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2010find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2046{ 2011{
2047 int altern[SIZEOFFREE]; 2012 int altern[SIZEOFFREE];
2048 int index = 0, flag; 2013 int index = 0;
2049 2014
2050 for (int i = start; i < stop; i++) 2015 for (int i = start; i < stop; i++)
2051 { 2016 {
2052 mapxy pos (m, x, y); pos.move (i); 2017 mapxy pos (m, x, y); pos.move (i);
2053 2018
… …
2165 * there is capable of. 2130 * there is capable of.
2166 */ 2131 */
2167int 2132int
2168find_dir (maptile *m, int x, int y, object *exclude) 2133find_dir (maptile *m, int x, int y, object *exclude)
2169{ 2134{
2170 int max = SIZEOFFREE, mflags; 2135 int max = SIZEOFFREE;
2171 MoveType move_type; 2136 MoveType move_type;
2172 2137
2173 if (exclude && exclude->head_ () != exclude) 2138 if (exclude && exclude->head_ () != exclude)
2174 { 2139 {
2175 exclude = exclude->head; 2140 exclude = exclude->head;
… …
2216{ 2181{
2217 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2182 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2218} 2183}
2219 2184
2220/* 2185/*
2221 * find_dir_2(delta-x,delta-y) will return a direction in which 2186 * find_dir_2(delta-x,delta-y) will return a direction value
2222 * an object which has subtracted the x and y coordinates of another 2187 * for running into direct [dx, dy].
2223 * object, needs to travel toward it. 2188 * (the opposite of crossfire's find_dir_2!)
2224 */ 2189 */
2225int 2190int
2226find_dir_2 (int x, int y) 2191find_dir_2 (int x, int y)
2227{ 2192{
2193#if 1 // new algorithm
2194 // this works by putting x, y into 16 sectors, which
2195 // are not equal sized, but are a better approximation
2196 // then the old algorithm, and then using a mapping
2197 // table to map it into a direction value.
2198 // basically, it maps these comparisons to each bit
2199 // bit #3: x < 0
2200 // bit #2: y < 0
2201 // bit #1: x > y
2202 // bit #0: x > 2y
2203
2204 static const uint8 dir[16] = {
2205 4, 5, 4, 3,
2206 2, 1, 2, 3,
2207 6, 5, 6, 7,
2208 8, 1, 8, 7,
2209 };
2210 int sector = 0;
2211
2212 // this is a bit ugly, but more likely to result in branchless code
2213 sector |= x < 0 ? 8 : 0;
2214 x = x < 0 ? -x : x; // abs
2215
2216 sector |= y < 0 ? 4 : 0;
2217 y = y < 0 ? -y : y; // abs
2218
2219 if (x > y)
2220 {
2221 sector |= 2;
2222
2223 if (x > y * 2)
2224 sector |= 1;
2225 }
2226 else
2227 {
2228 if (y > x * 2)
2229 sector |= 1;
2230 else if (!y)
2231 return 0; // x == 0 here
2232 }
2233
2234 return dir [sector];
2235#else // old algorithm
2228 int q; 2236 int q;
2229 2237
2230 if (y) 2238 if (y)
2231 q = x * 100 / y; 2239 q = 128 * x / y;
2232 else if (x) 2240 else if (x)
2233 q = -300 * x; 2241 q = -512 * x; // to make it > 309
2234 else 2242 else
2235 return 0; 2243 return 0;
2236 2244
2237 if (y > 0) 2245 if (y > 0)
2238 { 2246 {
2239 if (q < -242) 2247 if (q < -309) return 7;
2248 if (q < -52) return 6;
2249 if (q < 52) return 5;
2250 if (q < 309) return 4;
2251
2240 return 3; 2252 return 3;
2241 if (q < -41) 2253 }
2242 return 2; 2254 else
2243 if (q < 41) 2255 {
2244 return 1; 2256 if (q < -309) return 3;
2245 if (q < 242) 2257 if (q < -52) return 2;
2246 return 8; 2258 if (q < 52) return 1;
2259 if (q < 309) return 8;
2260
2247 return 7; 2261 return 7;
2248 } 2262 }
2249 2263#endif
2250 if (q < -242)
2251 return 7;
2252 if (q < -41)
2253 return 6;
2254 if (q < 41)
2255 return 5;
2256 if (q < 242)
2257 return 4;
2258
2259 return 3;
2260} 2264}
2261 2265
2262/* 2266/*
2263 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2267 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2264 * between two directions (which are expected to be absolute (see absdir()) 2268 * between two directions (which are expected to be absolute (see absdir())
2265 */ 2269 */
2266int 2270int
2267dirdiff (int dir1, int dir2) 2271dirdiff (int dir1, int dir2)
2268{ 2272{
2269 int d;
2270
2271 d = abs (dir1 - dir2); 2273 int d = abs (dir1 - dir2);
2272 if (d > 4)
2273 d = 8 - d;
2274 2274
2275 return d; 2275 return d > 4 ? 8 - d : d;
2276} 2276}
2277 2277
2278/* peterm: 2278/* peterm:
2279 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2279 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2280 * Basically, this is a table of directions, and what directions 2280 * Basically, this is a table of directions, and what directions
… …
2391 return /*who->flag [FLAG_WIZ]|| */ 2391 return /*who->flag [FLAG_WIZ]|| */
2392 (item->weight > 0 && !item->flag [FLAG_NO_PICK] && 2392 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2393 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2393 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2394} 2394}
2395 2395
2396//-GPL
2397
2396/* 2398/*
2397 * create clone from object to another 2399 * create clone from object to another
2398 */ 2400 */
2399object * 2401object *
2400object::deep_clone () 2402object::deep_clone ()
… …
2430 return tmp; 2432 return tmp;
2431 2433
2432 return 0; 2434 return 0;
2433} 2435}
2434 2436
2437/* Zero the key_values on op, decrementing the shared-string
2438 * refcounts and freeing the links.
2439 */
2440void
2441key_values::clear ()
2442{
2443 for (key_value *kvp = first; kvp; )
2444 {
2445 key_value *next = kvp->next;
2446 delete kvp;
2447 kvp = next;
2448 }
2449
2450 first = 0;
2451}
2452
2435shstr_tmp 2453shstr_tmp
2436object::kv_get (shstr_tmp key) const 2454key_values::get (shstr_tmp key) const
2437{ 2455{
2438 for (key_value *kv = key_values; kv; kv = kv->next) 2456 for (key_value *kv = first; kv; kv = kv->next)
2439 if (kv->key == key) 2457 if (kv->key == key)
2440 return kv->value; 2458 return kv->value;
2441 2459
2442 return shstr (); 2460 return shstr ();
2443} 2461}
2444 2462
2445void 2463void
2464key_values::add (shstr_tmp key, shstr_tmp value)
2465{
2466 key_value *kv = new key_value;
2467
2468 kv->next = first;
2469 kv->key = key;
2470 kv->value = value;
2471
2472 first = kv;
2473}
2474
2475void
2446object::kv_set (shstr_tmp key, shstr_tmp value) 2476key_values::set (shstr_tmp key, shstr_tmp value)
2447{ 2477{
2448 for (key_value *kv = key_values; kv; kv = kv->next) 2478 for (key_value *kv = first; kv; kv = kv->next)
2449 if (kv->key == key) 2479 if (kv->key == key)
2450 { 2480 {
2451 kv->value = value; 2481 kv->value = value;
2452 return; 2482 return;
2453 } 2483 }
2454 2484
2455 key_value *kv = new key_value; 2485 add (key, value);
2456
2457 kv->next = key_values;
2458 kv->key = key;
2459 kv->value = value;
2460
2461 key_values = kv;
2462} 2486}
2463 2487
2464void 2488void
2465object::kv_del (shstr_tmp key) 2489key_values::del (shstr_tmp key)
2466{ 2490{
2467 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2491 for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2468 if ((*kvp)->key == key) 2492 if ((*kvp)->key == key)
2469 { 2493 {
2470 key_value *kv = *kvp; 2494 key_value *kv = *kvp;
2471 *kvp = (*kvp)->next; 2495 *kvp = (*kvp)->next;
2472 delete kv; 2496 delete kv;
2473 return; 2497 return;
2474 } 2498 }
2499}
2500
2501void
2502key_values::reverse ()
2503{
2504 key_value *prev = 0;
2505 key_value *head = first;
2506
2507 while (head)
2508 {
2509 key_value *node = head;
2510 head = head->next;
2511 node->next = prev;
2512 prev = node;
2513 }
2514
2515 first = prev;
2516}
2517
2518key_values &
2519key_values::operator =(const key_values &kv)
2520{
2521 clear ();
2522
2523 for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
2524 add (kvp->key, kvp->value);
2525
2526 reverse ();
2475} 2527}
2476 2528
2477object::depth_iterator::depth_iterator (object *container) 2529object::depth_iterator::depth_iterator (object *container)
2478: iterator_base (container) 2530: iterator_base (container)
2479{ 2531{
… …
2562object::region () const 2614object::region () const
2563{ 2615{
2564 return map ? map->region (x, y) 2616 return map ? map->region (x, y)
2565 : region::default_region (); 2617 : region::default_region ();
2566} 2618}
2619
2620//+GPL
2567 2621
2568void 2622void
2569object::open_container (object *new_container) 2623object::open_container (object *new_container)
2570{ 2624{
2571 if (container == new_container) 2625 if (container == new_container)
… …
2629 } 2683 }
2630// else if (!old_container->env && contr && contr->ns) 2684// else if (!old_container->env && contr && contr->ns)
2631// contr->ns->floorbox_reset (); 2685// contr->ns->floorbox_reset ();
2632} 2686}
2633 2687
2688//-GPL
2689
2690// prefetch some flat area around the player
2691static void
2692prefetch_surrounding_area (object *op, maptile *map, int range)
2693{
2694 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
2695 op->x - range , op->y - range ,
2696 op->x + range + 1, op->y + range + 1);
2697 rect->m;
2698 ++rect)
2699 {
2700 rect->m->touch ();
2701 rect->m->activate ();
2702 }
2703}
2704
2705// prefetch a generous area around the player, also up and down
2706void
2707object::prefetch_surrounding_maps ()
2708{
2709 prefetch_surrounding_area (this, map, 40);
2710
2711 if (maptile *m = map->tile_available (TILE_DOWN))
2712 prefetch_surrounding_area (this, m, 20);
2713
2714 if (maptile *m = map->tile_available (TILE_UP))
2715 prefetch_surrounding_area (this, m, 20);
2716}
2717
2718//+GPL
2719
2634object * 2720object *
2635object::force_find (shstr_tmp name) 2721object::force_find (shstr_tmp name)
2636{ 2722{
2637 /* cycle through his inventory to look for the MARK we want to 2723 /* cycle through his inventory to look for the MARK we want to
2638 * place 2724 * place
… …
2642 return splay (tmp); 2728 return splay (tmp);
2643 2729
2644 return 0; 2730 return 0;
2645} 2731}
2646 2732
2647//-GPL
2648
2649void 2733void
2650object::force_set_timer (int duration) 2734object::force_set_timer (int duration)
2651{ 2735{
2652 this->duration = 1; 2736 this->duration = 1;
2653 this->speed_left = -1.f; 2737 this->speed_left = -1.f;
… …
2659object::force_add (shstr_tmp name, int duration) 2743object::force_add (shstr_tmp name, int duration)
2660{ 2744{
2661 if (object *force = force_find (name)) 2745 if (object *force = force_find (name))
2662 force->destroy (); 2746 force->destroy ();
2663 2747
2664 object *force = get_archetype (FORCE_NAME); 2748 object *force = archetype::get (FORCE_NAME);
2665 2749
2666 force->slaying = name; 2750 force->slaying = name;
2667 force->force_set_timer (duration); 2751 force->force_set_timer (duration);
2668 force->flag [FLAG_APPLIED] = true; 2752 force->flag [FLAG_APPLIED] = true;
2669 2753
… …
2753 return contr->mark; 2837 return contr->mark;
2754 else 2838 else
2755 return 0; 2839 return 0;
2756} 2840}
2757 2841
2842// put marked object first in the inventory
2843// this is used by identify-like spells so players can influence
2844// the order a bit.
2845void
2846object::splay_marked ()
2847{
2848 if (object *marked = mark ())
2849 splay (marked);
2850}
2851

Diff Legend

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