ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.256 by root, Sun Aug 31 05:47:14 2008 UTC

… …
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. */
141static bool 141static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 142compare_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. */
174static bool 159static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_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 *
… …
200 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
201 || ob1->value != ob2->value 187 || ob1->value != ob2->value
202 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
203 return 0; 189 return 0;
204 190
205 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow, assume nrof
206 * for unsigned overflow (2c), second part checks whether the result 192 * is always 0 .. 2**31-1 */
207 * would fit into a 32 bit signed int, which is often used to hold 193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
208 * nrof values.
209 */
210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211 return 0; 194 return 0;
212 195
213 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
214 * This is to the comparison of the flags below will be OK. We 197 * This is to the comparison of the flags below will be OK. We
215 * just can't ignore the been applied or identified flags, as they 198 * just can't ignore the been applied or identified flags, as they
… …
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 203 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 204
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224 207
225 if (ob1->arch->name != ob2->arch->name 208 if (ob1->arch->archname != ob2->arch->archname
226 || ob1->name != ob2->name 209 || ob1->name != ob2->name
227 || ob1->title != ob2->title 210 || ob1->title != ob2->title
228 || ob1->msg != ob2->msg 211 || ob1->msg != ob2->msg
229 || ob1->weight != ob2->weight 212 || ob1->weight != ob2->weight
230 || ob1->attacktype != ob2->attacktype 213 || ob1->attacktype != ob2->attacktype
231 || ob1->magic != ob2->magic 214 || ob1->magic != ob2->magic
232 || ob1->slaying != ob2->slaying 215 || ob1->slaying != ob2->slaying
233 || ob1->skill != ob2->skill 216 || ob1->skill != ob2->skill
234 || ob1->value != ob2->value 217 || ob1->value != ob2->value
235 || ob1->animation_id != ob2->animation_id 218 || ob1->animation_id != ob2->animation_id
219 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236 || ob1->client_type != ob2->client_type 220 || ob1->client_type != ob2->client_type
237 || ob1->materialname != ob2->materialname 221 || ob1->materialname != ob2->materialname
238 || ob1->lore != ob2->lore 222 || ob1->lore != ob2->lore
239 || ob1->subtype != ob2->subtype 223 || ob1->subtype != ob2->subtype
240 || ob1->move_type != ob2->move_type 224 || ob1->move_type != ob2->move_type
… …
248 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249 return 0; 233 return 0;
250 234
251 if ((ob1->flag ^ ob2->flag) 235 if ((ob1->flag ^ ob2->flag)
252 .reset (FLAG_INV_LOCKED) 236 .reset (FLAG_INV_LOCKED)
253 .reset (FLAG_CLIENT_SENT)
254 .reset (FLAG_REMOVED) 237 .reset (FLAG_REMOVED)
255 .any ()) 238 .any ())
256 return 0; 239 return 0;
257 240
258 /* This is really a spellbook check - we should in general 241 /* This is really a spellbook check - we should in general
… …
330 313
331 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
332 return 1; 315 return 1;
333} 316}
334 317
318// find player who can see this object
319object *
320object::visible_to () const
321{
322 if (client_visible () && !flag [FLAG_REMOVED])
323 {
324 // see if we are in a container of sorts
325 if (env)
326 {
327 // the player inventory itself is always visible
328 if (env->type == PLAYER)
329 return env;
330
331 // else a player could have our env open
332 object *envest = env->outer_env ();
333
334 // the player itself is always on a map, so we will find him here
335 // even if our inv is in a player.
336 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ())
338 if (pl->container == env)
339 return pl;
340 }
341 else
342 {
343 // maybe there is a player standing on the same mapspace
344 // this will catch the case where "this" is a player
345 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
347 || this == pl->container)
348 return pl;
349 }
350 }
351
352 return 0;
353}
354
335// adjust weight per container type ("of holding") 355// adjust weight per container type ("of holding")
336static sint32 356static sint32
337weight_adjust (object *op, sint32 weight) 357weight_adjust_for (object *op, sint32 weight)
338{ 358{
339 return op->type == CONTAINER 359 return op->type == CONTAINER
340 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 360 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
341 : weight; 361 : weight;
342} 362}
… …
348static void 368static void
349adjust_weight (object *op, sint32 weight) 369adjust_weight (object *op, sint32 weight)
350{ 370{
351 while (op) 371 while (op)
352 { 372 {
373 // adjust by actual difference to account for rounding errors
374 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
353 weight = weight_adjust (op, weight); 375 weight = weight_adjust_for (op, op->carrying)
376 - weight_adjust_for (op, op->carrying - weight);
354 377
355 if (!weight) 378 if (!weight)
356 return; 379 return;
357 380
358 op->carrying += weight; 381 op->carrying += weight;
359 382
360 if (object *pl = op->visible_to ()) 383 if (object *pl = op->visible_to ())
384 if (pl != op) // player is handled lazily
361 esrv_update_item (UPD_WEIGHT, pl, op); 385 esrv_update_item (UPD_WEIGHT, pl, op);
362 386
363 op = op->env; 387 op = op->env;
364 } 388 }
365} 389}
366 390
… …
380 op->update_weight (); 404 op->update_weight ();
381 405
382 sum += op->total_weight (); 406 sum += op->total_weight ();
383 } 407 }
384 408
385 sum = weight_adjust (this, sum); 409 sum = weight_adjust_for (this, sum);
386 410
387 if (sum != carrying) 411 if (sum != carrying)
388 { 412 {
389 carrying = sum; 413 carrying = sum;
390 414
391 if (object *pl = visible_to ()) 415 if (object *pl = visible_to ())
416 if (pl != this) // player is handled lazily
392 esrv_update_item (UPD_WEIGHT, pl, this); 417 esrv_update_item (UPD_WEIGHT, pl, this);
393 } 418 }
394} 419}
395 420
396/* 421/*
397 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 422 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
… …
451 */ 476 */
452object * 477object *
453find_object_name (const char *str) 478find_object_name (const char *str)
454{ 479{
455 shstr_cmp str_ (str); 480 shstr_cmp str_ (str);
456 object *op;
457 481
482 if (str_)
458 for_all_objects (op) 483 for_all_objects (op)
459 if (op->name == str_) 484 if (op->name == str_)
460 break; 485 return op;
461 486
462 return op; 487 return 0;
463} 488}
464 489
465/* 490/*
466 * Sets the owner and sets the skill and exp pointers to owner's current 491 * Sets the owner and sets the skill and exp pointers to owner's current
467 * skill and experience objects. 492 * skill and experience objects.
… …
565 } 590 }
566 591
567 op->key_values = 0; 592 op->key_values = 0;
568} 593}
569 594
570object & 595/*
571object::operator =(const object &src) 596 * copy_to first frees everything allocated by the dst object,
597 * and then copies the contents of itself into the second
598 * object, allocating what needs to be allocated. Basically, any
599 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
600 * if the first object is freed, the pointers in the new object
601 * will point at garbage.
602 */
603void
604object::copy_to (object *dst)
572{ 605{
573 bool is_freed = flag [FLAG_FREED]; 606 dst->remove ();
574 bool is_removed = flag [FLAG_REMOVED];
575
576 *(object_copy *)this = src; 607 *(object_copy *)dst = *this;
577
578 flag [FLAG_FREED] = is_freed;
579 flag [FLAG_REMOVED] = is_removed; 608 dst->flag [FLAG_REMOVED] = true;
580 609
581 /* Copy over key_values, if any. */ 610 /* Copy over key_values, if any. */
582 if (src.key_values) 611 if (key_values)
583 { 612 {
584 key_value *tail = 0; 613 key_value *tail = 0;
585 key_values = 0; 614 dst->key_values = 0;
586 615
587 for (key_value *i = src.key_values; i; i = i->next) 616 for (key_value *i = key_values; i; i = i->next)
588 { 617 {
589 key_value *new_link = new key_value; 618 key_value *new_link = new key_value;
590 619
591 new_link->next = 0; 620 new_link->next = 0;
592 new_link->key = i->key; 621 new_link->key = i->key;
593 new_link->value = i->value; 622 new_link->value = i->value;
594 623
595 /* Try and be clever here, too. */ 624 /* Try and be clever here, too. */
596 if (!key_values) 625 if (!dst->key_values)
597 { 626 {
598 key_values = new_link; 627 dst->key_values = new_link;
599 tail = new_link; 628 tail = new_link;
600 } 629 }
601 else 630 else
602 { 631 {
603 tail->next = new_link; 632 tail->next = new_link;
604 tail = new_link; 633 tail = new_link;
605 } 634 }
606 } 635 }
607 } 636 }
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 */
618void
619object::copy_to (object *dst)
620{
621 *dst = *this;
622 637
623 if (speed < 0) 638 if (speed < 0)
624 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
625 640
626 dst->set_speed (dst->speed); 641 dst->activate ();
627} 642}
628 643
629void 644void
630object::instantiate () 645object::instantiate ()
631{ 646{
… …
648object * 663object *
649object::clone () 664object::clone ()
650{ 665{
651 object *neu = create (); 666 object *neu = create ();
652 copy_to (neu); 667 copy_to (neu);
668 neu->map = map; // not copied by copy_to
653 return neu; 669 return neu;
654} 670}
655 671
656/* 672/*
657 * If an object with the IS_TURNABLE() flag needs to be turned due 673 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
708 * UP_OBJ_FACE: only the objects face has changed. 724 * UP_OBJ_FACE: only the objects face has changed.
709 */ 725 */
710void 726void
711update_object (object *op, int action) 727update_object (object *op, int action)
712{ 728{
713 if (op == NULL) 729 if (!op)
714 { 730 {
715 /* this should never happen */ 731 /* this should never happen */
716 LOG (llevDebug, "update_object() called for NULL object.\n"); 732 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
717 return; 733 return;
718 } 734 }
719 735
720 if (op->env) 736 if (!op->is_on_map ())
721 { 737 {
722 /* Animation is currently handled by client, so nothing 738 /* Animation is currently handled by client, so nothing
723 * to do in this case. 739 * to do in this case.
724 */ 740 */
725 return; 741 return;
726 } 742 }
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 743
734 /* make sure the object is within map boundaries */ 744 /* 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) 745 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
736 { 746 {
737 LOG (llevError, "update_object() called for object out of map!\n"); 747 LOG (llevError, "update_object() called for object out of map!\n");
… …
756 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
757 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
758 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
759 || (m.move_slow | op->move_slow) != m.move_slow 769 || (m.move_slow | op->move_slow) != m.move_slow
760 /* This isn't perfect, but I don't expect a lot of objects to 770 /* This isn't perfect, but I don't expect a lot of objects to
761 * to have move_allow right now. 771 * have move_allow right now.
762 */ 772 */
763 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
764 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
765 m.flags_ = 0; 775 m.flags_ = 0;
766 } 776 }
… …
820{ 830{
821 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
822 if (active) 832 if (active)
823 return; 833 return;
824 834
835 if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836
825 if (has_active_speed ()) 837 if (has_active_speed ())
826 actives.insert (this); 838 actives.insert (this);
827} 839}
828 840
829void 841void
… …
880object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
881{ 893{
882 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
883 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
884 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
885 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
886 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
887 if (!inv) 899 if (!inv)
888 return; 900 return;
889 901
890 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
… …
892 * drop on that space. 904 * drop on that space.
893 */ 905 */
894 if (!drop_to_ground 906 if (!drop_to_ground
895 || !map 907 || !map
896 || map->in_memory != MAP_ACTIVE 908 || map->in_memory != MAP_ACTIVE
897 || map->nodrop 909 || map->no_drop
898 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
899 { 911 {
900 while (inv) 912 while (inv)
901 {
902 inv->destroy_inv (drop_to_ground);
903 inv->destroy (); 913 inv->destroy (true);
904 }
905 } 914 }
906 else 915 else
907 { /* Put objects in inventory onto this space */ 916 { /* Put objects in inventory onto this space */
908 while (inv) 917 while (inv)
909 { 918 {
… …
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
941static 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 no_drop = 1;
950 no_reset = 1;
951
952 alloc ();
953 in_memory = MAP_ACTIVE;
954 }
955
956 ~freed_map ()
957 {
958 destroy ();
959 }
960} freed_map; // freed objects are moved here to avoid crashes
961
932void 962void
933object::do_destroy () 963object::do_destroy ()
934{ 964{
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]) 965 if (flag [FLAG_IS_LINKED])
941 remove_button_link (this); 966 remove_button_link (this);
942 967
943 if (flag [FLAG_FRIENDLY]) 968 if (flag [FLAG_FRIENDLY])
944 remove_friendly_object (this); 969 remove_friendly_object (this);
945 970
946 if (!flag [FLAG_REMOVED])
947 remove (); 971 remove ();
948 972
949 destroy_inv (true); 973 attachable::do_destroy ();
950 974
951 deactivate (); 975 deactivate ();
952 unlink (); 976 unlink ();
953 977
954 flag [FLAG_FREED] = 1; 978 flag [FLAG_FREED] = 1;
955 979
956 // hack to ensure that freed objects still have a valid map 980 // 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; 981 map = &freed_map;
975 x = 1; 982 x = 1;
976 y = 1; 983 y = 1;
977 }
978 984
979 if (more) 985 if (more)
980 { 986 {
981 more->destroy (); 987 more->destroy ();
982 more = 0; 988 more = 0;
… …
995object::destroy (bool destroy_inventory) 1001object::destroy (bool destroy_inventory)
996{ 1002{
997 if (destroyed ()) 1003 if (destroyed ())
998 return; 1004 return;
999 1005
1006 if (!is_head () && !head->destroyed ())
1007 {
1008 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1009 head->destroy (destroy_inventory);
1010 return;
1011 }
1012
1000 if (destroy_inventory) 1013 destroy_inv (!destroy_inventory);
1001 destroy_inv (false);
1002 1014
1003 if (is_head ()) 1015 if (is_head ())
1004 if (sound_destroy) 1016 if (sound_destroy)
1005 play_sound (sound_destroy); 1017 play_sound (sound_destroy);
1006 else if (flag [FLAG_MONSTER]) 1018 else if (flag [FLAG_MONSTER])
… …
1020object::do_remove () 1032object::do_remove ()
1021{ 1033{
1022 object *tmp, *last = 0; 1034 object *tmp, *last = 0;
1023 object *otmp; 1035 object *otmp;
1024 1036
1025 if (QUERY_FLAG (this, FLAG_REMOVED)) 1037 if (flag [FLAG_REMOVED])
1026 return; 1038 return;
1027 1039
1028 SET_FLAG (this, FLAG_REMOVED);
1029 INVOKE_OBJECT (REMOVE, this); 1040 INVOKE_OBJECT (REMOVE, this);
1041
1042 flag [FLAG_REMOVED] = true;
1030 1043
1031 if (more) 1044 if (more)
1032 more->remove (); 1045 more->remove ();
1033 1046
1034 /* 1047 /*
1035 * In this case, the object to be removed is in someones 1048 * In this case, the object to be removed is in someones
1036 * inventory. 1049 * inventory.
1037 */ 1050 */
1038 if (env) 1051 if (env)
1039 { 1052 {
1053 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1054 if (object *pl = visible_to ())
1055 esrv_del_item (pl->contr, count);
1056 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1057
1040 adjust_weight (env, -total_weight ()); 1058 adjust_weight (env, -total_weight ());
1041
1042 *(above ? &above->below : &env->inv) = below;
1043
1044 if (below)
1045 below->above = above;
1046 1059
1047 /* we set up values so that it could be inserted into 1060 /* we set up values so that it could be inserted into
1048 * the map, but we don't actually do that - it is up 1061 * the map, but we don't actually do that - it is up
1049 * to the caller to decide what we want to do. 1062 * to the caller to decide what we want to do.
1050 */ 1063 */
1051 map = env->map; 1064 map = env->map;
1052 x = env->x; 1065 x = env->x;
1053 y = env->y; 1066 y = env->y;
1067
1068 // make sure cmov optimisation is applicable
1069 *(above ? &above->below : &env->inv) = below;
1070 *(below ? &below->above : &above ) = above; // &above is just a dummy
1071
1054 above = 0; 1072 above = 0;
1055 below = 0; 1073 below = 0;
1056 env = 0; 1074 env = 0;
1057 1075
1058 /* NO_FIX_PLAYER is set when a great many changes are being 1076 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1062 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1080 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063 otmp->update_stats (); 1081 otmp->update_stats ();
1064 } 1082 }
1065 else if (map) 1083 else if (map)
1066 { 1084 {
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; 1085 map->dirty = true;
1080 mapspace &ms = this->ms (); 1086 mapspace &ms = this->ms ();
1081 1087
1088 if (object *pl = ms.player ())
1089 {
1090 if (type == PLAYER) // this == pl(!)
1091 {
1092 // leaving a spot always closes any open container on the ground
1093 if (container && !container->env)
1094 // this causes spurious floorbox updates, but it ensures
1095 // that the CLOSE event is being sent.
1096 close_container ();
1097
1098 --map->players;
1099 map->touch ();
1100 }
1101 else if (pl->container == this)
1102 {
1103 // removing a container should close it
1104 close_container ();
1105 }
1106
1107 esrv_del_item (pl->contr, count);
1108 }
1109
1082 /* link the object above us */ 1110 /* link the object above us */
1083 if (above) 1111 // re-link, make sure compiler can easily use cmove
1084 above->below = below; 1112 *(above ? &above->below : &ms.top) = below;
1085 else 1113 *(below ? &below->above : &ms.bot) = above;
1086 ms.top = below; /* we were top, set new top */
1087
1088 /* Relink the object below us, if there is one */
1089 if (below)
1090 below->above = above;
1091 else
1092 {
1093 /* Nothing below, which means we need to relink map object for this space
1094 * use translated coordinates in case some oddness with map tiling is
1095 * evident
1096 */
1097 if (GET_MAP_OB (map, x, y) != this)
1098 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 ());
1099
1100 ms.bot = above; /* goes on above it. */
1101 }
1102 1114
1103 above = 0; 1115 above = 0;
1104 below = 0; 1116 below = 0;
1117
1118 ms.flags_ = 0;
1105 1119
1106 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
1107 return; 1121 return;
1108 1122
1109 int check_walk_off = !flag [FLAG_NO_APPLY]; 1123 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1115 * removed (most likely destroyed), update the player view 1129 * removed (most likely destroyed), update the player view
1116 * appropriately. 1130 * appropriately.
1117 */ 1131 */
1118 pl->close_container (); 1132 pl->close_container ();
1119 1133
1134 //TODO: the floorbox prev/next might need updating
1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns)
1120 pl->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1121 } 1139 }
1122 1140
1123 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1124 { 1142 {
1125 /* No point updating the players look faces if he is the object 1143 /* No point updating the players look faces if he is the object
… …
1138 } 1156 }
1139 1157
1140 last = tmp; 1158 last = tmp;
1141 } 1159 }
1142 1160
1143 /* last == NULL if there are no objects on this space */
1144 //TODO: this makes little sense, why only update the topmost object?
1145 if (!last)
1146 map->at (x, y).flags_ = 0;
1147 else
1148 update_object (last, UP_OBJ_REMOVE);
1149
1150 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1161 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1151 update_all_los (map, x, y); 1162 update_all_los (map, x, y);
1152 } 1163 }
1153} 1164}
1154 1165
… …
1169 if (!top) 1180 if (!top)
1170 for (top = op; top && top->above; top = top->above) 1181 for (top = op; top && top->above; top = top->above)
1171 ; 1182 ;
1172 1183
1173 for (; top; top = top->below) 1184 for (; top; top = top->below)
1174 {
1175 if (top == op)
1176 continue;
1177
1178 if (object::can_merge (op, top)) 1185 if (object::can_merge (op, top))
1179 { 1186 {
1180 top->nrof += op->nrof; 1187 top->nrof += op->nrof;
1181 1188
1182/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1189 if (object *pl = top->visible_to ())
1183 op->weight = 0; /* Don't want any adjustements now */ 1190 esrv_update_item (UPD_NROF, pl, top);
1191
1192 op->weight = 0; // cancel the addition above
1193 op->carrying = 0; // must be 0 already
1194
1184 op->destroy (); 1195 op->destroy (1);
1196
1185 return top; 1197 return top;
1186 } 1198 }
1187 }
1188 1199
1189 return 0; 1200 return 0;
1190} 1201}
1191 1202
1192void 1203void
… …
1217 * job preparing multi-part monsters. 1228 * job preparing multi-part monsters.
1218 */ 1229 */
1219object * 1230object *
1220insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1231insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1221{ 1232{
1233 op->remove ();
1234
1222 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1235 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1223 { 1236 {
1224 tmp->x = x + tmp->arch->x; 1237 tmp->x = x + tmp->arch->x;
1225 tmp->y = y + tmp->arch->y; 1238 tmp->y = y + tmp->arch->y;
1226 } 1239 }
… …
1249 * just 'op' otherwise 1262 * just 'op' otherwise
1250 */ 1263 */
1251object * 1264object *
1252insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1253{ 1266{
1254 assert (!op->flag [FLAG_FREED]); 1267 if (op->is_on_map ())
1268 {
1269 LOG (llevError, "insert_ob_in_map called for object already on map");
1270 abort ();
1271 }
1255 1272
1256 object *top, *floor = NULL; 1273 if (op->env)
1257 1274 {
1275 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1258 op->remove (); 1276 op->remove ();
1277 }
1278
1279 if (op->face && !face_info (op->face))//D TODO: remove soon
1280 {//D
1281 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1282 op->face = 1;//D
1283 }//D
1259 1284
1260 /* Ideally, the caller figures this out. However, it complicates a lot 1285 /* 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 1286 * of areas of callers (eg, anything that uses find_free_spot would now
1262 * need extra work 1287 * need extra work
1263 */ 1288 */
1264 if (!xy_normalise (m, op->x, op->y)) 1289 if (!xy_normalise (m, op->x, op->y))
1265 { 1290 {
1266 op->destroy (); 1291 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1267 return 0; 1292 return 0;
1268 } 1293 }
1269 1294
1270 if (object *more = op->more) 1295 if (object *more = op->more)
1271 if (!insert_ob_in_map (more, m, originator, flag)) 1296 if (!insert_ob_in_map (more, m, originator, flag))
… …
1280 */ 1305 */
1281 if (op->nrof && !(flag & INS_NO_MERGE)) 1306 if (op->nrof && !(flag & INS_NO_MERGE))
1282 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1307 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283 if (object::can_merge (op, tmp)) 1308 if (object::can_merge (op, tmp))
1284 { 1309 {
1310 // TODO: we actually want to update tmp, not op,
1311 // but some caller surely breaks when we return tmp
1312 // from here :/
1285 op->nrof += tmp->nrof; 1313 op->nrof += tmp->nrof;
1286 tmp->destroy (1); 1314 tmp->destroy (1);
1287 } 1315 }
1288 1316
1289 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1317 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1298 { 1326 {
1299 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1327 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1300 abort (); 1328 abort ();
1301 } 1329 }
1302 1330
1331 if (!originator->is_on_map ())
1332 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333 op->debug_desc (), originator->debug_desc ());
1334
1303 op->above = originator; 1335 op->above = originator;
1304 op->below = originator->below; 1336 op->below = originator->below;
1305
1306 if (op->below)
1307 op->below->above = op;
1308 else
1309 ms.bot = op;
1310
1311 /* since *below* originator, no need to update top */
1312 originator->below = op; 1337 originator->below = op;
1338
1339 *(op->below ? &op->below->above : &ms.bot) = op;
1313 } 1340 }
1314 else 1341 else
1315 { 1342 {
1316 top = ms.bot; 1343 object *floor = 0;
1344 object *top = ms.top;
1317 1345
1318 /* If there are other objects, then */ 1346 /* If there are other objects, then */
1319 if (top) 1347 if (top)
1320 { 1348 {
1321 object *last = 0;
1322
1323 /* 1349 /*
1324 * If there are multiple objects on this space, we do some trickier handling. 1350 * If there are multiple objects on this space, we do some trickier handling.
1325 * We've already dealt with merging if appropriate. 1351 * We've already dealt with merging if appropriate.
1326 * Generally, we want to put the new object on top. But if 1352 * Generally, we want to put the new object on top. But if
1327 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1353 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1330 * once we get to them. This reduces the need to traverse over all of 1356 * once we get to them. This reduces the need to traverse over all of
1331 * them when adding another one - this saves quite a bit of cpu time 1357 * them when adding another one - this saves quite a bit of cpu time
1332 * when lots of spells are cast in one area. Currently, it is presumed 1358 * when lots of spells are cast in one area. Currently, it is presumed
1333 * that flying non pickable objects are spell objects. 1359 * that flying non pickable objects are spell objects.
1334 */ 1360 */
1335 for (top = ms.bot; top; top = top->above) 1361 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1336 { 1362 {
1337 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1363 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1338 floor = top; 1364 floor = tmp;
1339 1365
1340 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1366 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1341 { 1367 {
1342 /* We insert above top, so we want this object below this */ 1368 /* We insert above top, so we want this object below this */
1343 top = top->below; 1369 top = tmp->below;
1344 break; 1370 break;
1345 } 1371 }
1346 1372
1347 last = top; 1373 top = tmp;
1348 } 1374 }
1349
1350 /* Don't want top to be NULL, so set it to the last valid object */
1351 top = last;
1352 1375
1353 /* We let update_position deal with figuring out what the space 1376 /* We let update_position deal with figuring out what the space
1354 * looks like instead of lots of conditions here. 1377 * looks like instead of lots of conditions here.
1355 * makes things faster, and effectively the same result. 1378 * makes things faster, and effectively the same result.
1356 */ 1379 */
… …
1363 */ 1386 */
1364 if (!(flag & INS_ON_TOP) 1387 if (!(flag & INS_ON_TOP)
1365 && ms.flags () & P_BLOCKSVIEW 1388 && ms.flags () & P_BLOCKSVIEW
1366 && (op->face && !faces [op->face].visibility)) 1389 && (op->face && !faces [op->face].visibility))
1367 { 1390 {
1391 object *last;
1392
1368 for (last = top; last != floor; last = last->below) 1393 for (last = top; last != floor; last = last->below)
1369 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1394 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1370 break; 1395 break;
1371 1396
1372 /* Check to see if we found the object that blocks view, 1397 /* Check to see if we found the object that blocks view,
… …
1380 } /* If objects on this space */ 1405 } /* If objects on this space */
1381 1406
1382 if (flag & INS_ABOVE_FLOOR_ONLY) 1407 if (flag & INS_ABOVE_FLOOR_ONLY)
1383 top = floor; 1408 top = floor;
1384 1409
1385 /* Top is the object that our object (op) is going to get inserted above. 1410 // insert object above top, or bottom-most if top = 0
1386 */
1387
1388 /* First object on this space */
1389 if (!top) 1411 if (!top)
1390 { 1412 {
1413 op->below = 0;
1391 op->above = ms.bot; 1414 op->above = ms.bot;
1392
1393 if (op->above)
1394 op->above->below = op;
1395
1396 op->below = 0;
1397 ms.bot = op; 1415 ms.bot = op;
1416
1417 *(op->above ? &op->above->below : &ms.top) = op;
1398 } 1418 }
1399 else 1419 else
1400 { /* get inserted into the stack above top */ 1420 {
1401 op->above = top->above; 1421 op->above = top->above;
1402
1403 if (op->above)
1404 op->above->below = op; 1422 top->above = op;
1405 1423
1406 op->below = top; 1424 op->below = top;
1407 top->above = op; 1425 *(op->above ? &op->above->below : &ms.top) = op;
1408 } 1426 }
1409 1427 }
1410 if (!op->above)
1411 ms.top = op;
1412 } /* else not INS_BELOW_ORIGINATOR */
1413 1428
1414 if (op->type == PLAYER) 1429 if (op->type == PLAYER)
1415 { 1430 {
1416 op->contr->do_los = 1; 1431 op->contr->do_los = 1;
1417 ++op->map->players; 1432 ++op->map->players;
… …
1419 } 1434 }
1420 1435
1421 op->map->dirty = true; 1436 op->map->dirty = true;
1422 1437
1423 if (object *pl = ms.player ()) 1438 if (object *pl = ms.player ())
1439 //TODO: the floorbox prev/next might need updating
1440 //esrv_send_item (pl, op);
1441 //TODO: update floorbox to preserve ordering
1442 if (pl->contr->ns)
1424 pl->contr->ns->floorbox_update (); 1443 pl->contr->ns->floorbox_update ();
1425 1444
1426 /* If this object glows, it may affect lighting conditions that are 1445 /* If this object glows, it may affect lighting conditions that are
1427 * visible to others on this map. But update_all_los is really 1446 * 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 1447 * 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 1448 * on the map will get recalculated. The players could very well
… …
1494 return where->env->insert (this); 1513 return where->env->insert (this);
1495 else 1514 else
1496 return where->map->insert (this, where->x, where->y, originator, flags); 1515 return where->map->insert (this, where->x, where->y, originator, flags);
1497} 1516}
1498 1517
1499// find player who can see this object
1500object *
1501object::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/* 1518/*
1535 * decrease(object, number) decreases a specified number from 1519 * decrease(object, number) decreases a specified number from
1536 * the amount of an object. If the amount reaches 0, the object 1520 * the amount of an object. If the amount reaches 0, the object
1537 * is subsequently removed and freed. 1521 * is subsequently removed and freed.
1538 * 1522 *
… …
1544 if (!nr) 1528 if (!nr)
1545 return true; 1529 return true;
1546 1530
1547 nr = min (nr, nrof); 1531 nr = min (nr, nrof);
1548 1532
1533 if (nrof > nr)
1534 {
1549 nrof -= nr; 1535 nrof -= nr;
1550
1551 if (nrof)
1552 {
1553 adjust_weight (env, -weight * nr); // carrying == 0 1536 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554 1537
1555 if (object *pl = visible_to ()) 1538 if (object *pl = visible_to ())
1556 esrv_update_item (UPD_NROF, pl, this); 1539 esrv_update_item (UPD_NROF, pl, this);
1557 1540
1558 return true; 1541 return true;
1559 } 1542 }
1560 else 1543 else
1561 { 1544 {
1562 destroy (1); 1545 destroy ();
1563 return false; 1546 return false;
1564 } 1547 }
1565} 1548}
1566 1549
1567/* 1550/*
… …
1584 } 1567 }
1585 else 1568 else
1586 { 1569 {
1587 decrease (nr); 1570 decrease (nr);
1588 1571
1589 object *op = object_create_clone (this); 1572 object *op = deep_clone ();
1590 op->nrof = nr; 1573 op->nrof = nr;
1591 return op; 1574 return op;
1592 } 1575 }
1593} 1576}
1594 1577
… …
1638 if (object::can_merge (tmp, op)) 1621 if (object::can_merge (tmp, op))
1639 { 1622 {
1640 /* return the original object and remove inserted object 1623 /* return the original object and remove inserted object
1641 (client needs the original object) */ 1624 (client needs the original object) */
1642 tmp->nrof += op->nrof; 1625 tmp->nrof += op->nrof;
1626
1627 if (object *pl = tmp->visible_to ())
1628 esrv_update_item (UPD_NROF, pl, tmp);
1629
1643 adjust_weight (this, op->total_weight ()); 1630 adjust_weight (this, op->total_weight ());
1644 1631
1645 op->destroy (1); 1632 op->destroy (1);
1646 op = tmp; 1633 op = tmp;
1647 goto inserted; 1634 goto inserted;
… …
1661 1648
1662 inv = op; 1649 inv = op;
1663 1650
1664 op->flag [FLAG_REMOVED] = 0; 1651 op->flag [FLAG_REMOVED] = 0;
1665 1652
1653 if (object *pl = op->visible_to ())
1654 esrv_send_item (pl, op);
1655
1666 adjust_weight (this, op->total_weight ()); 1656 adjust_weight (this, op->total_weight ());
1667 1657
1668inserted: 1658inserted:
1669 /* reset the light list and los of the players on the map */ 1659 /* reset the light list and los of the players on the map */
1670 if (op->glow_radius && map && map->darkness) 1660 if (op->glow_radius && map && map->darkness)
1671 update_all_los (map, x, y); 1661 update_all_los (map, x, y);
1672 1662
1673 if (object *otmp = in_player ()) 1663 // if this is a player's inventory, update stats
1674 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1664 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675 otmp->update_stats (); 1665 update_stats ();
1676 1666
1677 INVOKE_OBJECT (INSERT, this); 1667 INVOKE_OBJECT (INSERT, this);
1678 1668
1679 return op; 1669 return op;
1680} 1670}
… …
1808 LOG (llevError, "Present_arch called outside map.\n"); 1798 LOG (llevError, "Present_arch called outside map.\n");
1809 return NULL; 1799 return NULL;
1810 } 1800 }
1811 1801
1812 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1802 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1813 if (tmp->arch == at) 1803 if (tmp->arch->archname == at->archname)
1814 return tmp; 1804 return tmp;
1815 1805
1816 return NULL; 1806 return NULL;
1817} 1807}
1818 1808
… …
1882 * The first matching object is returned, or NULL if none. 1872 * The first matching object is returned, or NULL if none.
1883 */ 1873 */
1884object * 1874object *
1885present_arch_in_ob (const archetype *at, const object *op) 1875present_arch_in_ob (const archetype *at, const object *op)
1886{ 1876{
1887 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1877 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1888 if (tmp->arch == at) 1878 if (tmp->arch->archname == at->archname)
1889 return tmp; 1879 return tmp;
1890 1880
1891 return NULL; 1881 return NULL;
1892} 1882}
1893 1883
… …
2302 2292
2303/* 2293/*
2304 * create clone from object to another 2294 * create clone from object to another
2305 */ 2295 */
2306object * 2296object *
2307object_create_clone (object *asrc) 2297object::deep_clone ()
2308{ 2298{
2309 object *dst = 0, *tmp, *src, *prev, *item; 2299 assert (("deep_clone called on non-head object", is_head ()));
2310 2300
2311 if (!asrc) 2301 object *dst = clone ();
2312 return 0;
2313 2302
2314 src = asrc->head_ (); 2303 object *prev = dst;
2315
2316 prev = 0;
2317 for (object *part = src; part; part = part->more) 2304 for (object *part = this->more; part; part = part->more)
2318 { 2305 {
2319 tmp = part->clone (); 2306 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; 2307 tmp->head = dst;
2330
2331 tmp->more = 0;
2332
2333 if (prev)
2334 prev->more = tmp; 2308 prev->more = tmp;
2335
2336 prev = tmp; 2309 prev = tmp;
2337 } 2310 }
2338 2311
2339 for (item = src->inv; item; item = item->below) 2312 for (object *item = inv; item; item = item->below)
2340 insert_ob_in_ob (object_create_clone (item), dst); 2313 insert_ob_in_ob (item->deep_clone (), dst);
2341 2314
2342 return dst; 2315 return dst;
2343} 2316}
2344 2317
2345/* This returns the first object in who's inventory that 2318/* This returns the first object in who's inventory that
… …
2354 return tmp; 2327 return tmp;
2355 2328
2356 return 0; 2329 return 0;
2357} 2330}
2358 2331
2359/* If ob has a field named key, return the link from the list, 2332const shstr &
2360 * otherwise return NULL. 2333object::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 */
2365key_value *
2366get_ob_key_link (const object *ob, const char *key)
2367{ 2334{
2368 for (key_value *link = ob->key_values; link; link = link->next) 2335 for (key_value *kv = key_values; kv; kv = kv->next)
2369 if (link->key == key) 2336 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 */
2382const char *
2383get_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; 2337 return kv->value;
2404 2338
2405 return 0; 2339 return shstr_null;
2406} 2340}
2407 2341
2408/* 2342void
2409 * Updates the canonical_key in op to value. 2343object::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 */
2418int
2419set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2420{ 2344{
2421 key_value *field = NULL, *last = NULL; 2345 for (key_value *kv = key_values; kv; kv = kv->next)
2422 2346 if (kv->key == key)
2423 for (field = op->key_values; field != NULL; field = field->next)
2424 {
2425 if (field->key != canonical_key)
2426 { 2347 {
2427 last = field; 2348 kv->value = value;
2428 continue; 2349 return;
2429 } 2350 }
2430 2351
2431 if (value) 2352 key_value *kv = new key_value;
2432 field->value = value; 2353
2433 else 2354 kv->next = key_values;
2355 kv->key = key;
2356 kv->value = value;
2357
2358 key_values = kv;
2359}
2360
2361void
2362object::kv_del (const shstr &key)
2363{
2364 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2365 if ((*kvp)->key == key)
2434 { 2366 {
2435 /* Basically, if the archetype has this key set, 2367 key_value *kv = *kvp;
2436 * we need to store the null value so when we save 2368 *kvp = (*kvp)->next;
2437 * it, we save the empty value so that when we load, 2369 delete kv;
2438 * we get this value back again. 2370 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 } 2371 }
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 */
2490int
2491set_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} 2372}
2497 2373
2498object::depth_iterator::depth_iterator (object *container) 2374object::depth_iterator::depth_iterator (object *container)
2499: iterator_base (container) 2375: iterator_base (container)
2500{ 2376{
… …
2550{ 2426{
2551 char flagdesc[512]; 2427 char flagdesc[512];
2552 char info2[256 * 4]; 2428 char info2[256 * 4];
2553 char *p = info; 2429 char *p = info;
2554 2430
2555 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2431 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2556 count, 2432 count,
2557 uuid.c_str (), 2433 uuid.c_str (),
2558 &name, 2434 &name,
2559 title ? "\",title:\"" : "", 2435 title ? ",title:\"" : "",
2560 title ? (const char *)title : "", 2436 title ? (const char *)title : "",
2437 title ? "\"" : "",
2561 flag_desc (flagdesc, 512), type); 2438 flag_desc (flagdesc, 512), type);
2562 2439
2563 if (!this->flag[FLAG_REMOVED] && env) 2440 if (!flag[FLAG_REMOVED] && env)
2564 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2441 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2565 2442
2566 if (map) 2443 if (map)
2567 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2444 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2568 2445
… …
2598object::open_container (object *new_container) 2475object::open_container (object *new_container)
2599{ 2476{
2600 if (container == new_container) 2477 if (container == new_container)
2601 return; 2478 return;
2602 2479
2603 if (object *old_container = container) 2480 object *old_container = container;
2481
2482 if (old_container)
2604 { 2483 {
2605 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2484 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2606 return; 2485 return;
2607 2486
2608#if 0 2487#if 0
… …
2610 if (object *closer = old_container->inv) 2489 if (object *closer = old_container->inv)
2611 if (closer->type == CLOSE_CON) 2490 if (closer->type == CLOSE_CON)
2612 closer->destroy (); 2491 closer->destroy ();
2613#endif 2492#endif
2614 2493
2494 // make sure the container is available
2495 esrv_send_item (this, old_container);
2496
2615 old_container->flag [FLAG_APPLIED] = 0; 2497 old_container->flag [FLAG_APPLIED] = false;
2616 container = 0; 2498 container = 0;
2617 2499
2500 // client needs item update to make it work, client bug requires this to be separate
2618 esrv_update_item (UPD_FLAGS, this, old_container); 2501 esrv_update_item (UPD_FLAGS, this, old_container);
2502
2619 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2503 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2620 play_sound (sound_find ("chest_close")); 2504 play_sound (sound_find ("chest_close"));
2621 } 2505 }
2622 2506
2623 if (new_container) 2507 if (new_container)
… …
2636 } 2520 }
2637#endif 2521#endif
2638 2522
2639 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2523 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2640 2524
2525 // make sure the container is available, client bug requires this to be separate
2526 esrv_send_item (this, new_container);
2527
2641 new_container->flag [FLAG_APPLIED] = 1; 2528 new_container->flag [FLAG_APPLIED] = true;
2642 container = new_container; 2529 container = new_container;
2643 2530
2531 // client needs flag change
2644 esrv_update_item (UPD_FLAGS, this, new_container); 2532 esrv_update_item (UPD_FLAGS, this, new_container);
2645 esrv_send_inventory (this, new_container); 2533 esrv_send_inventory (this, new_container);
2646 play_sound (sound_find ("chest_open")); 2534 play_sound (sound_find ("chest_open"));
2647 } 2535 }
2536// else if (!old_container->env && contr && contr->ns)
2537// contr->ns->floorbox_reset ();
2648} 2538}
2649 2539
2650object * 2540object *
2651object::force_find (const shstr name) 2541object::force_find (const shstr name)
2652{ 2542{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines