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.328 by root, Sun Apr 18 06:55:34 2010 UTC vs.
Revision 1.349 by root, Sun May 8 11:44:43 2011 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 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
… …
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 {
488 if (carrying != sum)//D 503 if (carrying != sum && carrying)//D
489 LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", 504 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
490 (long long)sum, (long long)carrying, debug_desc ()); 505 (long long)sum, (long long)carrying, debug_desc ());
491 506
492 carrying = sum; 507 carrying = sum;
493 508
494 if (object *pl = visible_to ()) 509 if (object *pl = visible_to ())
… …
582 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 ());
583 return; 598 return;
584 } 599 }
585 600
586 this->owner = owner; 601 this->owner = owner;
587}
588
589/* Zero the key_values on op, decrementing the shared-string
590 * refcounts and freeing the links.
591 */
592static void
593free_key_values (object *op)
594{
595 for (key_value *i = op->key_values; i; )
596 {
597 key_value *next = i->next;
598 delete i;
599
600 i = next;
601 }
602
603 op->key_values = 0;
604} 602}
605 603
606/* 604/*
607 * copy_to first frees everything allocated by the dst object, 605 * copy_to first frees everything allocated by the dst object,
608 * and then copies the contents of itself into the second 606 * and then copies the contents of itself into the second
… …
614void 612void
615object::copy_to (object *dst) 613object::copy_to (object *dst)
616{ 614{
617 dst->remove (); 615 dst->remove ();
618 *(object_copy *)dst = *this; 616 *(object_copy *)dst = *this;
617
618 // maybe move to object_copy?
619 dst->kv = kv;
620
619 dst->flag [FLAG_REMOVED] = true; 621 dst->flag [FLAG_REMOVED] = true;
620
621 /* Copy over key_values, if any. */
622 if (key_values)
623 {
624 key_value *tail = 0;
625 dst->key_values = 0;
626
627 for (key_value *i = key_values; i; i = i->next)
628 {
629 key_value *new_link = new key_value;
630
631 new_link->next = 0;
632 new_link->key = i->key;
633 new_link->value = i->value;
634
635 /* Try and be clever here, too. */
636 if (!dst->key_values)
637 {
638 dst->key_values = new_link;
639 tail = new_link;
640 }
641 else
642 {
643 tail->next = new_link;
644 tail = new_link;
645 }
646 }
647 }
648
649 dst->activate (); 622 dst->activate ();
650} 623}
651 624
652void 625void
653object::instantiate () 626object::instantiate ()
654{ 627{
655 if (!uuid.seq) // HACK 628 if (!uuid.seq) // HACK
656 uuid = UUID::gen (); 629 uuid = UUID::gen ();
657 630
658 // 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
659 if (flag [FLAG_RANDOM_SPEED] && speed) 632 if (flag [FLAG_RANDOM_SPEED] && speed)
660 speed_left = - speed - rndm (); // TODO animation 633 speed_left = - speed - rndm (); // TODO animation
661 else 634 else
662 speed_left = -1.; 635 speed_left = -1.;
663 636
… …
764 } 737 }
765 738
766 mapspace &m = op->ms (); 739 mapspace &m = op->ms ();
767 740
768 if (!(m.flags_ & P_UPTODATE)) 741 if (!(m.flags_ & P_UPTODATE))
769 /* nop */; 742 m.update_up (); // nothing to do except copy up
770 else if (action == UP_OBJ_INSERT) 743 else if (action == UP_OBJ_INSERT)
771 { 744 {
772#if 0 745#if 0
773 // this is likely overkill, TODO: revisit (schmorp) 746 // this is likely overkill, TODO: revisit (schmorp)
774 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) 747 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
… …
795 * that is being removed. 768 * that is being removed.
796 */ 769 */
797 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
798 m.invalidate (); 771 m.invalidate ();
799 else if (action == UP_OBJ_FACE) 772 else if (action == UP_OBJ_FACE)
800 /* Nothing to do for that case */ ; 773 m.update_up (); // nothing to do for that case, except copy up
801 else 774 else
802 LOG (llevError, "update_object called with invalid action: %d\n", action); 775 LOG (llevError, "update_object called with invalid action: %d\n", action);
803 776
804 if (op->more) 777 if (op->more)
805 update_object (op->more, action); 778 update_object (op->more, action);
… …
816 789
817object::~object () 790object::~object ()
818{ 791{
819 unlink (); 792 unlink ();
820 793
821 free_key_values (this); 794 kv.clear ();
822} 795}
823 796
824void object::link () 797void object::link ()
825{ 798{
826 assert (!index);//D 799 assert (!index);//D
… …
925 * if some form of movement is allowed, let objects 898 * if some form of movement is allowed, let objects
926 * drop on that space. 899 * drop on that space.
927 */ 900 */
928 if (!drop_to_ground 901 if (!drop_to_ground
929 || !map 902 || !map
930 || map->in_memory != MAP_ACTIVE 903 || !map->linkable ()
931 || map->no_drop 904 || map->no_drop
932 || ms ().move_block == MOVE_ALL) 905 || ms ().move_block == MOVE_ALL)
933 { 906 {
934 while (inv) 907 while (inv)
935 inv->destroy (); 908 inv->destroy ();
… …
1042 path = "<freed objects map>"; 1015 path = "<freed objects map>";
1043 name = "/internal/freed_objects_map"; 1016 name = "/internal/freed_objects_map";
1044 no_drop = 1; 1017 no_drop = 1;
1045 no_reset = 1; 1018 no_reset = 1;
1046 1019
1047 in_memory = MAP_ACTIVE; 1020 state = MAP_ACTIVE;
1048 } 1021 }
1049 1022
1050 ~freed_map () 1023 ~freed_map ()
1051 { 1024 {
1052 destroy (); 1025 destroy ();
… …
1144 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed 1117 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1145 if (object *pl = visible_to ()) 1118 if (object *pl = visible_to ())
1146 esrv_del_item (pl->contr, count); 1119 esrv_del_item (pl->contr, count);
1147 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1120 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1148 1121
1149 adjust_weight (env, -total_weight ()); 1122 adjust_weight (env, total_weight (), 0);
1150 1123
1151 object *pl = in_player (); 1124 object *pl = in_player ();
1152 1125
1153 /* we set up values so that it could be inserted into 1126 /* we set up values so that it could be inserted into
1154 * the map, but we don't actually do that - it is up 1127 * the map, but we don't actually do that - it is up
… …
1168 1141
1169 if (pl && pl->is_player ()) 1142 if (pl && pl->is_player ())
1170 { 1143 {
1171 if (expect_false (pl->contr->combat_ob == this)) 1144 if (expect_false (pl->contr->combat_ob == this))
1172 { 1145 {
1173 pl->apply (pl->contr->combat_ob, AP_UNAPPLY); 1146 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1174 pl->contr->combat_ob = 0; 1147 pl->contr->combat_ob = 0;
1175 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); 1148 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1176 } 1149 }
1177 1150
1178 if (expect_false (pl->contr->ranged_ob == this)) 1151 if (expect_false (pl->contr->ranged_ob == this))
1179 { 1152 {
1180 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); 1153 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1181 pl->contr->ranged_ob = 0; 1154 pl->contr->ranged_ob = 0;
1182 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); 1155 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1183 } 1156 }
1184 1157
1185 pl->contr->queue_stats_update (); 1158 pl->contr->queue_stats_update ();
… …
1225 1198
1226 above = 0; 1199 above = 0;
1227 below = 0; 1200 below = 0;
1228 1201
1229 ms.invalidate (); 1202 ms.invalidate ();
1230
1231 if (map->in_memory == MAP_SAVING)
1232 return;
1233 1203
1234 int check_walk_off = !flag [FLAG_NO_APPLY]; 1204 int check_walk_off = !flag [FLAG_NO_APPLY];
1235 1205
1236 if (object *pl = ms.player ()) 1206 if (object *pl = ms.player ())
1237 { 1207 {
… …
1372{ 1342{
1373 op->remove (); 1343 op->remove ();
1374 1344
1375 if (m == &freed_map)//D TODO: remove soon 1345 if (m == &freed_map)//D TODO: remove soon
1376 {//D 1346 {//D
1377 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1347 LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1378 }//D 1348 }//D
1379 1349
1380 /* Ideally, the caller figures this out. However, it complicates a lot 1350 /* Ideally, the caller figures this out. However, it complicates a lot
1381 * of areas of callers (eg, anything that uses find_free_spot would now 1351 * of areas of callers (eg, anything that uses find_free_spot would now
1382 * need extra work 1352 * need extra work
… …
1572 */ 1542 */
1573 1543
1574 /* if this is not the head or flag has been passed, don't check walk on status */ 1544 /* if this is not the head or flag has been passed, don't check walk on status */
1575 if (!(flag & INS_NO_WALK_ON) && op->is_head ()) 1545 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1576 { 1546 {
1577 if (check_move_on (op, originator)) 1547 if (check_move_on (op, originator, flag))
1578 return 0; 1548 return 0;
1579 1549
1580 /* If we are a multi part object, lets work our way through the check 1550 /* If we are a multi part object, let's work our way through the check
1581 * walk on's. 1551 * walk on's.
1582 */ 1552 */
1583 for (object *tmp = op->more; tmp; tmp = tmp->more) 1553 for (object *tmp = op->more; tmp; tmp = tmp->more)
1584 if (check_move_on (tmp, originator)) 1554 if (check_move_on (tmp, originator, flag))
1585 return 0; 1555 return 0;
1586 } 1556 }
1587 1557
1588 return op; 1558 return op;
1589} 1559}
… …
1655 1625
1656 nr = min (nr, nrof); 1626 nr = min (nr, nrof);
1657 1627
1658 if (nrof > nr) 1628 if (nrof > nr)
1659 { 1629 {
1630 sint64 oweight = total_weight ();
1631
1660 nrof -= nr; 1632 nrof -= nr;
1661 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1662 1633
1663 if (object *pl = visible_to ()) 1634 if (object *pl = visible_to ())
1664 esrv_update_item (UPD_NROF, pl, this); 1635 esrv_update_item (UPD_NROF, pl, this);
1636
1637 adjust_weight (env, oweight, total_weight ());
1665 1638
1666 return true; 1639 return true;
1667 } 1640 }
1668 else 1641 else
1669 { 1642 {
… …
1744 if (op->nrof) 1717 if (op->nrof)
1745 for (object *tmp = inv; tmp; tmp = tmp->below) 1718 for (object *tmp = inv; tmp; tmp = tmp->below)
1746 if (object::can_merge (tmp, op)) 1719 if (object::can_merge (tmp, op))
1747 { 1720 {
1748 /* return the original object and remove inserted object 1721 /* return the original object and remove inserted object
1749 (client needs the original object) */ 1722 (client prefers the original object) */
1723
1724 // carring must be 0 for mergable objects
1725 sint64 oweight = tmp->weight * tmp->nrof;
1726
1750 tmp->nrof += op->nrof; 1727 tmp->nrof += op->nrof;
1751 1728
1752 if (object *pl = tmp->visible_to ()) 1729 if (object *pl = tmp->visible_to ())
1753 esrv_update_item (UPD_NROF, pl, tmp); 1730 esrv_update_item (UPD_NROF, pl, tmp);
1754 1731
1755 adjust_weight (this, op->total_weight ()); 1732 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1756 1733
1757 op->destroy (); 1734 op->destroy ();
1758 op = tmp; 1735 op = tmp;
1759 goto inserted; 1736 goto inserted;
1760 } 1737 }
… …
1776 op->flag [FLAG_REMOVED] = 0; 1753 op->flag [FLAG_REMOVED] = 0;
1777 1754
1778 if (object *pl = op->visible_to ()) 1755 if (object *pl = op->visible_to ())
1779 esrv_send_item (pl, op); 1756 esrv_send_item (pl, op);
1780 1757
1781 adjust_weight (this, op->total_weight ()); 1758 adjust_weight (this, 0, op->total_weight ());
1782 1759
1783inserted: 1760inserted:
1784 /* reset the light list and los of the players on the map */ 1761 /* reset the light list and los of the players on the map */
1785 if (op->glow_radius && is_on_map ()) 1762 if (op->glow_radius && is_on_map ())
1786 { 1763 {
… …
1815 * MSW 2001-07-08: Check all objects on space, not just those below 1792 * MSW 2001-07-08: Check all objects on space, not just those below
1816 * object being inserted. insert_ob_in_map may not put new objects 1793 * object being inserted. insert_ob_in_map may not put new objects
1817 * on top. 1794 * on top.
1818 */ 1795 */
1819int 1796int
1820check_move_on (object *op, object *originator) 1797check_move_on (object *op, object *originator, int flags)
1821{ 1798{
1822 if (op->flag [FLAG_NO_APPLY]) 1799 if (op->flag [FLAG_NO_APPLY])
1823 return 0; 1800 return 0;
1824 1801
1825 object *tmp; 1802 object *tmp;
… …
1884 1861
1885 /* Basically same logic as above, except now for actual apply. */ 1862 /* Basically same logic as above, except now for actual apply. */
1886 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1863 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1887 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1864 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1888 { 1865 {
1866 if ((flags & INS_NO_AUTO_EXIT)
1867 && (tmp->type == EXIT || tmp->type == TELEPORTER
1868 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1869 continue;
1870
1889 move_apply (tmp, op, originator); 1871 move_apply (tmp, op, originator);
1890 1872
1891 if (op->destroyed ()) 1873 if (op->destroyed ())
1892 return 1; 1874 return 1;
1893 1875
… …
2218{ 2200{
2219 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2201 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2220} 2202}
2221 2203
2222/* 2204/*
2223 * find_dir_2(delta-x,delta-y) will return a direction in which 2205 * find_dir_2(delta-x,delta-y) will return a direction value
2224 * an object which has subtracted the x and y coordinates of another 2206 * for running into direct [dx, dy].
2225 * object, needs to travel toward it. 2207 * (the opposite of crossfire's find_dir_2!)
2226 */ 2208 */
2227int 2209int
2228find_dir_2 (int x, int y) 2210find_dir_2 (int x, int y)
2229{ 2211{
2212#if 1 // new algorithm
2213 // this works by putting x, y into 16 sectors, which
2214 // are not equal sized, but are a better approximation
2215 // then the old algorithm, and then using a mapping
2216 // table to map it into a direction value.
2217 // basically, it maps these comparisons to each bit
2218 // bit #3: x < 0
2219 // bit #2: y < 0
2220 // bit #1: x > y
2221 // bit #0: x > 2y
2222
2223 static const uint8 dir[16] = {
2224 4, 5, 4, 3,
2225 2, 1, 2, 3,
2226 6, 5, 6, 7,
2227 8, 1, 8, 7,
2228 };
2229 int sector = 0;
2230
2231 // this is a bit ugly, but more likely to result in branchless code
2232 sector |= x < 0 ? 8 : 0;
2233 x = x < 0 ? -x : x; // abs
2234
2235 sector |= y < 0 ? 4 : 0;
2236 y = y < 0 ? -y : y; // abs
2237
2238 if (x > y)
2239 {
2240 sector |= 2;
2241
2242 if (x > y * 2)
2243 sector |= 1;
2244 }
2245 else
2246 {
2247 if (y > x * 2)
2248 sector |= 1;
2249 else if (!y)
2250 return 0; // x == 0 here
2251 }
2252
2253 return dir [sector];
2254#else // old algorithm
2230 int q; 2255 int q;
2231 2256
2232 if (y) 2257 if (y)
2233 q = 128 * x / y; 2258 q = 128 * x / y;
2234 else if (x) 2259 else if (x)
2235 q = 512 * x; // to make it > 309 2260 q = -512 * x; // to make it > 309
2236 else 2261 else
2237 return 0; 2262 return 0;
2238 2263
2239 if (y > 0) 2264 if (y > 0)
2265 {
2266 if (q < -309) return 7;
2267 if (q < -52) return 6;
2268 if (q < 52) return 5;
2269 if (q < 309) return 4;
2270
2271 return 3;
2272 }
2273 else
2240 { 2274 {
2241 if (q < -309) return 3; 2275 if (q < -309) return 3;
2242 if (q < -52) return 2; 2276 if (q < -52) return 2;
2243 if (q < 52) return 1; 2277 if (q < 52) return 1;
2244 if (q < 309) return 8; 2278 if (q < 309) return 8;
2245 2279
2246 return 7; 2280 return 7;
2247 } 2281 }
2248 else 2282#endif
2249 {
2250 if (q < -309) return 7;
2251 if (q < -52) return 6;
2252 if (q < 52) return 5;
2253 if (q < 309) return 4;
2254
2255 return 3;
2256 }
2257} 2283}
2258 2284
2259/* 2285/*
2260 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2286 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2261 * between two directions (which are expected to be absolute (see absdir()) 2287 * between two directions (which are expected to be absolute (see absdir())
… …
2384 return /*who->flag [FLAG_WIZ]|| */ 2410 return /*who->flag [FLAG_WIZ]|| */
2385 (item->weight > 0 && !item->flag [FLAG_NO_PICK] && 2411 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2386 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2412 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2387} 2413}
2388 2414
2415//-GPL
2416
2389/* 2417/*
2390 * create clone from object to another 2418 * create clone from object to another
2391 */ 2419 */
2392object * 2420object *
2393object::deep_clone () 2421object::deep_clone ()
… …
2423 return tmp; 2451 return tmp;
2424 2452
2425 return 0; 2453 return 0;
2426} 2454}
2427 2455
2456/* Zero the key_values on op, decrementing the shared-string
2457 * refcounts and freeing the links.
2458 */
2459void
2460key_values::clear ()
2461{
2462 for (key_value *kvp = first; kvp; )
2463 {
2464 key_value *next = kvp->next;
2465 delete kvp;
2466 kvp = next;
2467 }
2468
2469 first = 0;
2470}
2471
2428shstr_tmp 2472shstr_tmp
2429object::kv_get (shstr_tmp key) const 2473key_values::get (shstr_tmp key) const
2430{ 2474{
2431 for (key_value *kv = key_values; kv; kv = kv->next) 2475 for (key_value *kv = first; kv; kv = kv->next)
2432 if (kv->key == key) 2476 if (kv->key == key)
2433 return kv->value; 2477 return kv->value;
2434 2478
2435 return shstr (); 2479 return shstr ();
2436} 2480}
2437 2481
2438void 2482void
2483key_values::add (shstr_tmp key, shstr_tmp value)
2484{
2485 key_value *kv = new key_value;
2486
2487 kv->next = first;
2488 kv->key = key;
2489 kv->value = value;
2490
2491 first = kv;
2492}
2493
2494void
2439object::kv_set (shstr_tmp key, shstr_tmp value) 2495key_values::set (shstr_tmp key, shstr_tmp value)
2440{ 2496{
2441 for (key_value *kv = key_values; kv; kv = kv->next) 2497 for (key_value *kv = first; kv; kv = kv->next)
2442 if (kv->key == key) 2498 if (kv->key == key)
2443 { 2499 {
2444 kv->value = value; 2500 kv->value = value;
2445 return; 2501 return;
2446 } 2502 }
2447 2503
2448 key_value *kv = new key_value; 2504 add (key, value);
2449
2450 kv->next = key_values;
2451 kv->key = key;
2452 kv->value = value;
2453
2454 key_values = kv;
2455} 2505}
2456 2506
2457void 2507void
2458object::kv_del (shstr_tmp key) 2508key_values::del (shstr_tmp key)
2459{ 2509{
2460 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2510 for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2461 if ((*kvp)->key == key) 2511 if ((*kvp)->key == key)
2462 { 2512 {
2463 key_value *kv = *kvp; 2513 key_value *kv = *kvp;
2464 *kvp = (*kvp)->next; 2514 *kvp = (*kvp)->next;
2465 delete kv; 2515 delete kv;
2466 return; 2516 return;
2467 } 2517 }
2518}
2519
2520void
2521key_values::reverse ()
2522{
2523 key_value *prev = 0;
2524 key_value *head = first;
2525
2526 while (head)
2527 {
2528 key_value *node = head;
2529 head = head->next;
2530 node->next = prev;
2531 prev = node;
2532 }
2533
2534 first = prev;
2535}
2536
2537key_values &
2538key_values::operator =(const key_values &kv)
2539{
2540 clear ();
2541
2542 for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
2543 add (kvp->key, kvp->value);
2544
2545 reverse ();
2468} 2546}
2469 2547
2470object::depth_iterator::depth_iterator (object *container) 2548object::depth_iterator::depth_iterator (object *container)
2471: iterator_base (container) 2549: iterator_base (container)
2472{ 2550{
… …
2555object::region () const 2633object::region () const
2556{ 2634{
2557 return map ? map->region (x, y) 2635 return map ? map->region (x, y)
2558 : region::default_region (); 2636 : region::default_region ();
2559} 2637}
2638
2639//+GPL
2560 2640
2561void 2641void
2562object::open_container (object *new_container) 2642object::open_container (object *new_container)
2563{ 2643{
2564 if (container == new_container) 2644 if (container == new_container)
… …
2622 } 2702 }
2623// else if (!old_container->env && contr && contr->ns) 2703// else if (!old_container->env && contr && contr->ns)
2624// contr->ns->floorbox_reset (); 2704// contr->ns->floorbox_reset ();
2625} 2705}
2626 2706
2707//-GPL
2708
2709// prefetch some flat area around the player
2710static void
2711prefetch_surrounding_area (object *op, maptile *map, int range)
2712{
2713 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
2714 op->x - range , op->y - range ,
2715 op->x + range + 1, op->y + range + 1);
2716 rect->m;
2717 ++rect)
2718 {
2719 rect->m->touch ();
2720 rect->m->activate ();
2721 }
2722}
2723
2724// prefetch a generous area around the player, also up and down
2725void
2726object::prefetch_surrounding_maps ()
2727{
2728 prefetch_surrounding_area (this, map, 40);
2729
2730 if (maptile *m = map->tile_available (TILE_DOWN))
2731 prefetch_surrounding_area (this, m, 20);
2732
2733 if (maptile *m = map->tile_available (TILE_UP))
2734 prefetch_surrounding_area (this, m, 20);
2735}
2736
2737//+GPL
2738
2627object * 2739object *
2628object::force_find (shstr_tmp name) 2740object::force_find (shstr_tmp name)
2629{ 2741{
2630 /* cycle through his inventory to look for the MARK we want to 2742 /* cycle through his inventory to look for the MARK we want to
2631 * place 2743 * place
… …
2635 return splay (tmp); 2747 return splay (tmp);
2636 2748
2637 return 0; 2749 return 0;
2638} 2750}
2639 2751
2640//-GPL
2641
2642void 2752void
2643object::force_set_timer (int duration) 2753object::force_set_timer (int duration)
2644{ 2754{
2645 this->duration = 1; 2755 this->duration = 1;
2646 this->speed_left = -1.f; 2756 this->speed_left = -1.f;
… …
2652object::force_add (shstr_tmp name, int duration) 2762object::force_add (shstr_tmp name, int duration)
2653{ 2763{
2654 if (object *force = force_find (name)) 2764 if (object *force = force_find (name))
2655 force->destroy (); 2765 force->destroy ();
2656 2766
2657 object *force = get_archetype (FORCE_NAME); 2767 object *force = archetype::get (FORCE_NAME);
2658 2768
2659 force->slaying = name; 2769 force->slaying = name;
2660 force->force_set_timer (duration); 2770 force->force_set_timer (duration);
2661 force->flag [FLAG_APPLIED] = true; 2771 force->flag [FLAG_APPLIED] = true;
2662 2772
… …
2746 return contr->mark; 2856 return contr->mark;
2747 else 2857 else
2748 return 0; 2858 return 0;
2749} 2859}
2750 2860
2861// put marked object first in the inventory
2862// this is used by identify-like spells so players can influence
2863// the order a bit.
2864void
2865object::splay_marked ()
2866{
2867 if (object *marked = mark ())
2868 splay (marked);
2869}
2870

Diff Legend

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