1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | |
3 | * |
4 | Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. |
11 | * (at your option) any later version. |
12 | |
12 | * |
13 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
21 | * |
22 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
27 | variable. */ |
28 | #include <global.h> |
28 | #include <global.h> |
… | |
… | |
324 | sum_weight (object *op) |
324 | sum_weight (object *op) |
325 | { |
325 | { |
326 | long sum; |
326 | long sum; |
327 | object *inv; |
327 | object *inv; |
328 | |
328 | |
329 | for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) |
329 | for (sum = 0, inv = op->inv; inv; inv = inv->below) |
330 | { |
330 | { |
331 | if (inv->inv) |
331 | if (inv->inv) |
332 | sum_weight (inv); |
332 | sum_weight (inv); |
|
|
333 | |
333 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
334 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
334 | } |
335 | } |
335 | |
336 | |
336 | if (op->type == CONTAINER && op->stats.Str) |
337 | if (op->type == CONTAINER && op->stats.Str) |
337 | sum = (sum * (100 - op->stats.Str)) / 100; |
338 | sum = (sum * (100 - op->stats.Str)) / 100; |
… | |
… | |
357 | /* |
358 | /* |
358 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
359 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
359 | * Some error messages. |
360 | * Some error messages. |
360 | * The result of the dump is stored in the static global errmsg array. |
361 | * The result of the dump is stored in the static global errmsg array. |
361 | */ |
362 | */ |
362 | |
|
|
363 | char * |
363 | char * |
364 | dump_object (object *op) |
364 | dump_object (object *op) |
365 | { |
365 | { |
366 | if (!op) |
366 | if (!op) |
367 | return strdup ("[NULLOBJ]"); |
367 | return strdup ("[NULLOBJ]"); |
368 | |
368 | |
369 | object_freezer freezer; |
369 | object_freezer freezer; |
370 | save_object (freezer, op, 1); |
370 | op->write (freezer); |
371 | return freezer.as_string (); |
371 | return freezer.as_string (); |
372 | } |
372 | } |
373 | |
373 | |
374 | /* |
374 | /* |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
449 | owner = owner->owner; |
449 | owner = owner->owner; |
450 | |
450 | |
451 | this->owner = owner; |
451 | this->owner = owner; |
452 | } |
452 | } |
453 | |
453 | |
|
|
454 | void |
|
|
455 | object::set_weapon (object *ob) |
|
|
456 | { |
|
|
457 | if (current_weapon == ob) |
|
|
458 | return; |
|
|
459 | |
|
|
460 | current_weapon = ob; |
|
|
461 | new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
|
|
462 | update_stats (); |
|
|
463 | } |
|
|
464 | |
454 | /* Zero the key_values on op, decrementing the shared-string |
465 | /* Zero the key_values on op, decrementing the shared-string |
455 | * refcounts and freeing the links. |
466 | * refcounts and freeing the links. |
456 | */ |
467 | */ |
457 | static void |
468 | static void |
458 | free_key_values (object *op) |
469 | free_key_values (object *op) |
459 | { |
470 | { |
460 | for (key_value *i = op->key_values; i != 0;) |
471 | for (key_value *i = op->key_values; i; ) |
461 | { |
472 | { |
462 | key_value *next = i->next; |
473 | key_value *next = i->next; |
463 | delete i; |
474 | delete i; |
464 | |
475 | |
465 | i = next; |
476 | i = next; |
466 | } |
477 | } |
467 | |
478 | |
468 | op->key_values = 0; |
479 | op->key_values = 0; |
469 | } |
480 | } |
470 | |
481 | |
471 | /* |
482 | object & |
472 | * copy_to first frees everything allocated by the dst object, |
483 | object::operator =(const object &src) |
473 | * and then copies the contents of itself into the second |
|
|
474 | * object, allocating what needs to be allocated. Basically, any |
|
|
475 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
476 | * if the first object is freed, the pointers in the new object |
|
|
477 | * will point at garbage. |
|
|
478 | */ |
|
|
479 | void |
|
|
480 | object::copy_to (object *dst) |
|
|
481 | { |
484 | { |
482 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
485 | bool is_freed = flag [FLAG_FREED]; |
483 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
486 | bool is_removed = flag [FLAG_REMOVED]; |
484 | |
487 | |
485 | *(object_copy *)dst = *this; |
488 | *(object_copy *)this = src; |
486 | |
489 | |
487 | if (is_freed) |
490 | flag [FLAG_FREED] = is_freed; |
488 | SET_FLAG (dst, FLAG_FREED); |
491 | flag [FLAG_REMOVED] = is_removed; |
489 | |
|
|
490 | if (is_removed) |
|
|
491 | SET_FLAG (dst, FLAG_REMOVED); |
|
|
492 | |
|
|
493 | if (speed < 0) |
|
|
494 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
|
|
495 | |
492 | |
496 | /* Copy over key_values, if any. */ |
493 | /* Copy over key_values, if any. */ |
497 | if (key_values) |
494 | if (src.key_values) |
498 | { |
495 | { |
499 | key_value *tail = 0; |
496 | key_value *tail = 0; |
500 | key_value *i; |
|
|
501 | |
|
|
502 | dst->key_values = 0; |
497 | key_values = 0; |
503 | |
498 | |
504 | for (i = key_values; i; i = i->next) |
499 | for (key_value *i = src.key_values; i; i = i->next) |
505 | { |
500 | { |
506 | key_value *new_link = new key_value; |
501 | key_value *new_link = new key_value; |
507 | |
502 | |
508 | new_link->next = 0; |
503 | new_link->next = 0; |
509 | new_link->key = i->key; |
504 | new_link->key = i->key; |
510 | new_link->value = i->value; |
505 | new_link->value = i->value; |
511 | |
506 | |
512 | /* Try and be clever here, too. */ |
507 | /* Try and be clever here, too. */ |
513 | if (!dst->key_values) |
508 | if (!key_values) |
514 | { |
509 | { |
515 | dst->key_values = new_link; |
510 | key_values = new_link; |
516 | tail = new_link; |
511 | tail = new_link; |
517 | } |
512 | } |
518 | else |
513 | else |
519 | { |
514 | { |
520 | tail->next = new_link; |
515 | tail->next = new_link; |
521 | tail = new_link; |
516 | tail = new_link; |
522 | } |
517 | } |
523 | } |
518 | } |
524 | } |
519 | } |
|
|
520 | } |
|
|
521 | |
|
|
522 | /* |
|
|
523 | * copy_to first frees everything allocated by the dst object, |
|
|
524 | * and then copies the contents of itself into the second |
|
|
525 | * object, allocating what needs to be allocated. Basically, any |
|
|
526 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
527 | * if the first object is freed, the pointers in the new object |
|
|
528 | * will point at garbage. |
|
|
529 | */ |
|
|
530 | void |
|
|
531 | object::copy_to (object *dst) |
|
|
532 | { |
|
|
533 | *dst = *this; |
|
|
534 | |
|
|
535 | if (speed < 0) |
|
|
536 | dst->speed_left = speed_left - rndm (); |
525 | |
537 | |
526 | dst->set_speed (dst->speed); |
538 | dst->set_speed (dst->speed); |
|
|
539 | } |
|
|
540 | |
|
|
541 | void |
|
|
542 | object::instantiate () |
|
|
543 | { |
|
|
544 | if (!uuid.seq) // HACK |
|
|
545 | uuid = gen_uuid (); |
|
|
546 | |
|
|
547 | speed_left = -0.1f; |
|
|
548 | /* copy the body_info to the body_used - this is only really |
|
|
549 | * need for monsters, but doesn't hurt to do it for everything. |
|
|
550 | * by doing so, when a monster is created, it has good starting |
|
|
551 | * values for the body_used info, so when items are created |
|
|
552 | * for it, they can be properly equipped. |
|
|
553 | */ |
|
|
554 | for (int i = NUM_BODY_LOCATIONS; i--; ) |
|
|
555 | slot[i].used = slot[i].info; |
|
|
556 | |
|
|
557 | attachable::instantiate (); |
527 | } |
558 | } |
528 | |
559 | |
529 | object * |
560 | object * |
530 | object::clone () |
561 | object::clone () |
531 | { |
562 | { |
… | |
… | |
589 | * UP_OBJ_FACE: only the objects face has changed. |
620 | * UP_OBJ_FACE: only the objects face has changed. |
590 | */ |
621 | */ |
591 | void |
622 | void |
592 | update_object (object *op, int action) |
623 | update_object (object *op, int action) |
593 | { |
624 | { |
594 | MoveType move_on, move_off, move_block, move_slow; |
|
|
595 | |
|
|
596 | if (op == NULL) |
625 | if (op == NULL) |
597 | { |
626 | { |
598 | /* this should never happen */ |
627 | /* this should never happen */ |
599 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
628 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
600 | return; |
629 | return; |
… | |
… | |
670 | face = blank_face; |
699 | face = blank_face; |
671 | } |
700 | } |
672 | |
701 | |
673 | object::~object () |
702 | object::~object () |
674 | { |
703 | { |
|
|
704 | unlink (); |
|
|
705 | |
675 | free_key_values (this); |
706 | free_key_values (this); |
676 | } |
707 | } |
677 | |
708 | |
678 | static int object_count; |
709 | static int object_count; |
679 | |
710 | |
… | |
… | |
687 | objects.insert (this); |
718 | objects.insert (this); |
688 | } |
719 | } |
689 | |
720 | |
690 | void object::unlink () |
721 | void object::unlink () |
691 | { |
722 | { |
692 | assert (index);//D |
723 | if (!index) |
|
|
724 | return; |
|
|
725 | |
693 | objects.erase (this); |
726 | objects.erase (this); |
694 | refcnt_dec (); |
727 | refcnt_dec (); |
695 | } |
728 | } |
696 | |
729 | |
697 | void |
730 | void |
… | |
… | |
771 | * drop on that space. |
804 | * drop on that space. |
772 | */ |
805 | */ |
773 | if (!drop_to_ground |
806 | if (!drop_to_ground |
774 | || !map |
807 | || !map |
775 | || map->in_memory != MAP_IN_MEMORY |
808 | || map->in_memory != MAP_IN_MEMORY |
|
|
809 | || map->nodrop |
776 | || ms ().move_block == MOVE_ALL) |
810 | || ms ().move_block == MOVE_ALL) |
777 | { |
811 | { |
778 | while (inv) |
812 | while (inv) |
779 | { |
813 | { |
780 | inv->destroy_inv (drop_to_ground); |
814 | inv->destroy_inv (drop_to_ground); |
… | |
… | |
896 | * This function removes the object op from the linked list of objects |
930 | * This function removes the object op from the linked list of objects |
897 | * which it is currently tied to. When this function is done, the |
931 | * which it is currently tied to. When this function is done, the |
898 | * object will have no environment. If the object previously had an |
932 | * object will have no environment. If the object previously had an |
899 | * environment, the x and y coordinates will be updated to |
933 | * environment, the x and y coordinates will be updated to |
900 | * the previous environment. |
934 | * the previous environment. |
901 | * Beware: This function is called from the editor as well! |
|
|
902 | */ |
935 | */ |
903 | void |
936 | void |
904 | object::remove () |
937 | object::do_remove () |
905 | { |
938 | { |
906 | object *tmp, *last = 0; |
939 | object *tmp, *last = 0; |
907 | object *otmp; |
940 | object *otmp; |
908 | |
941 | |
909 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
942 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
… | |
… | |
952 | } |
985 | } |
953 | else if (map) |
986 | else if (map) |
954 | { |
987 | { |
955 | if (type == PLAYER) |
988 | if (type == PLAYER) |
956 | { |
989 | { |
|
|
990 | // leaving a spot always closes any open container on the ground |
|
|
991 | if (container && !container->env) |
|
|
992 | // this causes spurious floorbox updates, but it ensures |
|
|
993 | // that the CLOSE event is being sent. |
|
|
994 | close_container (); |
|
|
995 | |
957 | --map->players; |
996 | --map->players; |
958 | map->touch (); |
997 | map->touch (); |
959 | } |
998 | } |
960 | |
999 | |
961 | map->dirty = true; |
1000 | map->dirty = true; |
|
|
1001 | mapspace &ms = this->ms (); |
962 | |
1002 | |
963 | /* link the object above us */ |
1003 | /* link the object above us */ |
964 | if (above) |
1004 | if (above) |
965 | above->below = below; |
1005 | above->below = below; |
966 | else |
1006 | else |
967 | map->at (x, y).top = below; /* we were top, set new top */ |
1007 | ms.top = below; /* we were top, set new top */ |
968 | |
1008 | |
969 | /* Relink the object below us, if there is one */ |
1009 | /* Relink the object below us, if there is one */ |
970 | if (below) |
1010 | if (below) |
971 | below->above = above; |
1011 | below->above = above; |
972 | else |
1012 | else |
… | |
… | |
974 | /* Nothing below, which means we need to relink map object for this space |
1014 | /* Nothing below, which means we need to relink map object for this space |
975 | * use translated coordinates in case some oddness with map tiling is |
1015 | * use translated coordinates in case some oddness with map tiling is |
976 | * evident |
1016 | * evident |
977 | */ |
1017 | */ |
978 | if (GET_MAP_OB (map, x, y) != this) |
1018 | if (GET_MAP_OB (map, x, y) != this) |
979 | { |
|
|
980 | char *dump = dump_object (this); |
|
|
981 | LOG (llevError, |
|
|
982 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
1019 | 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 ()); |
983 | free (dump); |
|
|
984 | dump = dump_object (GET_MAP_OB (map, x, y)); |
|
|
985 | LOG (llevError, "%s\n", dump); |
|
|
986 | free (dump); |
|
|
987 | } |
|
|
988 | |
1020 | |
989 | map->at (x, y).bot = above; /* goes on above it. */ |
1021 | ms.bot = above; /* goes on above it. */ |
990 | } |
1022 | } |
991 | |
1023 | |
992 | above = 0; |
1024 | above = 0; |
993 | below = 0; |
1025 | below = 0; |
994 | |
1026 | |
995 | if (map->in_memory == MAP_SAVING) |
1027 | if (map->in_memory == MAP_SAVING) |
996 | return; |
1028 | return; |
997 | |
1029 | |
998 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1030 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
999 | |
1031 | |
1000 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1032 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1001 | { |
1033 | { |
1002 | /* No point updating the players look faces if he is the object |
1034 | /* No point updating the players look faces if he is the object |
1003 | * being removed. |
1035 | * being removed. |
1004 | */ |
1036 | */ |
1005 | |
1037 | |
… | |
… | |
1085 | } |
1117 | } |
1086 | |
1118 | |
1087 | return 0; |
1119 | return 0; |
1088 | } |
1120 | } |
1089 | |
1121 | |
|
|
1122 | void |
|
|
1123 | object::expand_tail () |
|
|
1124 | { |
|
|
1125 | if (more) |
|
|
1126 | return; |
|
|
1127 | |
|
|
1128 | object *prev = this; |
|
|
1129 | |
|
|
1130 | for (archetype *at = arch->more; at; at = at->more) |
|
|
1131 | { |
|
|
1132 | object *op = arch_to_object (at); |
|
|
1133 | |
|
|
1134 | op->name = name; |
|
|
1135 | op->name_pl = name_pl; |
|
|
1136 | op->title = title; |
|
|
1137 | |
|
|
1138 | op->head = this; |
|
|
1139 | prev->more = op; |
|
|
1140 | |
|
|
1141 | prev = op; |
|
|
1142 | } |
|
|
1143 | } |
|
|
1144 | |
1090 | /* |
1145 | /* |
1091 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1146 | * same as insert_ob_in_map except it handles separate coordinates and does a clean |
1092 | * job preparing multi-part monsters |
1147 | * job preparing multi-part monsters. |
1093 | */ |
1148 | */ |
1094 | object * |
1149 | object * |
1095 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1150 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1096 | { |
1151 | { |
1097 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1152 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
… | |
… | |
1124 | * just 'op' otherwise |
1179 | * just 'op' otherwise |
1125 | */ |
1180 | */ |
1126 | object * |
1181 | object * |
1127 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1182 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1128 | { |
1183 | { |
|
|
1184 | assert (!op->flag [FLAG_FREED]); |
|
|
1185 | |
1129 | object *tmp, *top, *floor = NULL; |
1186 | object *tmp, *top, *floor = NULL; |
1130 | sint16 x, y; |
|
|
1131 | |
1187 | |
1132 | if (QUERY_FLAG (op, FLAG_FREED)) |
1188 | op->remove (); |
1133 | { |
|
|
1134 | LOG (llevError, "Trying to insert freed object!\n"); |
|
|
1135 | return NULL; |
|
|
1136 | } |
|
|
1137 | |
1189 | |
1138 | if (!m) |
1190 | #if 0 |
1139 | { |
1191 | if (!m->active != !op->active) |
1140 | char *dump = dump_object (op); |
1192 | if (m->active) |
1141 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1193 | op->activate_recursive (); |
1142 | free (dump); |
1194 | else |
1143 | return op; |
1195 | op->deactivate_recursive (); |
1144 | } |
1196 | #endif |
1145 | |
1197 | |
1146 | if (out_of_map (m, op->x, op->y)) |
1198 | if (out_of_map (m, op->x, op->y)) |
1147 | { |
1199 | { |
1148 | char *dump = dump_object (op); |
|
|
1149 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1200 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1150 | #ifdef MANY_CORES |
1201 | #ifdef MANY_CORES |
1151 | /* Better to catch this here, as otherwise the next use of this object |
1202 | /* Better to catch this here, as otherwise the next use of this object |
1152 | * is likely to cause a crash. Better to find out where it is getting |
1203 | * is likely to cause a crash. Better to find out where it is getting |
1153 | * improperly inserted. |
1204 | * improperly inserted. |
1154 | */ |
1205 | */ |
1155 | abort (); |
1206 | abort (); |
1156 | #endif |
1207 | #endif |
1157 | free (dump); |
|
|
1158 | return op; |
1208 | return op; |
1159 | } |
1209 | } |
1160 | |
1210 | |
1161 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1162 | { |
|
|
1163 | char *dump = dump_object (op); |
|
|
1164 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1165 | free (dump); |
|
|
1166 | return op; |
|
|
1167 | } |
|
|
1168 | |
|
|
1169 | if (op->more) |
|
|
1170 | { |
|
|
1171 | /* The part may be on a different map. */ |
|
|
1172 | |
|
|
1173 | object *more = op->more; |
1211 | if (object *more = op->more) |
1174 | |
1212 | { |
1175 | /* We really need the caller to normalise coordinates - if |
|
|
1176 | * we set the map, that doesn't work if the location is within |
|
|
1177 | * a map and this is straddling an edge. So only if coordinate |
|
|
1178 | * is clear wrong do we normalise it. |
|
|
1179 | */ |
|
|
1180 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
|
|
1181 | more->map = get_map_from_coord (m, &more->x, &more->y); |
|
|
1182 | else if (!more->map) |
|
|
1183 | { |
|
|
1184 | /* For backwards compatibility - when not dealing with tiled maps, |
|
|
1185 | * more->map should always point to the parent. |
|
|
1186 | */ |
|
|
1187 | more->map = m; |
|
|
1188 | } |
|
|
1189 | |
|
|
1190 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1213 | if (!insert_ob_in_map (more, m, originator, flag)) |
1191 | { |
1214 | { |
1192 | if (!op->head) |
1215 | if (!op->head) |
1193 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1216 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1194 | |
1217 | |
1195 | return 0; |
1218 | return 0; |
… | |
… | |
1200 | |
1223 | |
1201 | /* Ideally, the caller figures this out. However, it complicates a lot |
1224 | /* Ideally, the caller figures this out. However, it complicates a lot |
1202 | * of areas of callers (eg, anything that uses find_free_spot would now |
1225 | * of areas of callers (eg, anything that uses find_free_spot would now |
1203 | * need extra work |
1226 | * need extra work |
1204 | */ |
1227 | */ |
1205 | op->map = get_map_from_coord (m, &op->x, &op->y); |
1228 | if (!xy_normalise (m, op->x, op->y)) |
1206 | x = op->x; |
1229 | return 0; |
1207 | y = op->y; |
1230 | |
|
|
1231 | op->map = m; |
|
|
1232 | mapspace &ms = op->ms (); |
1208 | |
1233 | |
1209 | /* this has to be done after we translate the coordinates. |
1234 | /* this has to be done after we translate the coordinates. |
1210 | */ |
1235 | */ |
1211 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1236 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1212 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1237 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1213 | if (object::can_merge (op, tmp)) |
1238 | if (object::can_merge (op, tmp)) |
1214 | { |
1239 | { |
1215 | op->nrof += tmp->nrof; |
1240 | op->nrof += tmp->nrof; |
1216 | tmp->destroy (); |
1241 | tmp->destroy (); |
1217 | } |
1242 | } |
… | |
… | |
1234 | op->below = originator->below; |
1259 | op->below = originator->below; |
1235 | |
1260 | |
1236 | if (op->below) |
1261 | if (op->below) |
1237 | op->below->above = op; |
1262 | op->below->above = op; |
1238 | else |
1263 | else |
1239 | op->ms ().bot = op; |
1264 | ms.bot = op; |
1240 | |
1265 | |
1241 | /* since *below* originator, no need to update top */ |
1266 | /* since *below* originator, no need to update top */ |
1242 | originator->below = op; |
1267 | originator->below = op; |
1243 | } |
1268 | } |
1244 | else |
1269 | else |
1245 | { |
1270 | { |
|
|
1271 | top = ms.bot; |
|
|
1272 | |
1246 | /* If there are other objects, then */ |
1273 | /* If there are other objects, then */ |
1247 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1274 | if ((!(flag & INS_MAP_LOAD)) && top) |
1248 | { |
1275 | { |
1249 | object *last = 0; |
1276 | object *last = 0; |
1250 | |
1277 | |
1251 | /* |
1278 | /* |
1252 | * If there are multiple objects on this space, we do some trickier handling. |
1279 | * If there are multiple objects on this space, we do some trickier handling. |
… | |
… | |
1258 | * once we get to them. This reduces the need to traverse over all of |
1285 | * once we get to them. This reduces the need to traverse over all of |
1259 | * them when adding another one - this saves quite a bit of cpu time |
1286 | * them when adding another one - this saves quite a bit of cpu time |
1260 | * when lots of spells are cast in one area. Currently, it is presumed |
1287 | * when lots of spells are cast in one area. Currently, it is presumed |
1261 | * that flying non pickable objects are spell objects. |
1288 | * that flying non pickable objects are spell objects. |
1262 | */ |
1289 | */ |
1263 | while (top) |
1290 | for (top = ms.bot; top; top = top->above) |
1264 | { |
1291 | { |
1265 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1292 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1266 | floor = top; |
1293 | floor = top; |
1267 | |
1294 | |
1268 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1295 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1271 | top = top->below; |
1298 | top = top->below; |
1272 | break; |
1299 | break; |
1273 | } |
1300 | } |
1274 | |
1301 | |
1275 | last = top; |
1302 | last = top; |
1276 | top = top->above; |
|
|
1277 | } |
1303 | } |
1278 | |
1304 | |
1279 | /* Don't want top to be NULL, so set it to the last valid object */ |
1305 | /* Don't want top to be NULL, so set it to the last valid object */ |
1280 | top = last; |
1306 | top = last; |
1281 | |
1307 | |
… | |
… | |
1283 | * looks like instead of lots of conditions here. |
1309 | * looks like instead of lots of conditions here. |
1284 | * makes things faster, and effectively the same result. |
1310 | * makes things faster, and effectively the same result. |
1285 | */ |
1311 | */ |
1286 | |
1312 | |
1287 | /* Have object 'fall below' other objects that block view. |
1313 | /* Have object 'fall below' other objects that block view. |
1288 | * Unless those objects are exits, type 66 |
1314 | * Unless those objects are exits. |
1289 | * If INS_ON_TOP is used, don't do this processing |
1315 | * If INS_ON_TOP is used, don't do this processing |
1290 | * Need to find the object that in fact blocks view, otherwise |
1316 | * Need to find the object that in fact blocks view, otherwise |
1291 | * stacking is a bit odd. |
1317 | * stacking is a bit odd. |
1292 | */ |
1318 | */ |
1293 | if (!(flag & INS_ON_TOP) && |
1319 | if (!(flag & INS_ON_TOP) |
1294 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1320 | && ms.flags () & P_BLOCKSVIEW |
|
|
1321 | && (op->face && !faces [op->face].visibility)) |
1295 | { |
1322 | { |
1296 | for (last = top; last != floor; last = last->below) |
1323 | for (last = top; last != floor; last = last->below) |
1297 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1324 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1298 | break; |
1325 | break; |
|
|
1326 | |
1299 | /* Check to see if we found the object that blocks view, |
1327 | /* Check to see if we found the object that blocks view, |
1300 | * and make sure we have a below pointer for it so that |
1328 | * and make sure we have a below pointer for it so that |
1301 | * we can get inserted below this one, which requires we |
1329 | * we can get inserted below this one, which requires we |
1302 | * set top to the object below us. |
1330 | * set top to the object below us. |
1303 | */ |
1331 | */ |
… | |
… | |
1305 | top = last->below; |
1333 | top = last->below; |
1306 | } |
1334 | } |
1307 | } /* If objects on this space */ |
1335 | } /* If objects on this space */ |
1308 | |
1336 | |
1309 | if (flag & INS_MAP_LOAD) |
1337 | if (flag & INS_MAP_LOAD) |
1310 | top = GET_MAP_TOP (op->map, op->x, op->y); |
1338 | top = ms.top; |
1311 | |
1339 | |
1312 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1340 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1313 | top = floor; |
1341 | top = floor; |
1314 | |
1342 | |
1315 | /* Top is the object that our object (op) is going to get inserted above. |
1343 | /* Top is the object that our object (op) is going to get inserted above. |
1316 | */ |
1344 | */ |
1317 | |
1345 | |
1318 | /* First object on this space */ |
1346 | /* First object on this space */ |
1319 | if (!top) |
1347 | if (!top) |
1320 | { |
1348 | { |
1321 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1349 | op->above = ms.bot; |
1322 | |
1350 | |
1323 | if (op->above) |
1351 | if (op->above) |
1324 | op->above->below = op; |
1352 | op->above->below = op; |
1325 | |
1353 | |
1326 | op->below = 0; |
1354 | op->below = 0; |
1327 | op->ms ().bot = op; |
1355 | ms.bot = op; |
1328 | } |
1356 | } |
1329 | else |
1357 | else |
1330 | { /* get inserted into the stack above top */ |
1358 | { /* get inserted into the stack above top */ |
1331 | op->above = top->above; |
1359 | op->above = top->above; |
1332 | |
1360 | |
… | |
… | |
1336 | op->below = top; |
1364 | op->below = top; |
1337 | top->above = op; |
1365 | top->above = op; |
1338 | } |
1366 | } |
1339 | |
1367 | |
1340 | if (!op->above) |
1368 | if (!op->above) |
1341 | op->ms ().top = op; |
1369 | ms.top = op; |
1342 | } /* else not INS_BELOW_ORIGINATOR */ |
1370 | } /* else not INS_BELOW_ORIGINATOR */ |
1343 | |
1371 | |
1344 | if (op->type == PLAYER) |
1372 | if (op->type == PLAYER) |
1345 | { |
1373 | { |
1346 | op->contr->do_los = 1; |
1374 | op->contr->do_los = 1; |
… | |
… | |
1352 | |
1380 | |
1353 | /* If we have a floor, we know the player, if any, will be above |
1381 | /* If we have a floor, we know the player, if any, will be above |
1354 | * it, so save a few ticks and start from there. |
1382 | * it, so save a few ticks and start from there. |
1355 | */ |
1383 | */ |
1356 | if (!(flag & INS_MAP_LOAD)) |
1384 | if (!(flag & INS_MAP_LOAD)) |
1357 | if (object *pl = op->ms ().player ()) |
1385 | if (object *pl = ms.player ()) |
1358 | if (pl->contr->ns) |
1386 | if (pl->contr->ns) |
1359 | pl->contr->ns->floorbox_update (); |
1387 | pl->contr->ns->floorbox_update (); |
1360 | |
1388 | |
1361 | /* If this object glows, it may affect lighting conditions that are |
1389 | /* If this object glows, it may affect lighting conditions that are |
1362 | * visible to others on this map. But update_all_los is really |
1390 | * visible to others on this map. But update_all_los is really |
… | |
… | |
1424 | } |
1452 | } |
1425 | |
1453 | |
1426 | object * |
1454 | object * |
1427 | object::insert_at (object *where, object *originator, int flags) |
1455 | object::insert_at (object *where, object *originator, int flags) |
1428 | { |
1456 | { |
1429 | where->map->insert (this, where->x, where->y, originator, flags); |
1457 | return where->map->insert (this, where->x, where->y, originator, flags); |
1430 | } |
1458 | } |
1431 | |
1459 | |
1432 | /* |
1460 | /* |
1433 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1461 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1434 | * is returned contains nr objects, and the remaining parts contains |
1462 | * is returned contains nr objects, and the remaining parts contains |
… | |
… | |
1474 | * the amount of an object. If the amount reaches 0, the object |
1502 | * the amount of an object. If the amount reaches 0, the object |
1475 | * is subsequently removed and freed. |
1503 | * is subsequently removed and freed. |
1476 | * |
1504 | * |
1477 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1505 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1478 | */ |
1506 | */ |
1479 | |
|
|
1480 | object * |
1507 | object * |
1481 | decrease_ob_nr (object *op, uint32 i) |
1508 | decrease_ob_nr (object *op, uint32 i) |
1482 | { |
1509 | { |
1483 | object *tmp; |
1510 | object *tmp; |
1484 | |
1511 | |
… | |
… | |
1559 | |
1586 | |
1560 | /* |
1587 | /* |
1561 | * add_weight(object, weight) adds the specified weight to an object, |
1588 | * add_weight(object, weight) adds the specified weight to an object, |
1562 | * and also updates how much the environment(s) is/are carrying. |
1589 | * and also updates how much the environment(s) is/are carrying. |
1563 | */ |
1590 | */ |
1564 | |
|
|
1565 | void |
1591 | void |
1566 | add_weight (object *op, signed long weight) |
1592 | add_weight (object *op, signed long weight) |
1567 | { |
1593 | { |
1568 | while (op != NULL) |
1594 | while (op != NULL) |
1569 | { |
1595 | { |
… | |
… | |
1601 | * inside the object environment. |
1627 | * inside the object environment. |
1602 | * |
1628 | * |
1603 | * The function returns now pointer to inserted item, and return value can |
1629 | * The function returns now pointer to inserted item, and return value can |
1604 | * be != op, if items are merged. -Tero |
1630 | * be != op, if items are merged. -Tero |
1605 | */ |
1631 | */ |
1606 | |
|
|
1607 | object * |
1632 | object * |
1608 | object::insert (object *op) |
1633 | object::insert (object *op) |
1609 | { |
1634 | { |
1610 | object *tmp, *otmp; |
1635 | object *tmp, *otmp; |
1611 | |
1636 | |
… | |
… | |
1771 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1796 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1772 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1797 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1773 | { |
1798 | { |
1774 | |
1799 | |
1775 | float |
1800 | float |
1776 | diff = tmp->move_slow_penalty * FABS (op->speed); |
1801 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1777 | |
1802 | |
1778 | if (op->type == PLAYER) |
1803 | if (op->type == PLAYER) |
1779 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1804 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1780 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1805 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1781 | diff /= 4.0; |
1806 | diff /= 4.0; |
… | |
… | |
1988 | } |
2013 | } |
1989 | |
2014 | |
1990 | if (!index) |
2015 | if (!index) |
1991 | return -1; |
2016 | return -1; |
1992 | |
2017 | |
1993 | return altern[RANDOM () % index]; |
2018 | return altern [rndm (index)]; |
1994 | } |
2019 | } |
1995 | |
2020 | |
1996 | /* |
2021 | /* |
1997 | * find_first_free_spot(archetype, maptile, x, y) works like |
2022 | * find_first_free_spot(archetype, maptile, x, y) works like |
1998 | * find_free_spot(), but it will search max number of squares. |
2023 | * find_free_spot(), but it will search max number of squares. |
… | |
… | |
2019 | { |
2044 | { |
2020 | arr += begin; |
2045 | arr += begin; |
2021 | end -= begin; |
2046 | end -= begin; |
2022 | |
2047 | |
2023 | while (--end) |
2048 | while (--end) |
2024 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2049 | swap (arr [end], arr [rndm (end + 1)]); |
2025 | } |
2050 | } |
2026 | |
2051 | |
2027 | /* new function to make monster searching more efficient, and effective! |
2052 | /* new function to make monster searching more efficient, and effective! |
2028 | * This basically returns a randomized array (in the passed pointer) of |
2053 | * This basically returns a randomized array (in the passed pointer) of |
2029 | * the spaces to find monsters. In this way, it won't always look for |
2054 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2341 | insert_ob_in_ob (object_create_clone (item), dst); |
2366 | insert_ob_in_ob (object_create_clone (item), dst); |
2342 | |
2367 | |
2343 | return dst; |
2368 | return dst; |
2344 | } |
2369 | } |
2345 | |
2370 | |
2346 | /* GROS - Creates an object using a string representing its content. */ |
|
|
2347 | /* Basically, we save the content of the string to a temp file, then call */ |
|
|
2348 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
|
|
2349 | /* but it was simple to make and allows reusing the load_object function. */ |
|
|
2350 | /* Remember not to use load_object_str in a time-critical situation. */ |
|
|
2351 | /* Also remember that multiparts objects are not supported for now. */ |
|
|
2352 | object * |
|
|
2353 | load_object_str (const char *obstr) |
|
|
2354 | { |
|
|
2355 | object *op; |
|
|
2356 | char filename[MAX_BUF]; |
|
|
2357 | |
|
|
2358 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
|
|
2359 | |
|
|
2360 | FILE *tempfile = fopen (filename, "w"); |
|
|
2361 | |
|
|
2362 | if (tempfile == NULL) |
|
|
2363 | { |
|
|
2364 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
|
|
2365 | return NULL; |
|
|
2366 | } |
|
|
2367 | |
|
|
2368 | fprintf (tempfile, obstr); |
|
|
2369 | fclose (tempfile); |
|
|
2370 | |
|
|
2371 | op = object::create (); |
|
|
2372 | |
|
|
2373 | object_thawer thawer (filename); |
|
|
2374 | |
|
|
2375 | if (thawer) |
|
|
2376 | load_object (thawer, op, 0); |
|
|
2377 | |
|
|
2378 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
|
|
2379 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
2380 | |
|
|
2381 | return op; |
|
|
2382 | } |
|
|
2383 | |
|
|
2384 | /* This returns the first object in who's inventory that |
2371 | /* This returns the first object in who's inventory that |
2385 | * has the same type and subtype match. |
2372 | * has the same type and subtype match. |
2386 | * returns NULL if no match. |
2373 | * returns NULL if no match. |
2387 | */ |
2374 | */ |
2388 | object * |
2375 | object * |
… | |
… | |
2441 | if (link->key == canonical_key) |
2428 | if (link->key == canonical_key) |
2442 | return link->value; |
2429 | return link->value; |
2443 | |
2430 | |
2444 | return 0; |
2431 | return 0; |
2445 | } |
2432 | } |
2446 | |
|
|
2447 | |
2433 | |
2448 | /* |
2434 | /* |
2449 | * Updates the canonical_key in op to value. |
2435 | * Updates the canonical_key in op to value. |
2450 | * |
2436 | * |
2451 | * canonical_key is a shared string (value doesn't have to be). |
2437 | * canonical_key is a shared string (value doesn't have to be). |
… | |
… | |
2591 | { |
2577 | { |
2592 | char flagdesc[512]; |
2578 | char flagdesc[512]; |
2593 | char info2[256 * 4]; |
2579 | char info2[256 * 4]; |
2594 | char *p = info; |
2580 | char *p = info; |
2595 | |
2581 | |
2596 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2582 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2597 | count, uuid.seq, |
2583 | count, uuid.seq, |
2598 | &name, |
2584 | &name, |
2599 | title ? "\",title:" : "", |
2585 | title ? "\",title:\"" : "", |
2600 | title ? (const char *)title : "", |
2586 | title ? (const char *)title : "", |
2601 | flag_desc (flagdesc, 512), type); |
2587 | flag_desc (flagdesc, 512), type); |
2602 | |
2588 | |
2603 | if (env) |
2589 | if (env) |
2604 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2590 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
… | |
… | |
2610 | } |
2596 | } |
2611 | |
2597 | |
2612 | const char * |
2598 | const char * |
2613 | object::debug_desc () const |
2599 | object::debug_desc () const |
2614 | { |
2600 | { |
2615 | static char info[256 * 4]; |
2601 | static char info[3][256 * 4]; |
|
|
2602 | static int info_idx; |
|
|
2603 | |
2616 | return debug_desc (info); |
2604 | return debug_desc (info [++info_idx % 3]); |
2617 | } |
2605 | } |
2618 | |
2606 | |
2619 | const char * |
2607 | struct region * |
2620 | object::debug_desc2 () const |
2608 | object::region () const |
2621 | { |
2609 | { |
2622 | static char info[256 * 4]; |
2610 | return map ? map->region (x, y) |
2623 | return debug_desc (info); |
2611 | : region::default_region (); |
2624 | } |
2612 | } |
2625 | |
2613 | |
|
|
2614 | const materialtype_t * |
|
|
2615 | object::dominant_material () const |
|
|
2616 | { |
|
|
2617 | if (materialtype_t *mat = name_to_material (materialname)) |
|
|
2618 | return mat; |
|
|
2619 | |
|
|
2620 | // omfg this is slow, this has to be temporary :) |
|
|
2621 | shstr unknown ("unknown"); |
|
|
2622 | |
|
|
2623 | return name_to_material (unknown); |
|
|
2624 | } |
|
|
2625 | |
|
|
2626 | void |
|
|
2627 | object::open_container (object *new_container) |
|
|
2628 | { |
|
|
2629 | if (container == new_container) |
|
|
2630 | return; |
|
|
2631 | |
|
|
2632 | if (object *old_container = container) |
|
|
2633 | { |
|
|
2634 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
|
|
2635 | return; |
|
|
2636 | |
|
|
2637 | #if 0 |
|
|
2638 | // remove the "Close old_container" object. |
|
|
2639 | if (object *closer = old_container->inv) |
|
|
2640 | if (closer->type == CLOSE_CON) |
|
|
2641 | closer->destroy (); |
|
|
2642 | #endif |
|
|
2643 | |
|
|
2644 | old_container->flag [FLAG_APPLIED] = 0; |
|
|
2645 | container = 0; |
|
|
2646 | |
|
|
2647 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2648 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2649 | } |
|
|
2650 | |
|
|
2651 | if (new_container) |
|
|
2652 | { |
|
|
2653 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
|
|
2654 | return; |
|
|
2655 | |
|
|
2656 | // TODO: this does not seem to serve any purpose anymore? |
|
|
2657 | #if 0 |
|
|
2658 | // insert the "Close Container" object. |
|
|
2659 | if (archetype *closer = new_container->other_arch) |
|
|
2660 | { |
|
|
2661 | object *closer = arch_to_object (new_container->other_arch); |
|
|
2662 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
|
|
2663 | new_container->insert (closer); |
|
|
2664 | } |
|
|
2665 | #endif |
|
|
2666 | |
|
|
2667 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
|
|
2668 | |
|
|
2669 | new_container->flag [FLAG_APPLIED] = 1; |
|
|
2670 | container = new_container; |
|
|
2671 | |
|
|
2672 | esrv_update_item (UPD_FLAGS, this, new_container); |
|
|
2673 | esrv_send_inventory (this, new_container); |
|
|
2674 | } |
|
|
2675 | } |
|
|
2676 | |
|
|
2677 | |