… | |
… | |
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 | * |
… | |
… | |
330 | |
316 | |
331 | /* Everything passes, must be OK. */ |
317 | /* Everything passes, must be OK. */ |
332 | return 1; |
318 | return 1; |
333 | } |
319 | } |
334 | |
320 | |
|
|
321 | // find player who can see this object |
|
|
322 | object * |
|
|
323 | object::visible_to () const |
|
|
324 | { |
|
|
325 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
326 | { |
|
|
327 | // see if we are in a container of sorts |
|
|
328 | if (env) |
|
|
329 | { |
|
|
330 | // the player inventory itself is always visible |
|
|
331 | if (env->type == PLAYER) |
|
|
332 | return env; |
|
|
333 | |
|
|
334 | // else a player could have our env open |
|
|
335 | object *envest = env->outer_env (); |
|
|
336 | |
|
|
337 | // the player itself is always on a map, so we will find him here |
|
|
338 | // even if our inv is in a player. |
|
|
339 | if (envest->is_on_map ()) |
|
|
340 | if (object *pl = envest->ms ().player ()) |
|
|
341 | if (pl->container == env) |
|
|
342 | return pl; |
|
|
343 | } |
|
|
344 | else |
|
|
345 | { |
|
|
346 | // maybe there is a player standing on the same mapspace |
|
|
347 | // this will catch the case where "this" is a player |
|
|
348 | if (object *pl = ms ().player ()) |
|
|
349 | if (!pl->container || this == pl->container) |
|
|
350 | return pl; |
|
|
351 | } |
|
|
352 | } |
|
|
353 | |
|
|
354 | return 0; |
|
|
355 | } |
|
|
356 | |
335 | // adjust weight per container type ("of holding") |
357 | // adjust weight per container type ("of holding") |
336 | static sint32 |
358 | static sint32 |
337 | weight_adjust (object *op, sint32 weight) |
359 | weight_adjust (object *op, sint32 weight) |
338 | { |
360 | { |
339 | return op->type == CONTAINER |
361 | return op->type == CONTAINER |
… | |
… | |
356 | return; |
378 | return; |
357 | |
379 | |
358 | op->carrying += weight; |
380 | op->carrying += weight; |
359 | |
381 | |
360 | if (object *pl = op->visible_to ()) |
382 | if (object *pl = op->visible_to ()) |
|
|
383 | if (pl != op) // player is handled lazily |
361 | esrv_update_item (UPD_WEIGHT, pl, op); |
384 | esrv_update_item (UPD_WEIGHT, pl, op); |
362 | |
385 | |
363 | op = op->env; |
386 | op = op->env; |
364 | } |
387 | } |
365 | } |
388 | } |
366 | |
389 | |
… | |
… | |
387 | if (sum != carrying) |
410 | if (sum != carrying) |
388 | { |
411 | { |
389 | carrying = sum; |
412 | carrying = sum; |
390 | |
413 | |
391 | if (object *pl = visible_to ()) |
414 | if (object *pl = visible_to ()) |
|
|
415 | if (pl != this) // player is handled lazily |
392 | esrv_update_item (UPD_WEIGHT, pl, this); |
416 | esrv_update_item (UPD_WEIGHT, pl, this); |
393 | } |
417 | } |
394 | } |
418 | } |
395 | |
419 | |
396 | /* |
420 | /* |
397 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
421 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
… | |
… | |
565 | } |
589 | } |
566 | |
590 | |
567 | op->key_values = 0; |
591 | op->key_values = 0; |
568 | } |
592 | } |
569 | |
593 | |
570 | object & |
594 | /* |
571 | object::operator =(const object &src) |
595 | * copy_to first frees everything allocated by the dst object, |
|
|
596 | * and then copies the contents of itself into the second |
|
|
597 | * object, allocating what needs to be allocated. Basically, any |
|
|
598 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
599 | * if the first object is freed, the pointers in the new object |
|
|
600 | * will point at garbage. |
|
|
601 | */ |
|
|
602 | void |
|
|
603 | object::copy_to (object *dst) |
572 | { |
604 | { |
573 | bool is_freed = flag [FLAG_FREED]; |
605 | dst->remove (); |
574 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
575 | |
|
|
576 | *(object_copy *)this = src; |
606 | *(object_copy *)dst = *this; |
577 | |
|
|
578 | flag [FLAG_FREED] = is_freed; |
|
|
579 | flag [FLAG_REMOVED] = is_removed; |
607 | dst->flag [FLAG_REMOVED] = true; |
580 | |
608 | |
581 | /* Copy over key_values, if any. */ |
609 | /* Copy over key_values, if any. */ |
582 | if (src.key_values) |
610 | if (key_values) |
583 | { |
611 | { |
584 | key_value *tail = 0; |
612 | key_value *tail = 0; |
585 | key_values = 0; |
613 | dst->key_values = 0; |
586 | |
614 | |
587 | for (key_value *i = src.key_values; i; i = i->next) |
615 | for (key_value *i = key_values; i; i = i->next) |
588 | { |
616 | { |
589 | key_value *new_link = new key_value; |
617 | key_value *new_link = new key_value; |
590 | |
618 | |
591 | new_link->next = 0; |
619 | new_link->next = 0; |
592 | new_link->key = i->key; |
620 | new_link->key = i->key; |
593 | new_link->value = i->value; |
621 | new_link->value = i->value; |
594 | |
622 | |
595 | /* Try and be clever here, too. */ |
623 | /* Try and be clever here, too. */ |
596 | if (!key_values) |
624 | if (!dst->key_values) |
597 | { |
625 | { |
598 | key_values = new_link; |
626 | dst->key_values = new_link; |
599 | tail = new_link; |
627 | tail = new_link; |
600 | } |
628 | } |
601 | else |
629 | else |
602 | { |
630 | { |
603 | tail->next = new_link; |
631 | tail->next = new_link; |
604 | tail = new_link; |
632 | tail = new_link; |
605 | } |
633 | } |
606 | } |
634 | } |
607 | } |
635 | } |
608 | } |
|
|
609 | |
|
|
610 | /* |
|
|
611 | * copy_to first frees everything allocated by the dst object, |
|
|
612 | * and then copies the contents of itself into the second |
|
|
613 | * object, allocating what needs to be allocated. Basically, any |
|
|
614 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
615 | * if the first object is freed, the pointers in the new object |
|
|
616 | * will point at garbage. |
|
|
617 | */ |
|
|
618 | void |
|
|
619 | object::copy_to (object *dst) |
|
|
620 | { |
|
|
621 | *dst = *this; |
|
|
622 | |
636 | |
623 | if (speed < 0) |
637 | if (speed < 0) |
624 | dst->speed_left -= rndm (); |
638 | dst->speed_left -= rndm (); |
625 | |
639 | |
626 | dst->set_speed (dst->speed); |
640 | dst->set_speed (dst->speed); |
… | |
… | |
648 | object * |
662 | object * |
649 | object::clone () |
663 | object::clone () |
650 | { |
664 | { |
651 | object *neu = create (); |
665 | object *neu = create (); |
652 | copy_to (neu); |
666 | copy_to (neu); |
|
|
667 | neu->map = map; // not copied by copy_to |
653 | return neu; |
668 | return neu; |
654 | } |
669 | } |
655 | |
670 | |
656 | /* |
671 | /* |
657 | * If an object with the IS_TURNABLE() flag needs to be turned due |
672 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
708 | * UP_OBJ_FACE: only the objects face has changed. |
723 | * UP_OBJ_FACE: only the objects face has changed. |
709 | */ |
724 | */ |
710 | void |
725 | void |
711 | update_object (object *op, int action) |
726 | update_object (object *op, int action) |
712 | { |
727 | { |
713 | if (op == NULL) |
728 | if (!op) |
714 | { |
729 | { |
715 | /* this should never happen */ |
730 | /* this should never happen */ |
716 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
731 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
717 | return; |
732 | return; |
718 | } |
733 | } |
719 | |
734 | |
720 | if (op->env) |
735 | if (!op->is_on_map ()) |
721 | { |
736 | { |
722 | /* Animation is currently handled by client, so nothing |
737 | /* Animation is currently handled by client, so nothing |
723 | * to do in this case. |
738 | * to do in this case. |
724 | */ |
739 | */ |
725 | return; |
740 | return; |
726 | } |
741 | } |
727 | |
|
|
728 | /* If the map is saving, don't do anything as everything is |
|
|
729 | * going to get freed anyways. |
|
|
730 | */ |
|
|
731 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
732 | return; |
|
|
733 | |
742 | |
734 | /* make sure the object is within map boundaries */ |
743 | /* make sure the object is within map boundaries */ |
735 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
744 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
736 | { |
745 | { |
737 | LOG (llevError, "update_object() called for object out of map!\n"); |
746 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
880 | object::destroy_inv (bool drop_to_ground) |
889 | object::destroy_inv (bool drop_to_ground) |
881 | { |
890 | { |
882 | // need to check first, because the checks below might segfault |
891 | // need to check first, because the checks below might segfault |
883 | // as we might be on an invalid mapspace and crossfire code |
892 | // as we might be on an invalid mapspace and crossfire code |
884 | // is too buggy to ensure that the inventory is empty. |
893 | // is too buggy to ensure that the inventory is empty. |
885 | // corollary: if you create arrows etc. with stuff in tis inventory, |
894 | // corollary: if you create arrows etc. with stuff in its inventory, |
886 | // cf will crash below with off-map x and y |
895 | // cf will crash below with off-map x and y |
887 | if (!inv) |
896 | if (!inv) |
888 | return; |
897 | return; |
889 | |
898 | |
890 | /* Only if the space blocks everything do we not process - |
899 | /* Only if the space blocks everything do we not process - |
… | |
… | |
897 | || map->nodrop |
906 | || map->nodrop |
898 | || ms ().move_block == MOVE_ALL) |
907 | || ms ().move_block == MOVE_ALL) |
899 | { |
908 | { |
900 | while (inv) |
909 | while (inv) |
901 | { |
910 | { |
902 | inv->destroy_inv (drop_to_ground); |
911 | inv->destroy_inv (false); |
903 | inv->destroy (); |
912 | inv->destroy (); |
904 | } |
913 | } |
905 | } |
914 | } |
906 | else |
915 | else |
907 | { /* Put objects in inventory onto this space */ |
916 | { /* Put objects in inventory onto this space */ |
… | |
… | |
913 | || op->flag [FLAG_NO_DROP] |
922 | || op->flag [FLAG_NO_DROP] |
914 | || op->type == RUNE |
923 | || op->type == RUNE |
915 | || op->type == TRAP |
924 | || op->type == TRAP |
916 | || op->flag [FLAG_IS_A_TEMPLATE] |
925 | || op->flag [FLAG_IS_A_TEMPLATE] |
917 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
926 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
918 | op->destroy (); |
927 | op->destroy (true); |
919 | else |
928 | else |
920 | map->insert (op, x, y); |
929 | map->insert (op, x, y); |
921 | } |
930 | } |
922 | } |
931 | } |
923 | } |
932 | } |
… | |
… | |
927 | object *op = new object; |
936 | object *op = new object; |
928 | op->link (); |
937 | op->link (); |
929 | return op; |
938 | return op; |
930 | } |
939 | } |
931 | |
940 | |
|
|
941 | static struct freed_map : maptile |
|
|
942 | { |
|
|
943 | freed_map () |
|
|
944 | { |
|
|
945 | path = "<freed objects map>"; |
|
|
946 | name = "/internal/freed_objects_map"; |
|
|
947 | width = 3; |
|
|
948 | height = 3; |
|
|
949 | nodrop = 1; |
|
|
950 | |
|
|
951 | alloc (); |
|
|
952 | in_memory = MAP_ACTIVE; |
|
|
953 | } |
|
|
954 | |
|
|
955 | ~freed_map () |
|
|
956 | { |
|
|
957 | destroy (); |
|
|
958 | } |
|
|
959 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
960 | |
932 | void |
961 | void |
933 | object::do_destroy () |
962 | object::do_destroy () |
934 | { |
963 | { |
935 | if (object *pl = visible_to ()) |
|
|
936 | esrv_del_item (pl->contr, count); |
|
|
937 | |
|
|
938 | attachable::do_destroy (); |
|
|
939 | |
|
|
940 | if (flag [FLAG_IS_LINKED]) |
964 | if (flag [FLAG_IS_LINKED]) |
941 | remove_button_link (this); |
965 | remove_button_link (this); |
942 | |
966 | |
943 | if (flag [FLAG_FRIENDLY]) |
967 | if (flag [FLAG_FRIENDLY]) |
944 | remove_friendly_object (this); |
968 | remove_friendly_object (this); |
945 | |
969 | |
946 | if (!flag [FLAG_REMOVED]) |
|
|
947 | remove (); |
970 | remove (); |
948 | |
971 | |
949 | destroy_inv (true); |
972 | attachable::do_destroy (); |
950 | |
973 | |
951 | deactivate (); |
974 | deactivate (); |
952 | unlink (); |
975 | unlink (); |
953 | |
976 | |
954 | flag [FLAG_FREED] = 1; |
977 | flag [FLAG_FREED] = 1; |
955 | |
978 | |
956 | // hack to ensure that freed objects still have a valid map |
979 | // hack to ensure that freed objects still have a valid map |
957 | { |
|
|
958 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
959 | |
|
|
960 | if (!freed_map) |
|
|
961 | { |
|
|
962 | freed_map = new maptile; |
|
|
963 | |
|
|
964 | freed_map->path = "<freed objects map>"; |
|
|
965 | freed_map->name = "/internal/freed_objects_map"; |
|
|
966 | freed_map->width = 3; |
|
|
967 | freed_map->height = 3; |
|
|
968 | freed_map->nodrop = 1; |
|
|
969 | |
|
|
970 | freed_map->alloc (); |
|
|
971 | freed_map->in_memory = MAP_ACTIVE; |
|
|
972 | } |
|
|
973 | |
|
|
974 | map = freed_map; |
980 | map = &freed_map; |
975 | x = 1; |
981 | x = 1; |
976 | y = 1; |
982 | y = 1; |
977 | } |
|
|
978 | |
983 | |
979 | if (more) |
984 | if (more) |
980 | { |
985 | { |
981 | more->destroy (); |
986 | more->destroy (); |
982 | more = 0; |
987 | more = 0; |
… | |
… | |
995 | object::destroy (bool destroy_inventory) |
1000 | object::destroy (bool destroy_inventory) |
996 | { |
1001 | { |
997 | if (destroyed ()) |
1002 | if (destroyed ()) |
998 | return; |
1003 | return; |
999 | |
1004 | |
|
|
1005 | if (!is_head () && !head->destroyed ()) |
|
|
1006 | { |
|
|
1007 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1008 | head->destroy (destroy_inventory); |
|
|
1009 | return; |
|
|
1010 | } |
|
|
1011 | |
1000 | if (destroy_inventory) |
1012 | destroy_inv (!destroy_inventory); |
1001 | destroy_inv (false); |
|
|
1002 | |
1013 | |
1003 | if (is_head ()) |
1014 | if (is_head ()) |
1004 | if (sound_destroy) |
1015 | if (sound_destroy) |
1005 | play_sound (sound_destroy); |
1016 | play_sound (sound_destroy); |
1006 | else if (flag [FLAG_MONSTER]) |
1017 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1020 | object::do_remove () |
1031 | object::do_remove () |
1021 | { |
1032 | { |
1022 | object *tmp, *last = 0; |
1033 | object *tmp, *last = 0; |
1023 | object *otmp; |
1034 | object *otmp; |
1024 | |
1035 | |
1025 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1036 | if (flag [FLAG_REMOVED]) |
1026 | return; |
1037 | return; |
1027 | |
1038 | |
1028 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1029 | INVOKE_OBJECT (REMOVE, this); |
1039 | INVOKE_OBJECT (REMOVE, this); |
|
|
1040 | |
|
|
1041 | flag [FLAG_REMOVED] = true; |
1030 | |
1042 | |
1031 | if (more) |
1043 | if (more) |
1032 | more->remove (); |
1044 | more->remove (); |
1033 | |
1045 | |
1034 | /* |
1046 | /* |
1035 | * In this case, the object to be removed is in someones |
1047 | * In this case, the object to be removed is in someones |
1036 | * inventory. |
1048 | * inventory. |
1037 | */ |
1049 | */ |
1038 | if (env) |
1050 | if (env) |
1039 | { |
1051 | { |
|
|
1052 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1053 | if (object *pl = visible_to ()) |
|
|
1054 | esrv_del_item (pl->contr, count); |
|
|
1055 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1056 | |
1040 | adjust_weight (env, -total_weight ()); |
1057 | adjust_weight (env, -total_weight ()); |
1041 | |
1058 | |
1042 | *(above ? &above->below : &env->inv) = below; |
1059 | *(above ? &above->below : &env->inv) = below; |
1043 | |
1060 | |
1044 | if (below) |
1061 | if (below) |
… | |
… | |
1062 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1079 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1063 | otmp->update_stats (); |
1080 | otmp->update_stats (); |
1064 | } |
1081 | } |
1065 | else if (map) |
1082 | else if (map) |
1066 | { |
1083 | { |
1067 | if (type == PLAYER) |
|
|
1068 | { |
|
|
1069 | // leaving a spot always closes any open container on the ground |
|
|
1070 | if (container && !container->env) |
|
|
1071 | // this causes spurious floorbox updates, but it ensures |
|
|
1072 | // that the CLOSE event is being sent. |
|
|
1073 | close_container (); |
|
|
1074 | |
|
|
1075 | --map->players; |
|
|
1076 | map->touch (); |
|
|
1077 | } |
|
|
1078 | |
|
|
1079 | map->dirty = true; |
1084 | map->dirty = true; |
1080 | mapspace &ms = this->ms (); |
1085 | mapspace &ms = this->ms (); |
|
|
1086 | |
|
|
1087 | if (object *pl = ms.player ()) |
|
|
1088 | { |
|
|
1089 | if (type == PLAYER) // this == pl(!) |
|
|
1090 | { |
|
|
1091 | // leaving a spot always closes any open container on the ground |
|
|
1092 | if (container && !container->env) |
|
|
1093 | // this causes spurious floorbox updates, but it ensures |
|
|
1094 | // that the CLOSE event is being sent. |
|
|
1095 | close_container (); |
|
|
1096 | |
|
|
1097 | --map->players; |
|
|
1098 | map->touch (); |
|
|
1099 | } |
|
|
1100 | else if (pl->container == this) |
|
|
1101 | { |
|
|
1102 | // removing a container should close it |
|
|
1103 | close_container (); |
|
|
1104 | } |
|
|
1105 | |
|
|
1106 | esrv_del_item (pl->contr, count); |
|
|
1107 | } |
1081 | |
1108 | |
1082 | /* link the object above us */ |
1109 | /* link the object above us */ |
1083 | if (above) |
1110 | if (above) |
1084 | above->below = below; |
1111 | above->below = below; |
1085 | else |
1112 | else |
… | |
… | |
1115 | * removed (most likely destroyed), update the player view |
1142 | * removed (most likely destroyed), update the player view |
1116 | * appropriately. |
1143 | * appropriately. |
1117 | */ |
1144 | */ |
1118 | pl->close_container (); |
1145 | pl->close_container (); |
1119 | |
1146 | |
|
|
1147 | //TODO: the floorbox prev/next might need updating |
|
|
1148 | //esrv_del_item (pl->contr, count); |
|
|
1149 | //TODO: update floorbox to preserve ordering |
|
|
1150 | if (pl->contr->ns) |
1120 | pl->contr->ns->floorbox_update (); |
1151 | pl->contr->ns->floorbox_update (); |
1121 | } |
1152 | } |
1122 | |
1153 | |
1123 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1154 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1124 | { |
1155 | { |
1125 | /* No point updating the players look faces if he is the object |
1156 | /* No point updating the players look faces if he is the object |
… | |
… | |
1169 | if (!top) |
1200 | if (!top) |
1170 | for (top = op; top && top->above; top = top->above) |
1201 | for (top = op; top && top->above; top = top->above) |
1171 | ; |
1202 | ; |
1172 | |
1203 | |
1173 | for (; top; top = top->below) |
1204 | for (; top; top = top->below) |
1174 | { |
|
|
1175 | if (top == op) |
|
|
1176 | continue; |
|
|
1177 | |
|
|
1178 | if (object::can_merge (op, top)) |
1205 | if (object::can_merge (op, top)) |
1179 | { |
1206 | { |
1180 | top->nrof += op->nrof; |
1207 | top->nrof += op->nrof; |
1181 | |
1208 | |
1182 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1209 | if (object *pl = top->visible_to ()) |
1183 | op->weight = 0; /* Don't want any adjustements now */ |
1210 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1211 | |
|
|
1212 | op->weight = 0; // cancel the addition above |
|
|
1213 | op->carrying = 0; // must be 0 already |
|
|
1214 | |
1184 | op->destroy (); |
1215 | op->destroy (1); |
|
|
1216 | |
1185 | return top; |
1217 | return top; |
1186 | } |
1218 | } |
1187 | } |
|
|
1188 | |
1219 | |
1189 | return 0; |
1220 | return 0; |
1190 | } |
1221 | } |
1191 | |
1222 | |
1192 | void |
1223 | void |
… | |
… | |
1251 | object * |
1282 | object * |
1252 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1283 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1253 | { |
1284 | { |
1254 | assert (!op->flag [FLAG_FREED]); |
1285 | assert (!op->flag [FLAG_FREED]); |
1255 | |
1286 | |
1256 | object *top, *floor = NULL; |
|
|
1257 | |
|
|
1258 | op->remove (); |
1287 | op->remove (); |
1259 | |
1288 | |
1260 | /* Ideally, the caller figures this out. However, it complicates a lot |
1289 | /* Ideally, the caller figures this out. However, it complicates a lot |
1261 | * of areas of callers (eg, anything that uses find_free_spot would now |
1290 | * of areas of callers (eg, anything that uses find_free_spot would now |
1262 | * need extra work |
1291 | * need extra work |
1263 | */ |
1292 | */ |
1264 | if (!xy_normalise (m, op->x, op->y)) |
1293 | if (!xy_normalise (m, op->x, op->y)) |
1265 | { |
1294 | { |
1266 | op->destroy (); |
1295 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1267 | return 0; |
1296 | return 0; |
1268 | } |
1297 | } |
1269 | |
1298 | |
1270 | if (object *more = op->more) |
1299 | if (object *more = op->more) |
1271 | if (!insert_ob_in_map (more, m, originator, flag)) |
1300 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1280 | */ |
1309 | */ |
1281 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1310 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1282 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1311 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1283 | if (object::can_merge (op, tmp)) |
1312 | if (object::can_merge (op, tmp)) |
1284 | { |
1313 | { |
|
|
1314 | // TODO: we atcually want to update tmp, not op, |
|
|
1315 | // but some caller surely breaks when we return tmp |
|
|
1316 | // from here :/ |
1285 | op->nrof += tmp->nrof; |
1317 | op->nrof += tmp->nrof; |
1286 | tmp->destroy (1); |
1318 | tmp->destroy (1); |
1287 | } |
1319 | } |
1288 | |
1320 | |
1289 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1321 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1311 | /* since *below* originator, no need to update top */ |
1343 | /* since *below* originator, no need to update top */ |
1312 | originator->below = op; |
1344 | originator->below = op; |
1313 | } |
1345 | } |
1314 | else |
1346 | else |
1315 | { |
1347 | { |
|
|
1348 | object *top, *floor = NULL; |
|
|
1349 | |
1316 | top = ms.bot; |
1350 | top = ms.bot; |
1317 | |
1351 | |
1318 | /* If there are other objects, then */ |
1352 | /* If there are other objects, then */ |
1319 | if (top) |
1353 | if (top) |
1320 | { |
1354 | { |
… | |
… | |
1419 | } |
1453 | } |
1420 | |
1454 | |
1421 | op->map->dirty = true; |
1455 | op->map->dirty = true; |
1422 | |
1456 | |
1423 | if (object *pl = ms.player ()) |
1457 | if (object *pl = ms.player ()) |
|
|
1458 | //TODO: the floorbox prev/next might need updating |
|
|
1459 | //esrv_send_item (pl, op); |
|
|
1460 | //TODO: update floorbox to preserve ordering |
|
|
1461 | if (pl->contr->ns) |
1424 | pl->contr->ns->floorbox_update (); |
1462 | pl->contr->ns->floorbox_update (); |
1425 | |
1463 | |
1426 | /* If this object glows, it may affect lighting conditions that are |
1464 | /* If this object glows, it may affect lighting conditions that are |
1427 | * visible to others on this map. But update_all_los is really |
1465 | * visible to others on this map. But update_all_los is really |
1428 | * an inefficient way to do this, as it means los for all players |
1466 | * an inefficient way to do this, as it means los for all players |
1429 | * on the map will get recalculated. The players could very well |
1467 | * on the map will get recalculated. The players could very well |
… | |
… | |
1494 | return where->env->insert (this); |
1532 | return where->env->insert (this); |
1495 | else |
1533 | else |
1496 | return where->map->insert (this, where->x, where->y, originator, flags); |
1534 | return where->map->insert (this, where->x, where->y, originator, flags); |
1497 | } |
1535 | } |
1498 | |
1536 | |
1499 | // find player who can see this object |
|
|
1500 | object * |
|
|
1501 | object::visible_to () const |
|
|
1502 | { |
|
|
1503 | if (!flag [FLAG_REMOVED]) |
|
|
1504 | { |
|
|
1505 | // see if we are in a container of sorts |
|
|
1506 | if (env) |
|
|
1507 | { |
|
|
1508 | // the player inventory itself is always visible |
|
|
1509 | if (env->type == PLAYER) |
|
|
1510 | return env; |
|
|
1511 | |
|
|
1512 | // else a player could have our env open |
|
|
1513 | object *envest = env->outer_env (); |
|
|
1514 | |
|
|
1515 | // the player itself is always on a map, so we will find him here |
|
|
1516 | // even if our inv is in a player. |
|
|
1517 | if (envest->is_on_map ()) |
|
|
1518 | if (object *pl = envest->ms ().player ()) |
|
|
1519 | if (pl->container == env) |
|
|
1520 | return pl; |
|
|
1521 | } |
|
|
1522 | else |
|
|
1523 | { |
|
|
1524 | // maybe there is a player standing on the same mapspace |
|
|
1525 | // this will catch the case where "this" is a player |
|
|
1526 | if (object *pl = ms ().player ()) |
|
|
1527 | return pl; |
|
|
1528 | } |
|
|
1529 | } |
|
|
1530 | |
|
|
1531 | return 0; |
|
|
1532 | } |
|
|
1533 | |
|
|
1534 | /* |
1537 | /* |
1535 | * decrease(object, number) decreases a specified number from |
1538 | * decrease(object, number) decreases a specified number from |
1536 | * the amount of an object. If the amount reaches 0, the object |
1539 | * the amount of an object. If the amount reaches 0, the object |
1537 | * is subsequently removed and freed. |
1540 | * is subsequently removed and freed. |
1538 | * |
1541 | * |
… | |
… | |
1584 | } |
1587 | } |
1585 | else |
1588 | else |
1586 | { |
1589 | { |
1587 | decrease (nr); |
1590 | decrease (nr); |
1588 | |
1591 | |
1589 | object *op = object_create_clone (this); |
1592 | object *op = deep_clone (); |
1590 | op->nrof = nr; |
1593 | op->nrof = nr; |
1591 | return op; |
1594 | return op; |
1592 | } |
1595 | } |
1593 | } |
1596 | } |
1594 | |
1597 | |
… | |
… | |
1638 | if (object::can_merge (tmp, op)) |
1641 | if (object::can_merge (tmp, op)) |
1639 | { |
1642 | { |
1640 | /* return the original object and remove inserted object |
1643 | /* return the original object and remove inserted object |
1641 | (client needs the original object) */ |
1644 | (client needs the original object) */ |
1642 | tmp->nrof += op->nrof; |
1645 | tmp->nrof += op->nrof; |
|
|
1646 | |
|
|
1647 | if (object *pl = tmp->visible_to ()) |
|
|
1648 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1649 | |
1643 | adjust_weight (this, op->total_weight ()); |
1650 | adjust_weight (this, op->total_weight ()); |
1644 | |
1651 | |
1645 | op->destroy (1); |
1652 | op->destroy (1); |
1646 | op = tmp; |
1653 | op = tmp; |
1647 | goto inserted; |
1654 | goto inserted; |
… | |
… | |
1661 | |
1668 | |
1662 | inv = op; |
1669 | inv = op; |
1663 | |
1670 | |
1664 | op->flag [FLAG_REMOVED] = 0; |
1671 | op->flag [FLAG_REMOVED] = 0; |
1665 | |
1672 | |
|
|
1673 | if (object *pl = op->visible_to ()) |
|
|
1674 | esrv_send_item (pl, op); |
|
|
1675 | |
1666 | adjust_weight (this, op->total_weight ()); |
1676 | adjust_weight (this, op->total_weight ()); |
1667 | |
1677 | |
1668 | inserted: |
1678 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1679 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1680 | if (op->glow_radius && map && map->darkness) |
1671 | update_all_los (map, x, y); |
1681 | update_all_los (map, x, y); |
1672 | |
1682 | |
1673 | if (object *otmp = in_player ()) |
1683 | // if this is a player's inventory, update stats |
1674 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1684 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1675 | otmp->update_stats (); |
1685 | update_stats (); |
1676 | |
1686 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1687 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1688 | |
1679 | return op; |
1689 | return op; |
1680 | } |
1690 | } |
… | |
… | |
1808 | LOG (llevError, "Present_arch called outside map.\n"); |
1818 | LOG (llevError, "Present_arch called outside map.\n"); |
1809 | return NULL; |
1819 | return NULL; |
1810 | } |
1820 | } |
1811 | |
1821 | |
1812 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1822 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1813 | if (tmp->arch == at) |
1823 | if (tmp->arch->archname == at->archname) |
1814 | return tmp; |
1824 | return tmp; |
1815 | |
1825 | |
1816 | return NULL; |
1826 | return NULL; |
1817 | } |
1827 | } |
1818 | |
1828 | |
… | |
… | |
1882 | * The first matching object is returned, or NULL if none. |
1892 | * The first matching object is returned, or NULL if none. |
1883 | */ |
1893 | */ |
1884 | object * |
1894 | object * |
1885 | present_arch_in_ob (const archetype *at, const object *op) |
1895 | present_arch_in_ob (const archetype *at, const object *op) |
1886 | { |
1896 | { |
1887 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1897 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1888 | if (tmp->arch == at) |
1898 | if (tmp->arch->archname == at->archname) |
1889 | return tmp; |
1899 | return tmp; |
1890 | |
1900 | |
1891 | return NULL; |
1901 | return NULL; |
1892 | } |
1902 | } |
1893 | |
1903 | |
… | |
… | |
2302 | |
2312 | |
2303 | /* |
2313 | /* |
2304 | * create clone from object to another |
2314 | * create clone from object to another |
2305 | */ |
2315 | */ |
2306 | object * |
2316 | object * |
2307 | object_create_clone (object *asrc) |
2317 | object::deep_clone () |
2308 | { |
2318 | { |
2309 | object *dst = 0, *tmp, *src, *prev, *item; |
2319 | assert (("deep_clone called on non-head object", is_head ())); |
2310 | |
2320 | |
2311 | if (!asrc) |
2321 | object *dst = clone (); |
2312 | return 0; |
|
|
2313 | |
2322 | |
2314 | src = asrc->head_ (); |
2323 | object *prev = dst; |
2315 | |
|
|
2316 | prev = 0; |
|
|
2317 | for (object *part = src; part; part = part->more) |
2324 | for (object *part = this->more; part; part = part->more) |
2318 | { |
2325 | { |
2319 | tmp = part->clone (); |
2326 | object *tmp = part->clone (); |
2320 | tmp->x -= src->x; |
|
|
2321 | tmp->y -= src->y; |
|
|
2322 | |
|
|
2323 | if (!part->head) |
|
|
2324 | { |
|
|
2325 | dst = tmp; |
|
|
2326 | tmp->head = 0; |
|
|
2327 | } |
|
|
2328 | else |
|
|
2329 | tmp->head = dst; |
2327 | tmp->head = dst; |
2330 | |
|
|
2331 | tmp->more = 0; |
|
|
2332 | |
|
|
2333 | if (prev) |
|
|
2334 | prev->more = tmp; |
2328 | prev->more = tmp; |
2335 | |
|
|
2336 | prev = tmp; |
2329 | prev = tmp; |
2337 | } |
2330 | } |
2338 | |
2331 | |
2339 | for (item = src->inv; item; item = item->below) |
2332 | for (object *item = inv; item; item = item->below) |
2340 | insert_ob_in_ob (object_create_clone (item), dst); |
2333 | insert_ob_in_ob (item->deep_clone (), dst); |
2341 | |
2334 | |
2342 | return dst; |
2335 | return dst; |
2343 | } |
2336 | } |
2344 | |
2337 | |
2345 | /* This returns the first object in who's inventory that |
2338 | /* This returns the first object in who's inventory that |
… | |
… | |
2354 | return tmp; |
2347 | return tmp; |
2355 | |
2348 | |
2356 | return 0; |
2349 | return 0; |
2357 | } |
2350 | } |
2358 | |
2351 | |
2359 | /* If ob has a field named key, return the link from the list, |
2352 | const shstr & |
2360 | * otherwise return NULL. |
2353 | object::kv_get (const shstr &key) const |
2361 | * |
|
|
2362 | * key must be a passed in shared string - otherwise, this won't |
|
|
2363 | * do the desired thing. |
|
|
2364 | */ |
|
|
2365 | key_value * |
|
|
2366 | get_ob_key_link (const object *ob, const char *key) |
|
|
2367 | { |
2354 | { |
2368 | for (key_value *link = ob->key_values; link; link = link->next) |
2355 | for (key_value *kv = key_values; kv; kv = kv->next) |
2369 | if (link->key == key) |
2356 | if (kv->key == key) |
2370 | return link; |
|
|
2371 | |
|
|
2372 | return 0; |
|
|
2373 | } |
|
|
2374 | |
|
|
2375 | /* |
|
|
2376 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2377 | * |
|
|
2378 | * The argument doesn't need to be a shared string. |
|
|
2379 | * |
|
|
2380 | * The returned string is shared. |
|
|
2381 | */ |
|
|
2382 | const char * |
|
|
2383 | get_ob_key_value (const object *op, const char *const key) |
|
|
2384 | { |
|
|
2385 | key_value *link; |
|
|
2386 | shstr_cmp canonical_key (key); |
|
|
2387 | |
|
|
2388 | if (!canonical_key) |
|
|
2389 | { |
|
|
2390 | /* 1. There being a field named key on any object |
|
|
2391 | * implies there'd be a shared string to find. |
|
|
2392 | * 2. Since there isn't, no object has this field. |
|
|
2393 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2394 | */ |
|
|
2395 | return 0; |
|
|
2396 | } |
|
|
2397 | |
|
|
2398 | /* This is copied from get_ob_key_link() above - |
|
|
2399 | * only 4 lines, and saves the function call overhead. |
|
|
2400 | */ |
|
|
2401 | for (link = op->key_values; link; link = link->next) |
|
|
2402 | if (link->key == canonical_key) |
|
|
2403 | return link->value; |
2357 | return kv->value; |
2404 | |
2358 | |
2405 | return 0; |
2359 | return shstr_null; |
2406 | } |
2360 | } |
2407 | |
2361 | |
2408 | /* |
2362 | void |
2409 | * Updates the canonical_key in op to value. |
2363 | object::kv_set (const shstr &key, const shstr &value) |
2410 | * |
|
|
2411 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2412 | * |
|
|
2413 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2414 | * keys. |
|
|
2415 | * |
|
|
2416 | * Returns TRUE on success. |
|
|
2417 | */ |
|
|
2418 | int |
|
|
2419 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2420 | { |
2364 | { |
2421 | key_value *field = NULL, *last = NULL; |
2365 | for (key_value *kv = key_values; kv; kv = kv->next) |
2422 | |
2366 | if (kv->key == key) |
2423 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2424 | { |
|
|
2425 | if (field->key != canonical_key) |
|
|
2426 | { |
2367 | { |
2427 | last = field; |
2368 | kv->value = value; |
2428 | continue; |
2369 | return; |
2429 | } |
2370 | } |
2430 | |
2371 | |
2431 | if (value) |
2372 | key_value *kv = new key_value; |
2432 | field->value = value; |
2373 | |
2433 | else |
2374 | kv->next = key_values; |
|
|
2375 | kv->key = key; |
|
|
2376 | kv->value = value; |
|
|
2377 | |
|
|
2378 | key_values = kv; |
|
|
2379 | } |
|
|
2380 | |
|
|
2381 | void |
|
|
2382 | object::kv_del (const shstr &key) |
|
|
2383 | { |
|
|
2384 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2385 | if ((*kvp)->key == key) |
2434 | { |
2386 | { |
2435 | /* Basically, if the archetype has this key set, |
2387 | key_value *kv = *kvp; |
2436 | * we need to store the null value so when we save |
2388 | *kvp = (*kvp)->next; |
2437 | * it, we save the empty value so that when we load, |
2389 | delete kv; |
2438 | * we get this value back again. |
2390 | return; |
2439 | */ |
|
|
2440 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2441 | field->value = 0; |
|
|
2442 | else |
|
|
2443 | { |
|
|
2444 | if (last) |
|
|
2445 | last->next = field->next; |
|
|
2446 | else |
|
|
2447 | op->key_values = field->next; |
|
|
2448 | |
|
|
2449 | delete field; |
|
|
2450 | } |
|
|
2451 | } |
2391 | } |
2452 | return TRUE; |
|
|
2453 | } |
|
|
2454 | /* IF we get here, key doesn't exist */ |
|
|
2455 | |
|
|
2456 | /* No field, we'll have to add it. */ |
|
|
2457 | |
|
|
2458 | if (!add_key) |
|
|
2459 | return FALSE; |
|
|
2460 | |
|
|
2461 | /* There isn't any good reason to store a null |
|
|
2462 | * value in the key/value list. If the archetype has |
|
|
2463 | * this key, then we should also have it, so shouldn't |
|
|
2464 | * be here. If user wants to store empty strings, |
|
|
2465 | * should pass in "" |
|
|
2466 | */ |
|
|
2467 | if (value == NULL) |
|
|
2468 | return TRUE; |
|
|
2469 | |
|
|
2470 | field = new key_value; |
|
|
2471 | |
|
|
2472 | field->key = canonical_key; |
|
|
2473 | field->value = value; |
|
|
2474 | /* Usual prepend-addition. */ |
|
|
2475 | field->next = op->key_values; |
|
|
2476 | op->key_values = field; |
|
|
2477 | |
|
|
2478 | return TRUE; |
|
|
2479 | } |
|
|
2480 | |
|
|
2481 | /* |
|
|
2482 | * Updates the key in op to value. |
|
|
2483 | * |
|
|
2484 | * If add_key is FALSE, this will only update existing keys, |
|
|
2485 | * and not add new ones. |
|
|
2486 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2487 | * |
|
|
2488 | * Returns TRUE on success. |
|
|
2489 | */ |
|
|
2490 | int |
|
|
2491 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2492 | { |
|
|
2493 | shstr key_ (key); |
|
|
2494 | |
|
|
2495 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2496 | } |
2392 | } |
2497 | |
2393 | |
2498 | object::depth_iterator::depth_iterator (object *container) |
2394 | object::depth_iterator::depth_iterator (object *container) |
2499 | : iterator_base (container) |
2395 | : iterator_base (container) |
2500 | { |
2396 | { |
… | |
… | |
2558 | &name, |
2454 | &name, |
2559 | title ? "\",title:\"" : "", |
2455 | title ? "\",title:\"" : "", |
2560 | title ? (const char *)title : "", |
2456 | title ? (const char *)title : "", |
2561 | flag_desc (flagdesc, 512), type); |
2457 | flag_desc (flagdesc, 512), type); |
2562 | |
2458 | |
2563 | if (!this->flag[FLAG_REMOVED] && env) |
2459 | if (!flag[FLAG_REMOVED] && env) |
2564 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2460 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2565 | |
2461 | |
2566 | if (map) |
2462 | if (map) |
2567 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2463 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2568 | |
2464 | |
… | |
… | |
2598 | object::open_container (object *new_container) |
2494 | object::open_container (object *new_container) |
2599 | { |
2495 | { |
2600 | if (container == new_container) |
2496 | if (container == new_container) |
2601 | return; |
2497 | return; |
2602 | |
2498 | |
2603 | if (object *old_container = container) |
2499 | object *old_container = container; |
|
|
2500 | |
|
|
2501 | if (old_container) |
2604 | { |
2502 | { |
2605 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2503 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2606 | return; |
2504 | return; |
2607 | |
2505 | |
2608 | #if 0 |
2506 | #if 0 |
… | |
… | |
2610 | if (object *closer = old_container->inv) |
2508 | if (object *closer = old_container->inv) |
2611 | if (closer->type == CLOSE_CON) |
2509 | if (closer->type == CLOSE_CON) |
2612 | closer->destroy (); |
2510 | closer->destroy (); |
2613 | #endif |
2511 | #endif |
2614 | |
2512 | |
|
|
2513 | // make sure the container is available |
|
|
2514 | esrv_send_item (this, old_container); |
|
|
2515 | |
2615 | old_container->flag [FLAG_APPLIED] = 0; |
2516 | old_container->flag [FLAG_APPLIED] = false; |
2616 | container = 0; |
2517 | container = 0; |
2617 | |
2518 | |
|
|
2519 | // client needs item update to make it work, client bug requires this to be separate |
2618 | esrv_update_item (UPD_FLAGS, this, old_container); |
2520 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2521 | |
2619 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2522 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2620 | play_sound (sound_find ("chest_close")); |
2523 | play_sound (sound_find ("chest_close")); |
2621 | } |
2524 | } |
2622 | |
2525 | |
2623 | if (new_container) |
2526 | if (new_container) |
… | |
… | |
2636 | } |
2539 | } |
2637 | #endif |
2540 | #endif |
2638 | |
2541 | |
2639 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2542 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2640 | |
2543 | |
|
|
2544 | // make sure the container is available, client bug requires this to be separate |
|
|
2545 | esrv_send_item (this, new_container); |
|
|
2546 | |
2641 | new_container->flag [FLAG_APPLIED] = 1; |
2547 | new_container->flag [FLAG_APPLIED] = true; |
2642 | container = new_container; |
2548 | container = new_container; |
2643 | |
2549 | |
|
|
2550 | // client needs flag change |
2644 | esrv_update_item (UPD_FLAGS, this, new_container); |
2551 | esrv_update_item (UPD_FLAGS, this, new_container); |
2645 | esrv_send_inventory (this, new_container); |
2552 | esrv_send_inventory (this, new_container); |
2646 | play_sound (sound_find ("chest_open")); |
2553 | play_sound (sound_find ("chest_open")); |
2647 | } |
2554 | } |
|
|
2555 | // else if (!old_container->env && contr && contr->ns) |
|
|
2556 | // contr->ns->floorbox_reset (); |
2648 | } |
2557 | } |
2649 | |
2558 | |
2650 | object * |
2559 | object * |
2651 | object::force_find (const shstr name) |
2560 | object::force_find (const shstr name) |
2652 | { |
2561 | { |