… | |
… | |
139 | |
139 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
141 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
143 | { |
144 | key_value *wants_field; |
|
|
145 | |
|
|
146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
147 | * objects with lists are rare, and lists stay short. If not, use a |
145 | * objects with lists are rare, and lists stay short. If not, use a |
148 | * different structure or at least keep the lists sorted... |
146 | * different structure or at least keep the lists sorted... |
149 | */ |
147 | */ |
150 | |
148 | |
151 | /* For each field in wants, */ |
149 | /* For each field in wants, */ |
152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
153 | { |
151 | if (has->kv_get (kv->key) != kv->value) |
154 | key_value *has_field; |
152 | return false; |
155 | |
|
|
156 | /* Look for a field in has with the same key. */ |
|
|
157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
158 | |
|
|
159 | if (!has_field) |
|
|
160 | return 0; /* No field with that name. */ |
|
|
161 | |
|
|
162 | /* Found the matching field. */ |
|
|
163 | if (has_field->value != wants_field->value) |
|
|
164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
153 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
154 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return 1; |
155 | return true; |
171 | } |
156 | } |
172 | |
157 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
158 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static bool |
159 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
161 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
162 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
163 | * so we need to run the comparison *twice*. :( |
179 | */ |
164 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
165 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
166 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
167 | } |
182 | |
168 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
169 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
170 | * they can be merged together. |
185 | * |
171 | * |
… | |
… | |
334 | |
320 | |
335 | // find player who can see this object |
321 | // find player who can see this object |
336 | object * |
322 | object * |
337 | object::visible_to () const |
323 | object::visible_to () const |
338 | { |
324 | { |
339 | if (!flag [FLAG_REMOVED]) |
325 | if (client_visible () && !flag [FLAG_REMOVED]) |
340 | { |
326 | { |
341 | // see if we are in a container of sorts |
327 | // see if we are in a container of sorts |
342 | if (env) |
328 | if (env) |
343 | { |
329 | { |
344 | // the player inventory itself is always visible |
330 | // the player inventory itself is always visible |
… | |
… | |
358 | else |
344 | else |
359 | { |
345 | { |
360 | // maybe there is a player standing on the same mapspace |
346 | // maybe there is a player standing on the same mapspace |
361 | // this will catch the case where "this" is a player |
347 | // this will catch the case where "this" is a player |
362 | if (object *pl = ms ().player ()) |
348 | if (object *pl = ms ().player ()) |
|
|
349 | if (!pl->container || this == pl->container) |
363 | return pl; |
350 | return pl; |
364 | } |
351 | } |
365 | } |
352 | } |
366 | |
353 | |
367 | return 0; |
354 | return 0; |
368 | } |
355 | } |
369 | |
356 | |
370 | // adjust weight per container type ("of holding") |
357 | // adjust weight per container type ("of holding") |
371 | static sint32 |
358 | static sint32 |
372 | weight_adjust (object *op, sint32 weight) |
359 | weight_adjust_for (object *op, sint32 weight) |
373 | { |
360 | { |
374 | return op->type == CONTAINER |
361 | return op->type == CONTAINER |
375 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
376 | : weight; |
363 | : weight; |
377 | } |
364 | } |
… | |
… | |
383 | static void |
370 | static void |
384 | adjust_weight (object *op, sint32 weight) |
371 | adjust_weight (object *op, sint32 weight) |
385 | { |
372 | { |
386 | while (op) |
373 | while (op) |
387 | { |
374 | { |
|
|
375 | // adjust by actual difference to account for rounding errors |
|
|
376 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
388 | weight = weight_adjust (op, weight); |
377 | weight = weight_adjust_for (op, op->carrying) |
|
|
378 | - weight_adjust_for (op, op->carrying - weight); |
389 | |
379 | |
390 | if (!weight) |
380 | if (!weight) |
391 | return; |
381 | return; |
392 | |
382 | |
393 | op->carrying += weight; |
383 | op->carrying += weight; |
… | |
… | |
416 | op->update_weight (); |
406 | op->update_weight (); |
417 | |
407 | |
418 | sum += op->total_weight (); |
408 | sum += op->total_weight (); |
419 | } |
409 | } |
420 | |
410 | |
421 | sum = weight_adjust (this, sum); |
411 | sum = weight_adjust_for (this, sum); |
422 | |
412 | |
423 | if (sum != carrying) |
413 | if (sum != carrying) |
424 | { |
414 | { |
425 | carrying = sum; |
415 | carrying = sum; |
426 | |
416 | |
… | |
… | |
602 | } |
592 | } |
603 | |
593 | |
604 | op->key_values = 0; |
594 | op->key_values = 0; |
605 | } |
595 | } |
606 | |
596 | |
607 | object & |
597 | /* |
608 | object::operator =(const object &src) |
598 | * copy_to first frees everything allocated by the dst object, |
|
|
599 | * and then copies the contents of itself into the second |
|
|
600 | * object, allocating what needs to be allocated. Basically, any |
|
|
601 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
602 | * if the first object is freed, the pointers in the new object |
|
|
603 | * will point at garbage. |
|
|
604 | */ |
|
|
605 | void |
|
|
606 | object::copy_to (object *dst) |
609 | { |
607 | { |
610 | bool is_freed = flag [FLAG_FREED]; |
608 | dst->remove (); |
611 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
612 | |
|
|
613 | *(object_copy *)this = src; |
609 | *(object_copy *)dst = *this; |
614 | |
|
|
615 | flag [FLAG_FREED] = is_freed; |
|
|
616 | flag [FLAG_REMOVED] = is_removed; |
610 | dst->flag [FLAG_REMOVED] = true; |
617 | |
611 | |
618 | /* Copy over key_values, if any. */ |
612 | /* Copy over key_values, if any. */ |
619 | if (src.key_values) |
613 | if (key_values) |
620 | { |
614 | { |
621 | key_value *tail = 0; |
615 | key_value *tail = 0; |
622 | key_values = 0; |
616 | dst->key_values = 0; |
623 | |
617 | |
624 | for (key_value *i = src.key_values; i; i = i->next) |
618 | for (key_value *i = key_values; i; i = i->next) |
625 | { |
619 | { |
626 | key_value *new_link = new key_value; |
620 | key_value *new_link = new key_value; |
627 | |
621 | |
628 | new_link->next = 0; |
622 | new_link->next = 0; |
629 | new_link->key = i->key; |
623 | new_link->key = i->key; |
630 | new_link->value = i->value; |
624 | new_link->value = i->value; |
631 | |
625 | |
632 | /* Try and be clever here, too. */ |
626 | /* Try and be clever here, too. */ |
633 | if (!key_values) |
627 | if (!dst->key_values) |
634 | { |
628 | { |
635 | key_values = new_link; |
629 | dst->key_values = new_link; |
636 | tail = new_link; |
630 | tail = new_link; |
637 | } |
631 | } |
638 | else |
632 | else |
639 | { |
633 | { |
640 | tail->next = new_link; |
634 | tail->next = new_link; |
641 | tail = new_link; |
635 | tail = new_link; |
642 | } |
636 | } |
643 | } |
637 | } |
644 | } |
638 | } |
645 | } |
|
|
646 | |
|
|
647 | /* |
|
|
648 | * copy_to first frees everything allocated by the dst object, |
|
|
649 | * and then copies the contents of itself into the second |
|
|
650 | * object, allocating what needs to be allocated. Basically, any |
|
|
651 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
652 | * if the first object is freed, the pointers in the new object |
|
|
653 | * will point at garbage. |
|
|
654 | */ |
|
|
655 | void |
|
|
656 | object::copy_to (object *dst) |
|
|
657 | { |
|
|
658 | *dst = *this; |
|
|
659 | |
639 | |
660 | if (speed < 0) |
640 | if (speed < 0) |
661 | dst->speed_left -= rndm (); |
641 | dst->speed_left -= rndm (); |
662 | |
642 | |
663 | dst->set_speed (dst->speed); |
643 | dst->set_speed (dst->speed); |
… | |
… | |
685 | object * |
665 | object * |
686 | object::clone () |
666 | object::clone () |
687 | { |
667 | { |
688 | object *neu = create (); |
668 | object *neu = create (); |
689 | copy_to (neu); |
669 | copy_to (neu); |
|
|
670 | neu->map = map; // not copied by copy_to |
690 | return neu; |
671 | return neu; |
691 | } |
672 | } |
692 | |
673 | |
693 | /* |
674 | /* |
694 | * If an object with the IS_TURNABLE() flag needs to be turned due |
675 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
745 | * UP_OBJ_FACE: only the objects face has changed. |
726 | * UP_OBJ_FACE: only the objects face has changed. |
746 | */ |
727 | */ |
747 | void |
728 | void |
748 | update_object (object *op, int action) |
729 | update_object (object *op, int action) |
749 | { |
730 | { |
750 | if (op == NULL) |
731 | if (!op) |
751 | { |
732 | { |
752 | /* this should never happen */ |
733 | /* this should never happen */ |
753 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
734 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
754 | return; |
735 | return; |
755 | } |
736 | } |
756 | |
737 | |
757 | if (op->env) |
738 | if (!op->is_on_map ()) |
758 | { |
739 | { |
759 | /* Animation is currently handled by client, so nothing |
740 | /* Animation is currently handled by client, so nothing |
760 | * to do in this case. |
741 | * to do in this case. |
761 | */ |
742 | */ |
762 | return; |
743 | return; |
763 | } |
744 | } |
764 | |
|
|
765 | /* If the map is saving, don't do anything as everything is |
|
|
766 | * going to get freed anyways. |
|
|
767 | */ |
|
|
768 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
769 | return; |
|
|
770 | |
745 | |
771 | /* make sure the object is within map boundaries */ |
746 | /* make sure the object is within map boundaries */ |
772 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
747 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
773 | { |
748 | { |
774 | LOG (llevError, "update_object() called for object out of map!\n"); |
749 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
917 | object::destroy_inv (bool drop_to_ground) |
892 | object::destroy_inv (bool drop_to_ground) |
918 | { |
893 | { |
919 | // need to check first, because the checks below might segfault |
894 | // need to check first, because the checks below might segfault |
920 | // as we might be on an invalid mapspace and crossfire code |
895 | // as we might be on an invalid mapspace and crossfire code |
921 | // is too buggy to ensure that the inventory is empty. |
896 | // is too buggy to ensure that the inventory is empty. |
922 | // corollary: if you create arrows etc. with stuff in tis inventory, |
897 | // corollary: if you create arrows etc. with stuff in its inventory, |
923 | // cf will crash below with off-map x and y |
898 | // cf will crash below with off-map x and y |
924 | if (!inv) |
899 | if (!inv) |
925 | return; |
900 | return; |
926 | |
901 | |
927 | /* Only if the space blocks everything do we not process - |
902 | /* Only if the space blocks everything do we not process - |
… | |
… | |
929 | * drop on that space. |
904 | * drop on that space. |
930 | */ |
905 | */ |
931 | if (!drop_to_ground |
906 | if (!drop_to_ground |
932 | || !map |
907 | || !map |
933 | || map->in_memory != MAP_ACTIVE |
908 | || map->in_memory != MAP_ACTIVE |
934 | || map->nodrop |
909 | || map->no_drop |
935 | || ms ().move_block == MOVE_ALL) |
910 | || ms ().move_block == MOVE_ALL) |
936 | { |
911 | { |
937 | while (inv) |
912 | while (inv) |
938 | { |
913 | { |
939 | inv->destroy_inv (drop_to_ground); |
914 | inv->destroy_inv (false); |
940 | inv->destroy (); |
915 | inv->destroy (); |
941 | } |
916 | } |
942 | } |
917 | } |
943 | else |
918 | else |
944 | { /* Put objects in inventory onto this space */ |
919 | { /* Put objects in inventory onto this space */ |
… | |
… | |
950 | || op->flag [FLAG_NO_DROP] |
925 | || op->flag [FLAG_NO_DROP] |
951 | || op->type == RUNE |
926 | || op->type == RUNE |
952 | || op->type == TRAP |
927 | || op->type == TRAP |
953 | || op->flag [FLAG_IS_A_TEMPLATE] |
928 | || op->flag [FLAG_IS_A_TEMPLATE] |
954 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
929 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
955 | op->destroy (); |
930 | op->destroy (true); |
956 | else |
931 | else |
957 | map->insert (op, x, y); |
932 | map->insert (op, x, y); |
958 | } |
933 | } |
959 | } |
934 | } |
960 | } |
935 | } |
… | |
… | |
964 | object *op = new object; |
939 | object *op = new object; |
965 | op->link (); |
940 | op->link (); |
966 | return op; |
941 | return op; |
967 | } |
942 | } |
968 | |
943 | |
|
|
944 | static struct freed_map : maptile |
|
|
945 | { |
|
|
946 | freed_map () |
|
|
947 | { |
|
|
948 | path = "<freed objects map>"; |
|
|
949 | name = "/internal/freed_objects_map"; |
|
|
950 | width = 3; |
|
|
951 | height = 3; |
|
|
952 | no_drop = 1; |
|
|
953 | no_reset = 1; |
|
|
954 | |
|
|
955 | alloc (); |
|
|
956 | in_memory = MAP_ACTIVE; |
|
|
957 | } |
|
|
958 | |
|
|
959 | ~freed_map () |
|
|
960 | { |
|
|
961 | destroy (); |
|
|
962 | } |
|
|
963 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
964 | |
969 | void |
965 | void |
970 | object::do_destroy () |
966 | object::do_destroy () |
971 | { |
967 | { |
972 | if (flag [FLAG_IS_LINKED]) |
968 | if (flag [FLAG_IS_LINKED]) |
973 | remove_button_link (this); |
969 | remove_button_link (this); |
… | |
… | |
977 | |
973 | |
978 | remove (); |
974 | remove (); |
979 | |
975 | |
980 | attachable::do_destroy (); |
976 | attachable::do_destroy (); |
981 | |
977 | |
982 | destroy_inv (true); |
|
|
983 | |
|
|
984 | deactivate (); |
978 | deactivate (); |
985 | unlink (); |
979 | unlink (); |
986 | |
980 | |
987 | flag [FLAG_FREED] = 1; |
981 | flag [FLAG_FREED] = 1; |
988 | |
982 | |
989 | // hack to ensure that freed objects still have a valid map |
983 | // hack to ensure that freed objects still have a valid map |
990 | { |
|
|
991 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
992 | |
|
|
993 | if (!freed_map) |
|
|
994 | { |
|
|
995 | freed_map = new maptile; |
|
|
996 | |
|
|
997 | freed_map->path = "<freed objects map>"; |
|
|
998 | freed_map->name = "/internal/freed_objects_map"; |
|
|
999 | freed_map->width = 3; |
|
|
1000 | freed_map->height = 3; |
|
|
1001 | freed_map->nodrop = 1; |
|
|
1002 | |
|
|
1003 | freed_map->alloc (); |
|
|
1004 | freed_map->in_memory = MAP_ACTIVE; |
|
|
1005 | } |
|
|
1006 | |
|
|
1007 | map = freed_map; |
984 | map = &freed_map; |
1008 | x = 1; |
985 | x = 1; |
1009 | y = 1; |
986 | y = 1; |
1010 | } |
|
|
1011 | |
987 | |
1012 | if (more) |
988 | if (more) |
1013 | { |
989 | { |
1014 | more->destroy (); |
990 | more->destroy (); |
1015 | more = 0; |
991 | more = 0; |
… | |
… | |
1028 | object::destroy (bool destroy_inventory) |
1004 | object::destroy (bool destroy_inventory) |
1029 | { |
1005 | { |
1030 | if (destroyed ()) |
1006 | if (destroyed ()) |
1031 | return; |
1007 | return; |
1032 | |
1008 | |
|
|
1009 | if (!is_head () && !head->destroyed ()) |
|
|
1010 | { |
|
|
1011 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1012 | head->destroy (destroy_inventory); |
|
|
1013 | return; |
|
|
1014 | } |
|
|
1015 | |
1033 | if (destroy_inventory) |
1016 | destroy_inv (!destroy_inventory); |
1034 | destroy_inv (false); |
|
|
1035 | |
1017 | |
1036 | if (is_head ()) |
1018 | if (is_head ()) |
1037 | if (sound_destroy) |
1019 | if (sound_destroy) |
1038 | play_sound (sound_destroy); |
1020 | play_sound (sound_destroy); |
1039 | else if (flag [FLAG_MONSTER]) |
1021 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1058 | if (flag [FLAG_REMOVED]) |
1040 | if (flag [FLAG_REMOVED]) |
1059 | return; |
1041 | return; |
1060 | |
1042 | |
1061 | INVOKE_OBJECT (REMOVE, this); |
1043 | INVOKE_OBJECT (REMOVE, this); |
1062 | |
1044 | |
1063 | if (object *pl = visible_to ()) |
|
|
1064 | esrv_del_item (pl->contr, count); |
|
|
1065 | |
|
|
1066 | flag [FLAG_REMOVED] = true; |
1045 | flag [FLAG_REMOVED] = true; |
1067 | |
1046 | |
1068 | if (more) |
1047 | if (more) |
1069 | more->remove (); |
1048 | more->remove (); |
1070 | |
1049 | |
… | |
… | |
1072 | * In this case, the object to be removed is in someones |
1051 | * In this case, the object to be removed is in someones |
1073 | * inventory. |
1052 | * inventory. |
1074 | */ |
1053 | */ |
1075 | if (env) |
1054 | if (env) |
1076 | { |
1055 | { |
|
|
1056 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1057 | if (object *pl = visible_to ()) |
|
|
1058 | esrv_del_item (pl->contr, count); |
|
|
1059 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1060 | |
1077 | adjust_weight (env, -total_weight ()); |
1061 | adjust_weight (env, -total_weight ()); |
1078 | |
|
|
1079 | *(above ? &above->below : &env->inv) = below; |
|
|
1080 | |
|
|
1081 | if (below) |
|
|
1082 | below->above = above; |
|
|
1083 | |
1062 | |
1084 | /* we set up values so that it could be inserted into |
1063 | /* we set up values so that it could be inserted into |
1085 | * the map, but we don't actually do that - it is up |
1064 | * the map, but we don't actually do that - it is up |
1086 | * to the caller to decide what we want to do. |
1065 | * to the caller to decide what we want to do. |
1087 | */ |
1066 | */ |
1088 | map = env->map; |
1067 | map = env->map; |
1089 | x = env->x; |
1068 | x = env->x; |
1090 | y = env->y; |
1069 | y = env->y; |
|
|
1070 | |
|
|
1071 | // make sure cmov optimisation is applicable |
|
|
1072 | *(above ? &above->below : &env->inv) = below; |
|
|
1073 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1074 | |
1091 | above = 0; |
1075 | above = 0; |
1092 | below = 0; |
1076 | below = 0; |
1093 | env = 0; |
1077 | env = 0; |
1094 | |
1078 | |
1095 | /* NO_FIX_PLAYER is set when a great many changes are being |
1079 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1099 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1083 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1100 | otmp->update_stats (); |
1084 | otmp->update_stats (); |
1101 | } |
1085 | } |
1102 | else if (map) |
1086 | else if (map) |
1103 | { |
1087 | { |
1104 | if (type == PLAYER) |
|
|
1105 | { |
|
|
1106 | // leaving a spot always closes any open container on the ground |
|
|
1107 | if (container && !container->env) |
|
|
1108 | // this causes spurious floorbox updates, but it ensures |
|
|
1109 | // that the CLOSE event is being sent. |
|
|
1110 | close_container (); |
|
|
1111 | |
|
|
1112 | --map->players; |
|
|
1113 | map->touch (); |
|
|
1114 | } |
|
|
1115 | |
|
|
1116 | map->dirty = true; |
1088 | map->dirty = true; |
1117 | mapspace &ms = this->ms (); |
1089 | mapspace &ms = this->ms (); |
1118 | |
1090 | |
|
|
1091 | if (object *pl = ms.player ()) |
|
|
1092 | { |
|
|
1093 | if (type == PLAYER) // this == pl(!) |
|
|
1094 | { |
|
|
1095 | // leaving a spot always closes any open container on the ground |
|
|
1096 | if (container && !container->env) |
|
|
1097 | // this causes spurious floorbox updates, but it ensures |
|
|
1098 | // that the CLOSE event is being sent. |
|
|
1099 | close_container (); |
|
|
1100 | |
|
|
1101 | --map->players; |
|
|
1102 | map->touch (); |
|
|
1103 | } |
|
|
1104 | else if (pl->container == this) |
|
|
1105 | { |
|
|
1106 | // removing a container should close it |
|
|
1107 | close_container (); |
|
|
1108 | } |
|
|
1109 | |
|
|
1110 | esrv_del_item (pl->contr, count); |
|
|
1111 | } |
|
|
1112 | |
1119 | /* link the object above us */ |
1113 | /* link the object above us */ |
1120 | if (above) |
1114 | // re-link, make sure compiler can easily use cmove |
1121 | above->below = below; |
1115 | *(above ? &above->below : &ms.top) = below; |
1122 | else |
1116 | *(below ? &below->above : &ms.bot) = above; |
1123 | ms.top = below; /* we were top, set new top */ |
|
|
1124 | |
|
|
1125 | /* Relink the object below us, if there is one */ |
|
|
1126 | if (below) |
|
|
1127 | below->above = above; |
|
|
1128 | else |
|
|
1129 | { |
|
|
1130 | /* Nothing below, which means we need to relink map object for this space |
|
|
1131 | * use translated coordinates in case some oddness with map tiling is |
|
|
1132 | * evident |
|
|
1133 | */ |
|
|
1134 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1135 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1136 | |
|
|
1137 | ms.bot = above; /* goes on above it. */ |
|
|
1138 | } |
|
|
1139 | |
1117 | |
1140 | above = 0; |
1118 | above = 0; |
1141 | below = 0; |
1119 | below = 0; |
1142 | |
1120 | |
1143 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1152 | * removed (most likely destroyed), update the player view |
1130 | * removed (most likely destroyed), update the player view |
1153 | * appropriately. |
1131 | * appropriately. |
1154 | */ |
1132 | */ |
1155 | pl->close_container (); |
1133 | pl->close_container (); |
1156 | |
1134 | |
|
|
1135 | //TODO: the floorbox prev/next might need updating |
|
|
1136 | //esrv_del_item (pl->contr, count); |
|
|
1137 | //TODO: update floorbox to preserve ordering |
|
|
1138 | if (pl->contr->ns) |
1157 | pl->contr->ns->floorbox_update (); |
1139 | pl->contr->ns->floorbox_update (); |
1158 | } |
1140 | } |
1159 | |
1141 | |
1160 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1142 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1161 | { |
1143 | { |
1162 | /* No point updating the players look faces if he is the object |
1144 | /* No point updating the players look faces if he is the object |
… | |
… | |
1286 | * just 'op' otherwise |
1268 | * just 'op' otherwise |
1287 | */ |
1269 | */ |
1288 | object * |
1270 | object * |
1289 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1290 | { |
1272 | { |
1291 | assert (!op->flag [FLAG_FREED]); |
|
|
1292 | |
|
|
1293 | object *top, *floor = NULL; |
|
|
1294 | |
|
|
1295 | op->remove (); |
1273 | op->remove (); |
1296 | |
1274 | |
1297 | /* Ideally, the caller figures this out. However, it complicates a lot |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1298 | * of areas of callers (eg, anything that uses find_free_spot would now |
1276 | * of areas of callers (eg, anything that uses find_free_spot would now |
1299 | * need extra work |
1277 | * need extra work |
1300 | */ |
1278 | */ |
1301 | if (!xy_normalise (m, op->x, op->y)) |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1302 | { |
1280 | { |
1303 | op->destroy (); |
1281 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1304 | return 0; |
1282 | return 0; |
1305 | } |
1283 | } |
1306 | |
1284 | |
1307 | if (object *more = op->more) |
1285 | if (object *more = op->more) |
1308 | if (!insert_ob_in_map (more, m, originator, flag)) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1317 | */ |
1295 | */ |
1318 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1296 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1319 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1297 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1320 | if (object::can_merge (op, tmp)) |
1298 | if (object::can_merge (op, tmp)) |
1321 | { |
1299 | { |
|
|
1300 | // TODO: we actually want to update tmp, not op, |
|
|
1301 | // but some caller surely breaks when we return tmp |
|
|
1302 | // from here :/ |
1322 | op->nrof += tmp->nrof; |
1303 | op->nrof += tmp->nrof; |
1323 | tmp->destroy (1); |
1304 | tmp->destroy (1); |
1324 | } |
1305 | } |
1325 | |
1306 | |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1307 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1329 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1310 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1330 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1311 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1331 | |
1312 | |
1332 | if (flag & INS_BELOW_ORIGINATOR) |
1313 | if (flag & INS_BELOW_ORIGINATOR) |
1333 | { |
1314 | { |
1334 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1315 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) |
1335 | { |
1316 | { |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1317 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1337 | abort (); |
1318 | abort (); |
1338 | } |
1319 | } |
1339 | |
1320 | |
1340 | op->above = originator; |
1321 | op->above = originator; |
1341 | op->below = originator->below; |
1322 | op->below = originator->below; |
1342 | |
|
|
1343 | if (op->below) |
|
|
1344 | op->below->above = op; |
|
|
1345 | else |
|
|
1346 | ms.bot = op; |
|
|
1347 | |
|
|
1348 | /* since *below* originator, no need to update top */ |
|
|
1349 | originator->below = op; |
1323 | originator->below = op; |
|
|
1324 | |
|
|
1325 | *(op->below ? &op->below->above : &ms.bot) = op; |
1350 | } |
1326 | } |
1351 | else |
1327 | else |
1352 | { |
1328 | { |
1353 | top = ms.bot; |
1329 | object *floor = 0; |
|
|
1330 | object *top = ms.top; |
1354 | |
1331 | |
1355 | /* If there are other objects, then */ |
1332 | /* If there are other objects, then */ |
1356 | if (top) |
1333 | if (top) |
1357 | { |
1334 | { |
1358 | object *last = 0; |
|
|
1359 | |
|
|
1360 | /* |
1335 | /* |
1361 | * If there are multiple objects on this space, we do some trickier handling. |
1336 | * If there are multiple objects on this space, we do some trickier handling. |
1362 | * We've already dealt with merging if appropriate. |
1337 | * We've already dealt with merging if appropriate. |
1363 | * Generally, we want to put the new object on top. But if |
1338 | * Generally, we want to put the new object on top. But if |
1364 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1339 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1367 | * once we get to them. This reduces the need to traverse over all of |
1342 | * once we get to them. This reduces the need to traverse over all of |
1368 | * them when adding another one - this saves quite a bit of cpu time |
1343 | * them when adding another one - this saves quite a bit of cpu time |
1369 | * when lots of spells are cast in one area. Currently, it is presumed |
1344 | * when lots of spells are cast in one area. Currently, it is presumed |
1370 | * that flying non pickable objects are spell objects. |
1345 | * that flying non pickable objects are spell objects. |
1371 | */ |
1346 | */ |
1372 | for (top = ms.bot; top; top = top->above) |
1347 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1373 | { |
1348 | { |
1374 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1349 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1375 | floor = top; |
1350 | floor = tmp; |
1376 | |
1351 | |
1377 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1352 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1378 | { |
1353 | { |
1379 | /* We insert above top, so we want this object below this */ |
1354 | /* We insert above top, so we want this object below this */ |
1380 | top = top->below; |
1355 | top = tmp->below; |
1381 | break; |
1356 | break; |
1382 | } |
1357 | } |
1383 | |
1358 | |
1384 | last = top; |
1359 | top = tmp; |
1385 | } |
1360 | } |
1386 | |
|
|
1387 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1388 | top = last; |
|
|
1389 | |
1361 | |
1390 | /* We let update_position deal with figuring out what the space |
1362 | /* We let update_position deal with figuring out what the space |
1391 | * looks like instead of lots of conditions here. |
1363 | * looks like instead of lots of conditions here. |
1392 | * makes things faster, and effectively the same result. |
1364 | * makes things faster, and effectively the same result. |
1393 | */ |
1365 | */ |
… | |
… | |
1400 | */ |
1372 | */ |
1401 | if (!(flag & INS_ON_TOP) |
1373 | if (!(flag & INS_ON_TOP) |
1402 | && ms.flags () & P_BLOCKSVIEW |
1374 | && ms.flags () & P_BLOCKSVIEW |
1403 | && (op->face && !faces [op->face].visibility)) |
1375 | && (op->face && !faces [op->face].visibility)) |
1404 | { |
1376 | { |
|
|
1377 | object *last; |
|
|
1378 | |
1405 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1406 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1407 | break; |
1381 | break; |
1408 | |
1382 | |
1409 | /* Check to see if we found the object that blocks view, |
1383 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1417 | } /* If objects on this space */ |
1391 | } /* If objects on this space */ |
1418 | |
1392 | |
1419 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1393 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1420 | top = floor; |
1394 | top = floor; |
1421 | |
1395 | |
1422 | /* Top is the object that our object (op) is going to get inserted above. |
1396 | // insert object above top, or bottom-most if top = 0 |
1423 | */ |
|
|
1424 | |
|
|
1425 | /* First object on this space */ |
|
|
1426 | if (!top) |
1397 | if (!top) |
1427 | { |
1398 | { |
|
|
1399 | op->below = 0; |
1428 | op->above = ms.bot; |
1400 | op->above = ms.bot; |
1429 | |
|
|
1430 | if (op->above) |
|
|
1431 | op->above->below = op; |
|
|
1432 | |
|
|
1433 | op->below = 0; |
|
|
1434 | ms.bot = op; |
1401 | ms.bot = op; |
|
|
1402 | |
|
|
1403 | *(op->above ? &op->above->below : &ms.top) = op; |
1435 | } |
1404 | } |
1436 | else |
1405 | else |
1437 | { /* get inserted into the stack above top */ |
1406 | { |
1438 | op->above = top->above; |
1407 | op->above = top->above; |
1439 | |
|
|
1440 | if (op->above) |
|
|
1441 | op->above->below = op; |
1408 | top->above = op; |
1442 | |
1409 | |
1443 | op->below = top; |
1410 | op->below = top; |
1444 | top->above = op; |
1411 | *(op->above ? &op->above->below : &ms.top) = op; |
1445 | } |
1412 | } |
1446 | |
1413 | } |
1447 | if (!op->above) |
|
|
1448 | ms.top = op; |
|
|
1449 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1450 | |
1414 | |
1451 | if (op->type == PLAYER) |
1415 | if (op->type == PLAYER) |
1452 | { |
1416 | { |
1453 | op->contr->do_los = 1; |
1417 | op->contr->do_los = 1; |
1454 | ++op->map->players; |
1418 | ++op->map->players; |
… | |
… | |
1456 | } |
1420 | } |
1457 | |
1421 | |
1458 | op->map->dirty = true; |
1422 | op->map->dirty = true; |
1459 | |
1423 | |
1460 | if (object *pl = ms.player ()) |
1424 | if (object *pl = ms.player ()) |
|
|
1425 | //TODO: the floorbox prev/next might need updating |
|
|
1426 | //esrv_send_item (pl, op); |
|
|
1427 | //TODO: update floorbox to preserve ordering |
|
|
1428 | if (pl->contr->ns) |
1461 | pl->contr->ns->floorbox_update (); |
1429 | pl->contr->ns->floorbox_update (); |
1462 | |
1430 | |
1463 | /* If this object glows, it may affect lighting conditions that are |
1431 | /* If this object glows, it may affect lighting conditions that are |
1464 | * visible to others on this map. But update_all_los is really |
1432 | * visible to others on this map. But update_all_los is really |
1465 | * an inefficient way to do this, as it means los for all players |
1433 | * an inefficient way to do this, as it means los for all players |
1466 | * on the map will get recalculated. The players could very well |
1434 | * on the map will get recalculated. The players could very well |
… | |
… | |
1586 | } |
1554 | } |
1587 | else |
1555 | else |
1588 | { |
1556 | { |
1589 | decrease (nr); |
1557 | decrease (nr); |
1590 | |
1558 | |
1591 | object *op = object_create_clone (this); |
1559 | object *op = deep_clone (); |
1592 | op->nrof = nr; |
1560 | op->nrof = nr; |
1593 | return op; |
1561 | return op; |
1594 | } |
1562 | } |
1595 | } |
1563 | } |
1596 | |
1564 | |
… | |
… | |
1817 | LOG (llevError, "Present_arch called outside map.\n"); |
1785 | LOG (llevError, "Present_arch called outside map.\n"); |
1818 | return NULL; |
1786 | return NULL; |
1819 | } |
1787 | } |
1820 | |
1788 | |
1821 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1789 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1822 | if (tmp->arch == at) |
1790 | if (tmp->arch->archname == at->archname) |
1823 | return tmp; |
1791 | return tmp; |
1824 | |
1792 | |
1825 | return NULL; |
1793 | return NULL; |
1826 | } |
1794 | } |
1827 | |
1795 | |
… | |
… | |
1891 | * The first matching object is returned, or NULL if none. |
1859 | * The first matching object is returned, or NULL if none. |
1892 | */ |
1860 | */ |
1893 | object * |
1861 | object * |
1894 | present_arch_in_ob (const archetype *at, const object *op) |
1862 | present_arch_in_ob (const archetype *at, const object *op) |
1895 | { |
1863 | { |
1896 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1864 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1897 | if (tmp->arch == at) |
1865 | if (tmp->arch->archname == at->archname) |
1898 | return tmp; |
1866 | return tmp; |
1899 | |
1867 | |
1900 | return NULL; |
1868 | return NULL; |
1901 | } |
1869 | } |
1902 | |
1870 | |
… | |
… | |
2311 | |
2279 | |
2312 | /* |
2280 | /* |
2313 | * create clone from object to another |
2281 | * create clone from object to another |
2314 | */ |
2282 | */ |
2315 | object * |
2283 | object * |
2316 | object_create_clone (object *asrc) |
2284 | object::deep_clone () |
2317 | { |
2285 | { |
2318 | object *dst = 0, *tmp, *src, *prev, *item; |
2286 | assert (("deep_clone called on non-head object", is_head ())); |
2319 | |
2287 | |
2320 | if (!asrc) |
2288 | object *dst = clone (); |
2321 | return 0; |
|
|
2322 | |
2289 | |
2323 | src = asrc->head_ (); |
2290 | object *prev = dst; |
2324 | |
|
|
2325 | prev = 0; |
|
|
2326 | for (object *part = src; part; part = part->more) |
2291 | for (object *part = this->more; part; part = part->more) |
2327 | { |
2292 | { |
2328 | tmp = part->clone (); |
2293 | object *tmp = part->clone (); |
2329 | tmp->x -= src->x; |
|
|
2330 | tmp->y -= src->y; |
|
|
2331 | |
|
|
2332 | if (!part->head) |
|
|
2333 | { |
|
|
2334 | dst = tmp; |
|
|
2335 | tmp->head = 0; |
|
|
2336 | } |
|
|
2337 | else |
|
|
2338 | tmp->head = dst; |
2294 | tmp->head = dst; |
2339 | |
|
|
2340 | tmp->more = 0; |
|
|
2341 | |
|
|
2342 | if (prev) |
|
|
2343 | prev->more = tmp; |
2295 | prev->more = tmp; |
2344 | |
|
|
2345 | prev = tmp; |
2296 | prev = tmp; |
2346 | } |
2297 | } |
2347 | |
2298 | |
2348 | for (item = src->inv; item; item = item->below) |
2299 | for (object *item = inv; item; item = item->below) |
2349 | insert_ob_in_ob (object_create_clone (item), dst); |
2300 | insert_ob_in_ob (item->deep_clone (), dst); |
2350 | |
2301 | |
2351 | return dst; |
2302 | return dst; |
2352 | } |
2303 | } |
2353 | |
2304 | |
2354 | /* This returns the first object in who's inventory that |
2305 | /* This returns the first object in who's inventory that |
… | |
… | |
2363 | return tmp; |
2314 | return tmp; |
2364 | |
2315 | |
2365 | return 0; |
2316 | return 0; |
2366 | } |
2317 | } |
2367 | |
2318 | |
2368 | /* If ob has a field named key, return the link from the list, |
2319 | const shstr & |
2369 | * otherwise return NULL. |
2320 | object::kv_get (const shstr &key) const |
2370 | * |
|
|
2371 | * key must be a passed in shared string - otherwise, this won't |
|
|
2372 | * do the desired thing. |
|
|
2373 | */ |
|
|
2374 | key_value * |
|
|
2375 | get_ob_key_link (const object *ob, const char *key) |
|
|
2376 | { |
2321 | { |
2377 | for (key_value *link = ob->key_values; link; link = link->next) |
2322 | for (key_value *kv = key_values; kv; kv = kv->next) |
2378 | if (link->key == key) |
2323 | if (kv->key == key) |
2379 | return link; |
|
|
2380 | |
|
|
2381 | return 0; |
|
|
2382 | } |
|
|
2383 | |
|
|
2384 | /* |
|
|
2385 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2386 | * |
|
|
2387 | * The argument doesn't need to be a shared string. |
|
|
2388 | * |
|
|
2389 | * The returned string is shared. |
|
|
2390 | */ |
|
|
2391 | const char * |
|
|
2392 | get_ob_key_value (const object *op, const char *const key) |
|
|
2393 | { |
|
|
2394 | key_value *link; |
|
|
2395 | shstr_cmp canonical_key (key); |
|
|
2396 | |
|
|
2397 | if (!canonical_key) |
|
|
2398 | { |
|
|
2399 | /* 1. There being a field named key on any object |
|
|
2400 | * implies there'd be a shared string to find. |
|
|
2401 | * 2. Since there isn't, no object has this field. |
|
|
2402 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2403 | */ |
|
|
2404 | return 0; |
|
|
2405 | } |
|
|
2406 | |
|
|
2407 | /* This is copied from get_ob_key_link() above - |
|
|
2408 | * only 4 lines, and saves the function call overhead. |
|
|
2409 | */ |
|
|
2410 | for (link = op->key_values; link; link = link->next) |
|
|
2411 | if (link->key == canonical_key) |
|
|
2412 | return link->value; |
2324 | return kv->value; |
2413 | |
2325 | |
2414 | return 0; |
2326 | return shstr_null; |
2415 | } |
2327 | } |
2416 | |
2328 | |
2417 | /* |
2329 | void |
2418 | * Updates the canonical_key in op to value. |
2330 | object::kv_set (const shstr &key, const shstr &value) |
2419 | * |
|
|
2420 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2421 | * |
|
|
2422 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2423 | * keys. |
|
|
2424 | * |
|
|
2425 | * Returns TRUE on success. |
|
|
2426 | */ |
|
|
2427 | int |
|
|
2428 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2429 | { |
2331 | { |
2430 | key_value *field = NULL, *last = NULL; |
2332 | for (key_value *kv = key_values; kv; kv = kv->next) |
2431 | |
2333 | if (kv->key == key) |
2432 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2433 | { |
|
|
2434 | if (field->key != canonical_key) |
|
|
2435 | { |
2334 | { |
2436 | last = field; |
2335 | kv->value = value; |
2437 | continue; |
2336 | return; |
2438 | } |
2337 | } |
2439 | |
2338 | |
2440 | if (value) |
2339 | key_value *kv = new key_value; |
2441 | field->value = value; |
2340 | |
2442 | else |
2341 | kv->next = key_values; |
|
|
2342 | kv->key = key; |
|
|
2343 | kv->value = value; |
|
|
2344 | |
|
|
2345 | key_values = kv; |
|
|
2346 | } |
|
|
2347 | |
|
|
2348 | void |
|
|
2349 | object::kv_del (const shstr &key) |
|
|
2350 | { |
|
|
2351 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2352 | if ((*kvp)->key == key) |
2443 | { |
2353 | { |
2444 | /* Basically, if the archetype has this key set, |
2354 | key_value *kv = *kvp; |
2445 | * we need to store the null value so when we save |
2355 | *kvp = (*kvp)->next; |
2446 | * it, we save the empty value so that when we load, |
2356 | delete kv; |
2447 | * we get this value back again. |
2357 | return; |
2448 | */ |
|
|
2449 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2450 | field->value = 0; |
|
|
2451 | else |
|
|
2452 | { |
|
|
2453 | if (last) |
|
|
2454 | last->next = field->next; |
|
|
2455 | else |
|
|
2456 | op->key_values = field->next; |
|
|
2457 | |
|
|
2458 | delete field; |
|
|
2459 | } |
|
|
2460 | } |
2358 | } |
2461 | return TRUE; |
|
|
2462 | } |
|
|
2463 | /* IF we get here, key doesn't exist */ |
|
|
2464 | |
|
|
2465 | /* No field, we'll have to add it. */ |
|
|
2466 | |
|
|
2467 | if (!add_key) |
|
|
2468 | return FALSE; |
|
|
2469 | |
|
|
2470 | /* There isn't any good reason to store a null |
|
|
2471 | * value in the key/value list. If the archetype has |
|
|
2472 | * this key, then we should also have it, so shouldn't |
|
|
2473 | * be here. If user wants to store empty strings, |
|
|
2474 | * should pass in "" |
|
|
2475 | */ |
|
|
2476 | if (value == NULL) |
|
|
2477 | return TRUE; |
|
|
2478 | |
|
|
2479 | field = new key_value; |
|
|
2480 | |
|
|
2481 | field->key = canonical_key; |
|
|
2482 | field->value = value; |
|
|
2483 | /* Usual prepend-addition. */ |
|
|
2484 | field->next = op->key_values; |
|
|
2485 | op->key_values = field; |
|
|
2486 | |
|
|
2487 | return TRUE; |
|
|
2488 | } |
|
|
2489 | |
|
|
2490 | /* |
|
|
2491 | * Updates the key in op to value. |
|
|
2492 | * |
|
|
2493 | * If add_key is FALSE, this will only update existing keys, |
|
|
2494 | * and not add new ones. |
|
|
2495 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2496 | * |
|
|
2497 | * Returns TRUE on success. |
|
|
2498 | */ |
|
|
2499 | int |
|
|
2500 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2501 | { |
|
|
2502 | shstr key_ (key); |
|
|
2503 | |
|
|
2504 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2505 | } |
2359 | } |
2506 | |
2360 | |
2507 | object::depth_iterator::depth_iterator (object *container) |
2361 | object::depth_iterator::depth_iterator (object *container) |
2508 | : iterator_base (container) |
2362 | : iterator_base (container) |
2509 | { |
2363 | { |
… | |
… | |
2567 | &name, |
2421 | &name, |
2568 | title ? "\",title:\"" : "", |
2422 | title ? "\",title:\"" : "", |
2569 | title ? (const char *)title : "", |
2423 | title ? (const char *)title : "", |
2570 | flag_desc (flagdesc, 512), type); |
2424 | flag_desc (flagdesc, 512), type); |
2571 | |
2425 | |
2572 | if (!this->flag[FLAG_REMOVED] && env) |
2426 | if (!flag[FLAG_REMOVED] && env) |
2573 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2427 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2574 | |
2428 | |
2575 | if (map) |
2429 | if (map) |
2576 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2430 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2577 | |
2431 | |
… | |
… | |
2607 | object::open_container (object *new_container) |
2461 | object::open_container (object *new_container) |
2608 | { |
2462 | { |
2609 | if (container == new_container) |
2463 | if (container == new_container) |
2610 | return; |
2464 | return; |
2611 | |
2465 | |
2612 | if (object *old_container = container) |
2466 | object *old_container = container; |
|
|
2467 | |
|
|
2468 | if (old_container) |
2613 | { |
2469 | { |
2614 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2470 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2615 | return; |
2471 | return; |
2616 | |
2472 | |
2617 | #if 0 |
2473 | #if 0 |
… | |
… | |
2619 | if (object *closer = old_container->inv) |
2475 | if (object *closer = old_container->inv) |
2620 | if (closer->type == CLOSE_CON) |
2476 | if (closer->type == CLOSE_CON) |
2621 | closer->destroy (); |
2477 | closer->destroy (); |
2622 | #endif |
2478 | #endif |
2623 | |
2479 | |
|
|
2480 | // make sure the container is available |
|
|
2481 | esrv_send_item (this, old_container); |
|
|
2482 | |
2624 | old_container->flag [FLAG_APPLIED] = 0; |
2483 | old_container->flag [FLAG_APPLIED] = false; |
2625 | container = 0; |
2484 | container = 0; |
2626 | |
2485 | |
|
|
2486 | // client needs item update to make it work, client bug requires this to be separate |
2627 | esrv_update_item (UPD_FLAGS, this, old_container); |
2487 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2488 | |
2628 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2489 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2629 | play_sound (sound_find ("chest_close")); |
2490 | play_sound (sound_find ("chest_close")); |
2630 | } |
2491 | } |
2631 | |
2492 | |
2632 | if (new_container) |
2493 | if (new_container) |
… | |
… | |
2645 | } |
2506 | } |
2646 | #endif |
2507 | #endif |
2647 | |
2508 | |
2648 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2509 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2649 | |
2510 | |
|
|
2511 | // make sure the container is available, client bug requires this to be separate |
|
|
2512 | esrv_send_item (this, new_container); |
|
|
2513 | |
2650 | new_container->flag [FLAG_APPLIED] = 1; |
2514 | new_container->flag [FLAG_APPLIED] = true; |
2651 | container = new_container; |
2515 | container = new_container; |
2652 | |
2516 | |
|
|
2517 | // client needs flag change |
2653 | esrv_update_item (UPD_FLAGS, this, new_container); |
2518 | esrv_update_item (UPD_FLAGS, this, new_container); |
2654 | esrv_send_inventory (this, new_container); |
2519 | esrv_send_inventory (this, new_container); |
2655 | play_sound (sound_find ("chest_open")); |
2520 | play_sound (sound_find ("chest_open")); |
2656 | } |
2521 | } |
|
|
2522 | // else if (!old_container->env && contr && contr->ns) |
|
|
2523 | // contr->ns->floorbox_reset (); |
2657 | } |
2524 | } |
2658 | |
2525 | |
2659 | object * |
2526 | object * |
2660 | object::force_find (const shstr name) |
2527 | object::force_find (const shstr name) |
2661 | { |
2528 | { |