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 | |
|
|
76 | const 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 | |
76 | static void |
95 | static void |
77 | write_uuid (uval64 skip, bool sync) |
96 | write_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. */ |
216 | static bool |
235 | static bool |
217 | compare_ob_value_lists_one (const object *wants, const object *has) |
236 | compare_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 | */ |
256 | bool object::can_merge_slow (object *ob1, object *ob2) |
275 | bool 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") |
431 | static sint32 |
451 | static uint32 |
432 | weight_adjust_for (object *op, sint32 weight) |
452 | weight_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 | */ |
443 | static void |
463 | static void |
444 | adjust_weight (object *op, sint32 weight) |
464 | adjust_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 + weight) |
|
|
451 | - weight_adjust_for (op, op->carrying); |
|
|
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 carrying 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 | |
… | |
… | |
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 | */ |
|
|
592 | static void |
|
|
593 | free_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 |
… | |
… | |
614 | void |
612 | void |
615 | object::copy_to (object *dst) |
613 | object::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 | |
652 | void |
625 | void |
653 | object::instantiate () |
626 | object::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 | |
… | |
… | |
816 | |
789 | |
817 | object::~object () |
790 | object::~object () |
818 | { |
791 | { |
819 | unlink (); |
792 | unlink (); |
820 | |
793 | |
821 | free_key_values (this); |
794 | kv.clear (); |
822 | } |
795 | } |
823 | |
796 | |
824 | void object::link () |
797 | void object::link () |
825 | { |
798 | { |
826 | assert (!index);//D |
799 | assert (!index);//D |
… | |
… | |
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 (); |
… | |
… | |
1372 | { |
1345 | { |
1373 | op->remove (); |
1346 | op->remove (); |
1374 | |
1347 | |
1375 | if (m == &freed_map)//D TODO: remove soon |
1348 | if (m == &freed_map)//D TODO: remove soon |
1376 | {//D |
1349 | {//D |
1377 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1350 | LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D |
1378 | }//D |
1351 | }//D |
1379 | |
1352 | |
1380 | /* Ideally, the caller figures this out. However, it complicates a lot |
1353 | /* 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 |
1354 | * of areas of callers (eg, anything that uses find_free_spot would now |
1382 | * need extra work |
1355 | * need extra work |
… | |
… | |
1655 | |
1628 | |
1656 | nr = min (nr, nrof); |
1629 | nr = min (nr, nrof); |
1657 | |
1630 | |
1658 | if (nrof > nr) |
1631 | if (nrof > nr) |
1659 | { |
1632 | { |
|
|
1633 | sint64 oweight = total_weight (); |
|
|
1634 | |
1660 | nrof -= nr; |
1635 | nrof -= nr; |
1661 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1662 | |
1636 | |
1663 | if (object *pl = visible_to ()) |
1637 | if (object *pl = visible_to ()) |
1664 | esrv_update_item (UPD_NROF, pl, this); |
1638 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1639 | |
|
|
1640 | adjust_weight (env, oweight, total_weight ()); |
1665 | |
1641 | |
1666 | return true; |
1642 | return true; |
1667 | } |
1643 | } |
1668 | else |
1644 | else |
1669 | { |
1645 | { |
… | |
… | |
1744 | if (op->nrof) |
1720 | if (op->nrof) |
1745 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1721 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1746 | if (object::can_merge (tmp, op)) |
1722 | if (object::can_merge (tmp, op)) |
1747 | { |
1723 | { |
1748 | /* return the original object and remove inserted object |
1724 | /* return the original object and remove inserted object |
1749 | (client needs the original object) */ |
1725 | (client prefers the original object) */ |
|
|
1726 | |
|
|
1727 | // carring must be 0 for mergable objects |
|
|
1728 | sint64 oweight = tmp->weight * tmp->nrof; |
|
|
1729 | |
1750 | tmp->nrof += op->nrof; |
1730 | tmp->nrof += op->nrof; |
1751 | |
1731 | |
1752 | if (object *pl = tmp->visible_to ()) |
1732 | if (object *pl = tmp->visible_to ()) |
1753 | esrv_update_item (UPD_NROF, pl, tmp); |
1733 | esrv_update_item (UPD_NROF, pl, tmp); |
1754 | |
1734 | |
1755 | adjust_weight (this, op->total_weight ()); |
1735 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1756 | |
1736 | |
1757 | op->destroy (); |
1737 | op->destroy (); |
1758 | op = tmp; |
1738 | op = tmp; |
1759 | goto inserted; |
1739 | goto inserted; |
1760 | } |
1740 | } |
… | |
… | |
1776 | op->flag [FLAG_REMOVED] = 0; |
1756 | op->flag [FLAG_REMOVED] = 0; |
1777 | |
1757 | |
1778 | if (object *pl = op->visible_to ()) |
1758 | if (object *pl = op->visible_to ()) |
1779 | esrv_send_item (pl, op); |
1759 | esrv_send_item (pl, op); |
1780 | |
1760 | |
1781 | adjust_weight (this, op->total_weight ()); |
1761 | adjust_weight (this, 0, op->total_weight ()); |
1782 | |
1762 | |
1783 | inserted: |
1763 | inserted: |
1784 | /* reset the light list and los of the players on the map */ |
1764 | /* reset the light list and los of the players on the map */ |
1785 | if (op->glow_radius && is_on_map ()) |
1765 | if (op->glow_radius && is_on_map ()) |
1786 | { |
1766 | { |
… | |
… | |
2472 | return tmp; |
2452 | return tmp; |
2473 | |
2453 | |
2474 | return 0; |
2454 | return 0; |
2475 | } |
2455 | } |
2476 | |
2456 | |
|
|
2457 | /* Zero the key_values on op, decrementing the shared-string |
|
|
2458 | * refcounts and freeing the links. |
|
|
2459 | */ |
|
|
2460 | void |
|
|
2461 | key_values::clear () |
|
|
2462 | { |
|
|
2463 | for (key_value *kvp = first; kvp; ) |
|
|
2464 | { |
|
|
2465 | key_value *next = kvp->next; |
|
|
2466 | delete kvp; |
|
|
2467 | kvp = next; |
|
|
2468 | } |
|
|
2469 | |
|
|
2470 | first = 0; |
|
|
2471 | } |
|
|
2472 | |
2477 | shstr_tmp |
2473 | shstr_tmp |
2478 | object::kv_get (shstr_tmp key) const |
2474 | key_values::get (shstr_tmp key) const |
2479 | { |
2475 | { |
2480 | for (key_value *kv = key_values; kv; kv = kv->next) |
2476 | for (key_value *kv = first; kv; kv = kv->next) |
2481 | if (kv->key == key) |
2477 | if (kv->key == key) |
2482 | return kv->value; |
2478 | return kv->value; |
2483 | |
2479 | |
2484 | return shstr (); |
2480 | return shstr (); |
2485 | } |
2481 | } |
2486 | |
2482 | |
2487 | void |
2483 | void |
|
|
2484 | key_values::add (shstr_tmp key, shstr_tmp value) |
|
|
2485 | { |
|
|
2486 | key_value *kv = new key_value; |
|
|
2487 | |
|
|
2488 | kv->next = first; |
|
|
2489 | kv->key = key; |
|
|
2490 | kv->value = value; |
|
|
2491 | |
|
|
2492 | first = kv; |
|
|
2493 | } |
|
|
2494 | |
|
|
2495 | void |
2488 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2496 | key_values::set (shstr_tmp key, shstr_tmp value) |
2489 | { |
2497 | { |
2490 | for (key_value *kv = key_values; kv; kv = kv->next) |
2498 | for (key_value *kv = first; kv; kv = kv->next) |
2491 | if (kv->key == key) |
2499 | if (kv->key == key) |
2492 | { |
2500 | { |
2493 | kv->value = value; |
2501 | kv->value = value; |
2494 | return; |
2502 | return; |
2495 | } |
2503 | } |
2496 | |
2504 | |
2497 | key_value *kv = new key_value; |
2505 | add (key, value); |
2498 | |
|
|
2499 | kv->next = key_values; |
|
|
2500 | kv->key = key; |
|
|
2501 | kv->value = value; |
|
|
2502 | |
|
|
2503 | key_values = kv; |
|
|
2504 | } |
2506 | } |
2505 | |
2507 | |
2506 | void |
2508 | void |
2507 | object::kv_del (shstr_tmp key) |
2509 | key_values::del (shstr_tmp key) |
2508 | { |
2510 | { |
2509 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2511 | for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next) |
2510 | if ((*kvp)->key == key) |
2512 | if ((*kvp)->key == key) |
2511 | { |
2513 | { |
2512 | key_value *kv = *kvp; |
2514 | key_value *kv = *kvp; |
2513 | *kvp = (*kvp)->next; |
2515 | *kvp = (*kvp)->next; |
2514 | delete kv; |
2516 | delete kv; |
2515 | return; |
2517 | return; |
2516 | } |
2518 | } |
|
|
2519 | } |
|
|
2520 | |
|
|
2521 | void |
|
|
2522 | key_values::reverse () |
|
|
2523 | { |
|
|
2524 | key_value *prev = 0; |
|
|
2525 | key_value *head = first; |
|
|
2526 | |
|
|
2527 | while (head) |
|
|
2528 | { |
|
|
2529 | key_value *node = head; |
|
|
2530 | head = head->next; |
|
|
2531 | node->next = prev; |
|
|
2532 | prev = node; |
|
|
2533 | } |
|
|
2534 | |
|
|
2535 | first = prev; |
|
|
2536 | } |
|
|
2537 | |
|
|
2538 | key_values & |
|
|
2539 | key_values::operator =(const key_values &kv) |
|
|
2540 | { |
|
|
2541 | clear (); |
|
|
2542 | |
|
|
2543 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
|
|
2544 | add (kvp->key, kvp->value); |
|
|
2545 | |
|
|
2546 | reverse (); |
2517 | } |
2547 | } |
2518 | |
2548 | |
2519 | object::depth_iterator::depth_iterator (object *container) |
2549 | object::depth_iterator::depth_iterator (object *container) |
2520 | : iterator_base (container) |
2550 | : iterator_base (container) |
2521 | { |
2551 | { |
… | |
… | |
2701 | object::force_add (shstr_tmp name, int duration) |
2731 | object::force_add (shstr_tmp name, int duration) |
2702 | { |
2732 | { |
2703 | if (object *force = force_find (name)) |
2733 | if (object *force = force_find (name)) |
2704 | force->destroy (); |
2734 | force->destroy (); |
2705 | |
2735 | |
2706 | object *force = get_archetype (FORCE_NAME); |
2736 | object *force = archetype::get (FORCE_NAME); |
2707 | |
2737 | |
2708 | force->slaying = name; |
2738 | force->slaying = name; |
2709 | force->force_set_timer (duration); |
2739 | force->force_set_timer (duration); |
2710 | force->flag [FLAG_APPLIED] = true; |
2740 | force->flag [FLAG_APPLIED] = true; |
2711 | |
2741 | |
… | |
… | |
2795 | return contr->mark; |
2825 | return contr->mark; |
2796 | else |
2826 | else |
2797 | return 0; |
2827 | return 0; |
2798 | } |
2828 | } |
2799 | |
2829 | |
|
|
2830 | // put marked object first in the inventory |
|
|
2831 | // this is used by identify-like spells so players can influence |
|
|
2832 | // the order a bit. |
|
|
2833 | void |
|
|
2834 | object::splay_marked () |
|
|
2835 | { |
|
|
2836 | if (object *marked = mark ()) |
|
|
2837 | splay (marked); |
|
|
2838 | } |
|
|
2839 | |