… | |
… | |
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"); |
… | |
… | |
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 (false); |
914 | inv->destroy_inv (false); |
… | |
… | |
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); |
… | |
… | |
983 | unlink (); |
979 | unlink (); |
984 | |
980 | |
985 | flag [FLAG_FREED] = 1; |
981 | flag [FLAG_FREED] = 1; |
986 | |
982 | |
987 | // hack to ensure that freed objects still have a valid map |
983 | // hack to ensure that freed objects still have a valid map |
988 | { |
|
|
989 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
990 | |
|
|
991 | if (!freed_map) |
|
|
992 | { |
|
|
993 | freed_map = new maptile; |
|
|
994 | |
|
|
995 | freed_map->path = "<freed objects map>"; |
|
|
996 | freed_map->name = "/internal/freed_objects_map"; |
|
|
997 | freed_map->width = 3; |
|
|
998 | freed_map->height = 3; |
|
|
999 | freed_map->nodrop = 1; |
|
|
1000 | |
|
|
1001 | freed_map->alloc (); |
|
|
1002 | freed_map->in_memory = MAP_ACTIVE; |
|
|
1003 | } |
|
|
1004 | |
|
|
1005 | map = freed_map; |
984 | map = &freed_map; |
1006 | x = 1; |
985 | x = 1; |
1007 | y = 1; |
986 | y = 1; |
1008 | } |
|
|
1009 | |
987 | |
1010 | if (more) |
988 | if (more) |
1011 | { |
989 | { |
1012 | more->destroy (); |
990 | more->destroy (); |
1013 | more = 0; |
991 | more = 0; |
… | |
… | |
1030 | |
1008 | |
1031 | if (!is_head () && !head->destroyed ()) |
1009 | if (!is_head () && !head->destroyed ()) |
1032 | { |
1010 | { |
1033 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1011 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1034 | head->destroy (destroy_inventory); |
1012 | head->destroy (destroy_inventory); |
|
|
1013 | return; |
1035 | } |
1014 | } |
1036 | |
1015 | |
1037 | destroy_inv (!destroy_inventory); |
1016 | destroy_inv (!destroy_inventory); |
1038 | |
1017 | |
1039 | if (is_head ()) |
1018 | if (is_head ()) |
… | |
… | |
1061 | if (flag [FLAG_REMOVED]) |
1040 | if (flag [FLAG_REMOVED]) |
1062 | return; |
1041 | return; |
1063 | |
1042 | |
1064 | INVOKE_OBJECT (REMOVE, this); |
1043 | INVOKE_OBJECT (REMOVE, this); |
1065 | |
1044 | |
1066 | if (object *pl = visible_to ()) |
|
|
1067 | esrv_del_item (pl->contr, count); |
|
|
1068 | |
|
|
1069 | flag [FLAG_REMOVED] = true; |
1045 | flag [FLAG_REMOVED] = true; |
1070 | |
1046 | |
1071 | if (more) |
1047 | if (more) |
1072 | more->remove (); |
1048 | more->remove (); |
1073 | |
1049 | |
… | |
… | |
1075 | * In this case, the object to be removed is in someones |
1051 | * In this case, the object to be removed is in someones |
1076 | * inventory. |
1052 | * inventory. |
1077 | */ |
1053 | */ |
1078 | if (env) |
1054 | if (env) |
1079 | { |
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 | |
1080 | adjust_weight (env, -total_weight ()); |
1061 | adjust_weight (env, -total_weight ()); |
1081 | |
|
|
1082 | *(above ? &above->below : &env->inv) = below; |
|
|
1083 | |
|
|
1084 | if (below) |
|
|
1085 | below->above = above; |
|
|
1086 | |
1062 | |
1087 | /* we set up values so that it could be inserted into |
1063 | /* we set up values so that it could be inserted into |
1088 | * 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 |
1089 | * to the caller to decide what we want to do. |
1065 | * to the caller to decide what we want to do. |
1090 | */ |
1066 | */ |
1091 | map = env->map; |
1067 | map = env->map; |
1092 | x = env->x; |
1068 | x = env->x; |
1093 | 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 | |
1094 | above = 0; |
1075 | above = 0; |
1095 | below = 0; |
1076 | below = 0; |
1096 | env = 0; |
1077 | env = 0; |
1097 | |
1078 | |
1098 | /* 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 |
… | |
… | |
1102 | 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)) |
1103 | otmp->update_stats (); |
1084 | otmp->update_stats (); |
1104 | } |
1085 | } |
1105 | else if (map) |
1086 | else if (map) |
1106 | { |
1087 | { |
1107 | if (type == PLAYER) |
|
|
1108 | { |
|
|
1109 | // leaving a spot always closes any open container on the ground |
|
|
1110 | if (container && !container->env) |
|
|
1111 | // this causes spurious floorbox updates, but it ensures |
|
|
1112 | // that the CLOSE event is being sent. |
|
|
1113 | close_container (); |
|
|
1114 | |
|
|
1115 | --map->players; |
|
|
1116 | map->touch (); |
|
|
1117 | } |
|
|
1118 | |
|
|
1119 | map->dirty = true; |
1088 | map->dirty = true; |
1120 | mapspace &ms = this->ms (); |
1089 | mapspace &ms = this->ms (); |
1121 | |
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 | |
1122 | /* link the object above us */ |
1113 | /* link the object above us */ |
1123 | if (above) |
1114 | // re-link, make sure compiler can easily use cmove |
1124 | above->below = below; |
1115 | *(above ? &above->below : &ms.top) = below; |
1125 | else |
1116 | *(below ? &below->above : &ms.bot) = above; |
1126 | ms.top = below; /* we were top, set new top */ |
|
|
1127 | |
|
|
1128 | /* Relink the object below us, if there is one */ |
|
|
1129 | if (below) |
|
|
1130 | below->above = above; |
|
|
1131 | else |
|
|
1132 | { |
|
|
1133 | /* Nothing below, which means we need to relink map object for this space |
|
|
1134 | * use translated coordinates in case some oddness with map tiling is |
|
|
1135 | * evident |
|
|
1136 | */ |
|
|
1137 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1138 | 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 ()); |
|
|
1139 | |
|
|
1140 | ms.bot = above; /* goes on above it. */ |
|
|
1141 | } |
|
|
1142 | |
1117 | |
1143 | above = 0; |
1118 | above = 0; |
1144 | below = 0; |
1119 | below = 0; |
1145 | |
1120 | |
1146 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1156 | * appropriately. |
1131 | * appropriately. |
1157 | */ |
1132 | */ |
1158 | pl->close_container (); |
1133 | pl->close_container (); |
1159 | |
1134 | |
1160 | //TODO: the floorbox prev/next might need updating |
1135 | //TODO: the floorbox prev/next might need updating |
1161 | esrv_del_item (pl->contr, count); |
1136 | //esrv_del_item (pl->contr, count); |
|
|
1137 | //TODO: update floorbox to preserve ordering |
|
|
1138 | if (pl->contr->ns) |
|
|
1139 | pl->contr->ns->floorbox_update (); |
1162 | } |
1140 | } |
1163 | |
1141 | |
1164 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1142 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1165 | { |
1143 | { |
1166 | /* 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 |
… | |
… | |
1290 | * just 'op' otherwise |
1268 | * just 'op' otherwise |
1291 | */ |
1269 | */ |
1292 | object * |
1270 | object * |
1293 | 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) |
1294 | { |
1272 | { |
1295 | assert (!op->flag [FLAG_FREED]); |
|
|
1296 | |
|
|
1297 | op->remove (); |
1273 | op->remove (); |
1298 | |
1274 | |
1299 | /* Ideally, the caller figures this out. However, it complicates a lot |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1300 | * 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 |
1301 | * need extra work |
1277 | * need extra work |
1302 | */ |
1278 | */ |
1303 | if (!xy_normalise (m, op->x, op->y)) |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1304 | { |
1280 | { |
1305 | op->destroy (1); |
1281 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1306 | return 0; |
1282 | return 0; |
1307 | } |
1283 | } |
1308 | |
1284 | |
1309 | if (object *more = op->more) |
1285 | if (object *more = op->more) |
1310 | if (!insert_ob_in_map (more, m, originator, flag)) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1319 | */ |
1295 | */ |
1320 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1296 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1321 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1297 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1322 | if (object::can_merge (op, tmp)) |
1298 | if (object::can_merge (op, tmp)) |
1323 | { |
1299 | { |
1324 | // TODO: we atcually want to update tmp, not op, |
1300 | // TODO: we actually want to update tmp, not op, |
1325 | // but some caller surely breaks when we return tmp |
1301 | // but some caller surely breaks when we return tmp |
1326 | // from here :/ |
1302 | // from here :/ |
1327 | op->nrof += tmp->nrof; |
1303 | op->nrof += tmp->nrof; |
1328 | tmp->destroy (1); |
1304 | tmp->destroy (1); |
1329 | } |
1305 | } |
… | |
… | |
1334 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1310 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1335 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1311 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1336 | |
1312 | |
1337 | if (flag & INS_BELOW_ORIGINATOR) |
1313 | if (flag & INS_BELOW_ORIGINATOR) |
1338 | { |
1314 | { |
1339 | 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 ()) |
1340 | { |
1316 | { |
1341 | 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"); |
1342 | abort (); |
1318 | abort (); |
1343 | } |
1319 | } |
1344 | |
1320 | |
1345 | op->above = originator; |
1321 | op->above = originator; |
1346 | op->below = originator->below; |
1322 | op->below = originator->below; |
1347 | |
|
|
1348 | if (op->below) |
|
|
1349 | op->below->above = op; |
|
|
1350 | else |
|
|
1351 | ms.bot = op; |
|
|
1352 | |
|
|
1353 | /* since *below* originator, no need to update top */ |
|
|
1354 | originator->below = op; |
1323 | originator->below = op; |
|
|
1324 | |
|
|
1325 | *(op->below ? &op->below->above : &ms.bot) = op; |
1355 | } |
1326 | } |
1356 | else |
1327 | else |
1357 | { |
1328 | { |
1358 | object *top, *floor = NULL; |
1329 | object *floor = 0; |
1359 | |
1330 | object *top = ms.top; |
1360 | top = ms.bot; |
|
|
1361 | |
1331 | |
1362 | /* If there are other objects, then */ |
1332 | /* If there are other objects, then */ |
1363 | if (top) |
1333 | if (top) |
1364 | { |
1334 | { |
1365 | object *last = 0; |
|
|
1366 | |
|
|
1367 | /* |
1335 | /* |
1368 | * 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. |
1369 | * We've already dealt with merging if appropriate. |
1337 | * We've already dealt with merging if appropriate. |
1370 | * 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 |
1371 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1339 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1374 | * 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 |
1375 | * 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 |
1376 | * 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 |
1377 | * that flying non pickable objects are spell objects. |
1345 | * that flying non pickable objects are spell objects. |
1378 | */ |
1346 | */ |
1379 | for (top = ms.bot; top; top = top->above) |
1347 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1380 | { |
1348 | { |
1381 | 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)) |
1382 | floor = top; |
1350 | floor = tmp; |
1383 | |
1351 | |
1384 | 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)) |
1385 | { |
1353 | { |
1386 | /* We insert above top, so we want this object below this */ |
1354 | /* We insert above top, so we want this object below this */ |
1387 | top = top->below; |
1355 | top = tmp->below; |
1388 | break; |
1356 | break; |
1389 | } |
1357 | } |
1390 | |
1358 | |
1391 | last = top; |
1359 | top = tmp; |
1392 | } |
1360 | } |
1393 | |
|
|
1394 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1395 | top = last; |
|
|
1396 | |
1361 | |
1397 | /* We let update_position deal with figuring out what the space |
1362 | /* We let update_position deal with figuring out what the space |
1398 | * looks like instead of lots of conditions here. |
1363 | * looks like instead of lots of conditions here. |
1399 | * makes things faster, and effectively the same result. |
1364 | * makes things faster, and effectively the same result. |
1400 | */ |
1365 | */ |
… | |
… | |
1407 | */ |
1372 | */ |
1408 | if (!(flag & INS_ON_TOP) |
1373 | if (!(flag & INS_ON_TOP) |
1409 | && ms.flags () & P_BLOCKSVIEW |
1374 | && ms.flags () & P_BLOCKSVIEW |
1410 | && (op->face && !faces [op->face].visibility)) |
1375 | && (op->face && !faces [op->face].visibility)) |
1411 | { |
1376 | { |
|
|
1377 | object *last; |
|
|
1378 | |
1412 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1413 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1414 | break; |
1381 | break; |
1415 | |
1382 | |
1416 | /* Check to see if we found the object that blocks view, |
1383 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1427 | top = floor; |
1394 | top = floor; |
1428 | |
1395 | |
1429 | /* Top is the object that our object (op) is going to get inserted above. |
1396 | /* Top is the object that our object (op) is going to get inserted above. |
1430 | */ |
1397 | */ |
1431 | |
1398 | |
1432 | /* First object on this space */ |
1399 | /* no top found, insert on top */ |
1433 | if (!top) |
1400 | if (!top) |
1434 | { |
1401 | { |
1435 | op->above = ms.bot; |
|
|
1436 | |
|
|
1437 | if (op->above) |
|
|
1438 | op->above->below = op; |
|
|
1439 | |
|
|
1440 | op->below = 0; |
1402 | op->above = 0; |
|
|
1403 | op->below = ms.top; |
1441 | ms.bot = op; |
1404 | ms.top = op; |
|
|
1405 | |
|
|
1406 | *(op->below ? &op->below->above : &ms.bot) = op; |
1442 | } |
1407 | } |
1443 | else |
1408 | else |
1444 | { /* get inserted into the stack above top */ |
1409 | { /* get inserted into the stack above top */ |
1445 | op->above = top->above; |
1410 | op->above = top->above; |
1446 | |
|
|
1447 | if (op->above) |
|
|
1448 | op->above->below = op; |
1411 | top->above = op; |
1449 | |
1412 | |
1450 | op->below = top; |
1413 | op->below = top; |
1451 | top->above = op; |
1414 | *(op->above ? &op->above->below : &ms.top) = op; |
1452 | } |
1415 | } |
1453 | |
|
|
1454 | if (!op->above) |
|
|
1455 | ms.top = op; |
|
|
1456 | } /* else not INS_BELOW_ORIGINATOR */ |
1416 | } /* else not INS_BELOW_ORIGINATOR */ |
1457 | |
1417 | |
1458 | if (op->type == PLAYER) |
1418 | if (op->type == PLAYER) |
1459 | { |
1419 | { |
1460 | op->contr->do_los = 1; |
1420 | op->contr->do_los = 1; |
… | |
… | |
1464 | |
1424 | |
1465 | op->map->dirty = true; |
1425 | op->map->dirty = true; |
1466 | |
1426 | |
1467 | if (object *pl = ms.player ()) |
1427 | if (object *pl = ms.player ()) |
1468 | //TODO: the floorbox prev/next might need updating |
1428 | //TODO: the floorbox prev/next might need updating |
1469 | esrv_send_item (pl, op); |
1429 | //esrv_send_item (pl, op); |
|
|
1430 | //TODO: update floorbox to preserve ordering |
|
|
1431 | if (pl->contr->ns) |
|
|
1432 | pl->contr->ns->floorbox_update (); |
1470 | |
1433 | |
1471 | /* If this object glows, it may affect lighting conditions that are |
1434 | /* If this object glows, it may affect lighting conditions that are |
1472 | * visible to others on this map. But update_all_los is really |
1435 | * visible to others on this map. But update_all_los is really |
1473 | * an inefficient way to do this, as it means los for all players |
1436 | * an inefficient way to do this, as it means los for all players |
1474 | * on the map will get recalculated. The players could very well |
1437 | * on the map will get recalculated. The players could very well |
… | |
… | |
1594 | } |
1557 | } |
1595 | else |
1558 | else |
1596 | { |
1559 | { |
1597 | decrease (nr); |
1560 | decrease (nr); |
1598 | |
1561 | |
1599 | object *op = object_create_clone (this); |
1562 | object *op = deep_clone (); |
1600 | op->nrof = nr; |
1563 | op->nrof = nr; |
1601 | return op; |
1564 | return op; |
1602 | } |
1565 | } |
1603 | } |
1566 | } |
1604 | |
1567 | |
… | |
… | |
1825 | LOG (llevError, "Present_arch called outside map.\n"); |
1788 | LOG (llevError, "Present_arch called outside map.\n"); |
1826 | return NULL; |
1789 | return NULL; |
1827 | } |
1790 | } |
1828 | |
1791 | |
1829 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1792 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1830 | if (tmp->arch == at) |
1793 | if (tmp->arch->archname == at->archname) |
1831 | return tmp; |
1794 | return tmp; |
1832 | |
1795 | |
1833 | return NULL; |
1796 | return NULL; |
1834 | } |
1797 | } |
1835 | |
1798 | |
… | |
… | |
1899 | * The first matching object is returned, or NULL if none. |
1862 | * The first matching object is returned, or NULL if none. |
1900 | */ |
1863 | */ |
1901 | object * |
1864 | object * |
1902 | present_arch_in_ob (const archetype *at, const object *op) |
1865 | present_arch_in_ob (const archetype *at, const object *op) |
1903 | { |
1866 | { |
1904 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1867 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1905 | if (tmp->arch == at) |
1868 | if (tmp->arch->archname == at->archname) |
1906 | return tmp; |
1869 | return tmp; |
1907 | |
1870 | |
1908 | return NULL; |
1871 | return NULL; |
1909 | } |
1872 | } |
1910 | |
1873 | |
… | |
… | |
2319 | |
2282 | |
2320 | /* |
2283 | /* |
2321 | * create clone from object to another |
2284 | * create clone from object to another |
2322 | */ |
2285 | */ |
2323 | object * |
2286 | object * |
2324 | object_create_clone (object *asrc) |
2287 | object::deep_clone () |
2325 | { |
2288 | { |
2326 | object *dst = 0, *tmp, *src, *prev, *item; |
2289 | assert (("deep_clone called on non-head object", is_head ())); |
2327 | |
2290 | |
2328 | if (!asrc) |
2291 | object *dst = clone (); |
2329 | return 0; |
|
|
2330 | |
2292 | |
2331 | src = asrc->head_ (); |
2293 | object *prev = dst; |
2332 | |
|
|
2333 | prev = 0; |
|
|
2334 | for (object *part = src; part; part = part->more) |
2294 | for (object *part = this->more; part; part = part->more) |
2335 | { |
2295 | { |
2336 | tmp = part->clone (); |
2296 | object *tmp = part->clone (); |
2337 | tmp->x -= src->x; |
|
|
2338 | tmp->y -= src->y; |
|
|
2339 | |
|
|
2340 | if (!part->head) |
|
|
2341 | { |
|
|
2342 | dst = tmp; |
|
|
2343 | tmp->head = 0; |
|
|
2344 | } |
|
|
2345 | else |
|
|
2346 | tmp->head = dst; |
2297 | tmp->head = dst; |
2347 | |
|
|
2348 | tmp->more = 0; |
|
|
2349 | |
|
|
2350 | if (prev) |
|
|
2351 | prev->more = tmp; |
2298 | prev->more = tmp; |
2352 | |
|
|
2353 | prev = tmp; |
2299 | prev = tmp; |
2354 | } |
2300 | } |
2355 | |
2301 | |
2356 | for (item = src->inv; item; item = item->below) |
2302 | for (object *item = inv; item; item = item->below) |
2357 | insert_ob_in_ob (object_create_clone (item), dst); |
2303 | insert_ob_in_ob (item->deep_clone (), dst); |
2358 | |
2304 | |
2359 | return dst; |
2305 | return dst; |
2360 | } |
2306 | } |
2361 | |
2307 | |
2362 | /* This returns the first object in who's inventory that |
2308 | /* This returns the first object in who's inventory that |
… | |
… | |
2371 | return tmp; |
2317 | return tmp; |
2372 | |
2318 | |
2373 | return 0; |
2319 | return 0; |
2374 | } |
2320 | } |
2375 | |
2321 | |
2376 | /* If ob has a field named key, return the link from the list, |
2322 | const shstr & |
2377 | * otherwise return NULL. |
2323 | object::kv_get (const shstr &key) const |
2378 | * |
|
|
2379 | * key must be a passed in shared string - otherwise, this won't |
|
|
2380 | * do the desired thing. |
|
|
2381 | */ |
|
|
2382 | key_value * |
|
|
2383 | get_ob_key_link (const object *ob, const char *key) |
|
|
2384 | { |
2324 | { |
2385 | for (key_value *link = ob->key_values; link; link = link->next) |
2325 | for (key_value *kv = key_values; kv; kv = kv->next) |
2386 | if (link->key == key) |
2326 | if (kv->key == key) |
2387 | return link; |
|
|
2388 | |
|
|
2389 | return 0; |
|
|
2390 | } |
|
|
2391 | |
|
|
2392 | /* |
|
|
2393 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2394 | * |
|
|
2395 | * The argument doesn't need to be a shared string. |
|
|
2396 | * |
|
|
2397 | * The returned string is shared. |
|
|
2398 | */ |
|
|
2399 | const char * |
|
|
2400 | get_ob_key_value (const object *op, const char *const key) |
|
|
2401 | { |
|
|
2402 | key_value *link; |
|
|
2403 | shstr_cmp canonical_key (key); |
|
|
2404 | |
|
|
2405 | if (!canonical_key) |
|
|
2406 | { |
|
|
2407 | /* 1. There being a field named key on any object |
|
|
2408 | * implies there'd be a shared string to find. |
|
|
2409 | * 2. Since there isn't, no object has this field. |
|
|
2410 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2411 | */ |
|
|
2412 | return 0; |
|
|
2413 | } |
|
|
2414 | |
|
|
2415 | /* This is copied from get_ob_key_link() above - |
|
|
2416 | * only 4 lines, and saves the function call overhead. |
|
|
2417 | */ |
|
|
2418 | for (link = op->key_values; link; link = link->next) |
|
|
2419 | if (link->key == canonical_key) |
|
|
2420 | return link->value; |
2327 | return kv->value; |
2421 | |
2328 | |
2422 | return 0; |
2329 | return shstr_null; |
2423 | } |
2330 | } |
2424 | |
2331 | |
2425 | /* |
2332 | void |
2426 | * Updates the canonical_key in op to value. |
2333 | object::kv_set (const shstr &key, const shstr &value) |
2427 | * |
|
|
2428 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2429 | * |
|
|
2430 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2431 | * keys. |
|
|
2432 | * |
|
|
2433 | * Returns TRUE on success. |
|
|
2434 | */ |
|
|
2435 | int |
|
|
2436 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2437 | { |
2334 | { |
2438 | key_value *field = NULL, *last = NULL; |
2335 | for (key_value *kv = key_values; kv; kv = kv->next) |
2439 | |
2336 | if (kv->key == key) |
2440 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2441 | { |
|
|
2442 | if (field->key != canonical_key) |
|
|
2443 | { |
2337 | { |
2444 | last = field; |
2338 | kv->value = value; |
2445 | continue; |
2339 | return; |
2446 | } |
2340 | } |
2447 | |
2341 | |
2448 | if (value) |
2342 | key_value *kv = new key_value; |
2449 | field->value = value; |
2343 | |
2450 | else |
2344 | kv->next = key_values; |
|
|
2345 | kv->key = key; |
|
|
2346 | kv->value = value; |
|
|
2347 | |
|
|
2348 | key_values = kv; |
|
|
2349 | } |
|
|
2350 | |
|
|
2351 | void |
|
|
2352 | object::kv_del (const shstr &key) |
|
|
2353 | { |
|
|
2354 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2355 | if ((*kvp)->key == key) |
2451 | { |
2356 | { |
2452 | /* Basically, if the archetype has this key set, |
2357 | key_value *kv = *kvp; |
2453 | * we need to store the null value so when we save |
2358 | *kvp = (*kvp)->next; |
2454 | * it, we save the empty value so that when we load, |
2359 | delete kv; |
2455 | * we get this value back again. |
2360 | return; |
2456 | */ |
|
|
2457 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2458 | field->value = 0; |
|
|
2459 | else |
|
|
2460 | { |
|
|
2461 | if (last) |
|
|
2462 | last->next = field->next; |
|
|
2463 | else |
|
|
2464 | op->key_values = field->next; |
|
|
2465 | |
|
|
2466 | delete field; |
|
|
2467 | } |
|
|
2468 | } |
2361 | } |
2469 | return TRUE; |
|
|
2470 | } |
|
|
2471 | /* IF we get here, key doesn't exist */ |
|
|
2472 | |
|
|
2473 | /* No field, we'll have to add it. */ |
|
|
2474 | |
|
|
2475 | if (!add_key) |
|
|
2476 | return FALSE; |
|
|
2477 | |
|
|
2478 | /* There isn't any good reason to store a null |
|
|
2479 | * value in the key/value list. If the archetype has |
|
|
2480 | * this key, then we should also have it, so shouldn't |
|
|
2481 | * be here. If user wants to store empty strings, |
|
|
2482 | * should pass in "" |
|
|
2483 | */ |
|
|
2484 | if (value == NULL) |
|
|
2485 | return TRUE; |
|
|
2486 | |
|
|
2487 | field = new key_value; |
|
|
2488 | |
|
|
2489 | field->key = canonical_key; |
|
|
2490 | field->value = value; |
|
|
2491 | /* Usual prepend-addition. */ |
|
|
2492 | field->next = op->key_values; |
|
|
2493 | op->key_values = field; |
|
|
2494 | |
|
|
2495 | return TRUE; |
|
|
2496 | } |
|
|
2497 | |
|
|
2498 | /* |
|
|
2499 | * Updates the key in op to value. |
|
|
2500 | * |
|
|
2501 | * If add_key is FALSE, this will only update existing keys, |
|
|
2502 | * and not add new ones. |
|
|
2503 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2504 | * |
|
|
2505 | * Returns TRUE on success. |
|
|
2506 | */ |
|
|
2507 | int |
|
|
2508 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2509 | { |
|
|
2510 | shstr key_ (key); |
|
|
2511 | |
|
|
2512 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2513 | } |
2362 | } |
2514 | |
2363 | |
2515 | object::depth_iterator::depth_iterator (object *container) |
2364 | object::depth_iterator::depth_iterator (object *container) |
2516 | : iterator_base (container) |
2365 | : iterator_base (container) |
2517 | { |
2366 | { |
… | |
… | |
2615 | object::open_container (object *new_container) |
2464 | object::open_container (object *new_container) |
2616 | { |
2465 | { |
2617 | if (container == new_container) |
2466 | if (container == new_container) |
2618 | return; |
2467 | return; |
2619 | |
2468 | |
2620 | if (object *old_container = container) |
2469 | object *old_container = container; |
|
|
2470 | |
|
|
2471 | if (old_container) |
2621 | { |
2472 | { |
2622 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2473 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2623 | return; |
2474 | return; |
2624 | |
2475 | |
2625 | #if 0 |
2476 | #if 0 |
… | |
… | |
2627 | if (object *closer = old_container->inv) |
2478 | if (object *closer = old_container->inv) |
2628 | if (closer->type == CLOSE_CON) |
2479 | if (closer->type == CLOSE_CON) |
2629 | closer->destroy (); |
2480 | closer->destroy (); |
2630 | #endif |
2481 | #endif |
2631 | |
2482 | |
|
|
2483 | // make sure the container is available |
|
|
2484 | esrv_send_item (this, old_container); |
|
|
2485 | |
2632 | old_container->flag [FLAG_APPLIED] = false; |
2486 | old_container->flag [FLAG_APPLIED] = false; |
2633 | container = 0; |
2487 | container = 0; |
2634 | |
2488 | |
|
|
2489 | // client needs item update to make it work, client bug requires this to be separate |
2635 | esrv_update_item (UPD_FLAGS, this, old_container); |
2490 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2491 | |
2636 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2492 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2637 | play_sound (sound_find ("chest_close")); |
2493 | play_sound (sound_find ("chest_close")); |
2638 | } |
2494 | } |
2639 | |
2495 | |
2640 | if (new_container) |
2496 | if (new_container) |
… | |
… | |
2653 | } |
2509 | } |
2654 | #endif |
2510 | #endif |
2655 | |
2511 | |
2656 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2512 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2657 | |
2513 | |
|
|
2514 | // make sure the container is available, client bug requires this to be separate |
|
|
2515 | esrv_send_item (this, new_container); |
|
|
2516 | |
2658 | new_container->flag [FLAG_APPLIED] = true; |
2517 | new_container->flag [FLAG_APPLIED] = true; |
2659 | container = new_container; |
2518 | container = new_container; |
2660 | |
2519 | |
|
|
2520 | // client needs flag change |
2661 | esrv_update_item (UPD_FLAGS, this, new_container); |
2521 | esrv_update_item (UPD_FLAGS, this, new_container); |
2662 | esrv_send_inventory (this, new_container); |
2522 | esrv_send_inventory (this, new_container); |
2663 | play_sound (sound_find ("chest_open")); |
2523 | play_sound (sound_find ("chest_open")); |
2664 | } |
2524 | } |
|
|
2525 | // else if (!old_container->env && contr && contr->ns) |
|
|
2526 | // contr->ns->floorbox_reset (); |
2665 | } |
2527 | } |
2666 | |
2528 | |
2667 | object * |
2529 | object * |
2668 | object::force_find (const shstr name) |
2530 | object::force_find (const shstr name) |
2669 | { |
2531 | { |