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.210 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.246 by root, Thu May 22 15:37:44 2008 UTC

… …
24#include <global.h> 24#include <global.h>
25#include <stdio.h> 25#include <stdio.h>
26#include <sys/types.h> 26#include <sys/types.h>
27#include <sys/uio.h> 27#include <sys/uio.h>
28#include <object.h> 28#include <object.h>
29#include <funcpoint.h>
30#include <sproto.h> 29#include <sproto.h>
31#include <loader.h> 30#include <loader.h>
32 31
33#include <bitset> 32#include <bitset>
34 33
… …
140 139
141/* 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. */
142static bool 141static bool
143compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
144{ 143{
145 key_value *wants_field;
146
147 /* 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
148 * 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
149 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
150 */ 147 */
151 148
152 /* For each field in wants, */ 149 /* For each field in wants, */
153 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)
154 { 151 if (has->kv_get (kv->key) != kv->value)
155 key_value *has_field; 152 return false;
156
157 /* Look for a field in has with the same key. */
158 has_field = get_ob_key_link (has, wants_field->key);
159
160 if (!has_field)
161 return 0; /* No field with that name. */
162
163 /* Found the matching field. */
164 if (has_field->value != wants_field->value)
165 return 0; /* Values don't match, so this half of the comparison is false. */
166
167 /* If we get here, we found a match. Now for the next field in wants. */
168 }
169 153
170 /* 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. */
171 return 1; 155 return true;
172} 156}
173 157
174/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
175static bool 159static bool
176compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
177{ 161{
178 /* 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,
179 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
180 */ 164 */
181 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);
182} 167}
183 168
184/* 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
185 * they can be merged together. 170 * they can be merged together.
186 * 171 *
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 207
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 210
226 if (ob1->arch->name != ob2->arch->name 211 if (ob1->arch->archname != ob2->arch->archname
227 || ob1->name != ob2->name 212 || ob1->name != ob2->name
228 || ob1->title != ob2->title 213 || ob1->title != ob2->title
229 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
230 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
231 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
232 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
233 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
234 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
235 || ob1->value != ob2->value 220 || ob1->value != ob2->value
236 || ob1->animation_id != ob2->animation_id 221 || ob1->animation_id != ob2->animation_id
222 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
237 || ob1->client_type != ob2->client_type 223 || ob1->client_type != ob2->client_type
238 || ob1->materialname != ob2->materialname 224 || ob1->materialname != ob2->materialname
239 || ob1->lore != ob2->lore 225 || ob1->lore != ob2->lore
240 || ob1->subtype != ob2->subtype 226 || ob1->subtype != ob2->subtype
241 || ob1->move_type != ob2->move_type 227 || ob1->move_type != ob2->move_type
… …
331 317
332 /* Everything passes, must be OK. */ 318 /* Everything passes, must be OK. */
333 return 1; 319 return 1;
334} 320}
335 321
322// find player who can see this object
323object *
324object::visible_to () const
325{
326 if (client_visible () && !flag [FLAG_REMOVED])
327 {
328 // see if we are in a container of sorts
329 if (env)
330 {
331 // the player inventory itself is always visible
332 if (env->type == PLAYER)
333 return env;
334
335 // else a player could have our env open
336 object *envest = env->outer_env ();
337
338 // the player itself is always on a map, so we will find him here
339 // even if our inv is in a player.
340 if (envest->is_on_map ())
341 if (object *pl = envest->ms ().player ())
342 if (pl->container == env)
343 return pl;
344 }
345 else
346 {
347 // maybe there is a player standing on the same mapspace
348 // this will catch the case where "this" is a player
349 if (object *pl = ms ().player ())
350 if (!pl->container || this == pl->container)
351 return pl;
352 }
353 }
354
355 return 0;
356}
357
336// adjust weight per container type ("of holding") 358// adjust weight per container type ("of holding")
337static sint32 359static sint32
338weight_adjust (object *op, sint32 weight) 360weight_adjust_for (object *op, sint32 weight)
339{ 361{
340 return op->type == CONTAINER 362 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 363 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight; 364 : weight;
343} 365}
… …
349static void 371static void
350adjust_weight (object *op, sint32 weight) 372adjust_weight (object *op, sint32 weight)
351{ 373{
352 while (op) 374 while (op)
353 { 375 {
376 // adjust by actual difference to account for rounding errors
377 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
354 weight = weight_adjust (op, weight); 378 weight = weight_adjust_for (op, op->carrying)
379 - weight_adjust_for (op, op->carrying - weight);
380
381 if (!weight)
382 return;
355 383
356 op->carrying += weight; 384 op->carrying += weight;
385
386 if (object *pl = op->visible_to ())
387 if (pl != op) // player is handled lazily
388 esrv_update_item (UPD_WEIGHT, pl, op);
389
357 op = op->env; 390 op = op->env;
358 } 391 }
359} 392}
360 393
361/* 394/*
… …
374 op->update_weight (); 407 op->update_weight ();
375 408
376 sum += op->total_weight (); 409 sum += op->total_weight ();
377 } 410 }
378 411
379 carrying = weight_adjust (this, sum); 412 sum = weight_adjust_for (this, sum);
413
414 if (sum != carrying)
415 {
416 carrying = sum;
417
418 if (object *pl = visible_to ())
419 if (pl != this) // player is handled lazily
420 esrv_update_item (UPD_WEIGHT, pl, this);
421 }
380} 422}
381 423
382/* 424/*
383 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 425 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
384 */ 426 */
… …
437 */ 479 */
438object * 480object *
439find_object_name (const char *str) 481find_object_name (const char *str)
440{ 482{
441 shstr_cmp str_ (str); 483 shstr_cmp str_ (str);
442 object *op;
443 484
485 if (str_)
444 for_all_objects (op) 486 for_all_objects (op)
445 if (op->name == str_) 487 if (op->name == str_)
446 break; 488 return op;
447 489
448 return op; 490 return 0;
449} 491}
450 492
451/* 493/*
452 * Sets the owner and sets the skill and exp pointers to owner's current 494 * Sets the owner and sets the skill and exp pointers to owner's current
453 * skill and experience objects. 495 * skill and experience objects.
… …
551 } 593 }
552 594
553 op->key_values = 0; 595 op->key_values = 0;
554} 596}
555 597
556object & 598/*
557object::operator =(const object &src) 599 * copy_to first frees everything allocated by the dst object,
600 * and then copies the contents of itself into the second
601 * object, allocating what needs to be allocated. Basically, any
602 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
603 * if the first object is freed, the pointers in the new object
604 * will point at garbage.
605 */
606void
607object::copy_to (object *dst)
558{ 608{
559 bool is_freed = flag [FLAG_FREED]; 609 dst->remove ();
560 bool is_removed = flag [FLAG_REMOVED];
561
562 *(object_copy *)this = src; 610 *(object_copy *)dst = *this;
563
564 flag [FLAG_FREED] = is_freed;
565 flag [FLAG_REMOVED] = is_removed; 611 dst->flag [FLAG_REMOVED] = true;
566 612
567 /* Copy over key_values, if any. */ 613 /* Copy over key_values, if any. */
568 if (src.key_values) 614 if (key_values)
569 { 615 {
570 key_value *tail = 0; 616 key_value *tail = 0;
571 key_values = 0; 617 dst->key_values = 0;
572 618
573 for (key_value *i = src.key_values; i; i = i->next) 619 for (key_value *i = key_values; i; i = i->next)
574 { 620 {
575 key_value *new_link = new key_value; 621 key_value *new_link = new key_value;
576 622
577 new_link->next = 0; 623 new_link->next = 0;
578 new_link->key = i->key; 624 new_link->key = i->key;
579 new_link->value = i->value; 625 new_link->value = i->value;
580 626
581 /* Try and be clever here, too. */ 627 /* Try and be clever here, too. */
582 if (!key_values) 628 if (!dst->key_values)
583 { 629 {
584 key_values = new_link; 630 dst->key_values = new_link;
585 tail = new_link; 631 tail = new_link;
586 } 632 }
587 else 633 else
588 { 634 {
589 tail->next = new_link; 635 tail->next = new_link;
590 tail = new_link; 636 tail = new_link;
591 } 637 }
592 } 638 }
593 } 639 }
594}
595
596/*
597 * copy_to first frees everything allocated by the dst object,
598 * and then copies the contents of itself into the second
599 * object, allocating what needs to be allocated. Basically, any
600 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
601 * if the first object is freed, the pointers in the new object
602 * will point at garbage.
603 */
604void
605object::copy_to (object *dst)
606{
607 *dst = *this;
608 640
609 if (speed < 0) 641 if (speed < 0)
610 dst->speed_left -= rndm (); 642 dst->speed_left -= rndm ();
611 643
612 dst->set_speed (dst->speed); 644 dst->set_speed (dst->speed);
… …
634object * 666object *
635object::clone () 667object::clone ()
636{ 668{
637 object *neu = create (); 669 object *neu = create ();
638 copy_to (neu); 670 copy_to (neu);
671 neu->map = map; // not copied by copy_to
639 return neu; 672 return neu;
640} 673}
641 674
642/* 675/*
643 * If an object with the IS_TURNABLE() flag needs to be turned due 676 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
694 * UP_OBJ_FACE: only the objects face has changed. 727 * UP_OBJ_FACE: only the objects face has changed.
695 */ 728 */
696void 729void
697update_object (object *op, int action) 730update_object (object *op, int action)
698{ 731{
699 if (op == NULL) 732 if (!op)
700 { 733 {
701 /* this should never happen */ 734 /* this should never happen */
702 LOG (llevDebug, "update_object() called for NULL object.\n"); 735 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703 return; 736 return;
704 } 737 }
705 738
706 if (op->env) 739 if (!op->is_on_map ())
707 { 740 {
708 /* Animation is currently handled by client, so nothing 741 /* Animation is currently handled by client, so nothing
709 * to do in this case. 742 * to do in this case.
710 */ 743 */
711 return; 744 return;
712 } 745 }
713
714 /* If the map is saving, don't do anything as everything is
715 * going to get freed anyways.
716 */
717 if (!op->map || op->map->in_memory == MAP_SAVING)
718 return;
719 746
720 /* make sure the object is within map boundaries */ 747 /* make sure the object is within map boundaries */
721 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 748 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
722 { 749 {
723 LOG (llevError, "update_object() called for object out of map!\n"); 750 LOG (llevError, "update_object() called for object out of map!\n");
… …
866object::destroy_inv (bool drop_to_ground) 893object::destroy_inv (bool drop_to_ground)
867{ 894{
868 // need to check first, because the checks below might segfault 895 // need to check first, because the checks below might segfault
869 // as we might be on an invalid mapspace and crossfire code 896 // as we might be on an invalid mapspace and crossfire code
870 // is too buggy to ensure that the inventory is empty. 897 // is too buggy to ensure that the inventory is empty.
871 // corollary: if you create arrows etc. with stuff in tis inventory, 898 // corollary: if you create arrows etc. with stuff in its inventory,
872 // cf will crash below with off-map x and y 899 // cf will crash below with off-map x and y
873 if (!inv) 900 if (!inv)
874 return; 901 return;
875 902
876 /* Only if the space blocks everything do we not process - 903 /* Only if the space blocks everything do we not process -
… …
878 * drop on that space. 905 * drop on that space.
879 */ 906 */
880 if (!drop_to_ground 907 if (!drop_to_ground
881 || !map 908 || !map
882 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
883 || map->nodrop 910 || map->no_drop
884 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
885 { 912 {
886 while (inv) 913 while (inv)
887 { 914 {
888 inv->destroy_inv (drop_to_ground); 915 inv->destroy_inv (false);
889 inv->destroy (); 916 inv->destroy ();
890 } 917 }
891 } 918 }
892 else 919 else
893 { /* Put objects in inventory onto this space */ 920 { /* Put objects in inventory onto this space */
… …
899 || op->flag [FLAG_NO_DROP] 926 || op->flag [FLAG_NO_DROP]
900 || op->type == RUNE 927 || op->type == RUNE
901 || op->type == TRAP 928 || op->type == TRAP
902 || op->flag [FLAG_IS_A_TEMPLATE] 929 || op->flag [FLAG_IS_A_TEMPLATE]
903 || op->flag [FLAG_DESTROY_ON_DEATH]) 930 || op->flag [FLAG_DESTROY_ON_DEATH])
904 op->destroy (); 931 op->destroy (true);
905 else 932 else
906 map->insert (op, x, y); 933 map->insert (op, x, y);
907 } 934 }
908 } 935 }
909} 936}
… …
913 object *op = new object; 940 object *op = new object;
914 op->link (); 941 op->link ();
915 return op; 942 return op;
916} 943}
917 944
945static struct freed_map : maptile
946{
947 freed_map ()
948 {
949 path = "<freed objects map>";
950 name = "/internal/freed_objects_map";
951 width = 3;
952 height = 3;
953 no_drop = 1;
954 no_reset = 1;
955
956 alloc ();
957 in_memory = MAP_ACTIVE;
958 }
959
960 ~freed_map ()
961 {
962 destroy ();
963 }
964} freed_map; // freed objects are moved here to avoid crashes
965
918void 966void
919object::do_destroy () 967object::do_destroy ()
920{ 968{
921 attachable::do_destroy ();
922
923 if (flag [FLAG_IS_LINKED]) 969 if (flag [FLAG_IS_LINKED])
924 remove_button_link (this); 970 remove_button_link (this);
925 971
926 if (flag [FLAG_FRIENDLY]) 972 if (flag [FLAG_FRIENDLY])
927 remove_friendly_object (this); 973 remove_friendly_object (this);
928 974
929 if (!flag [FLAG_REMOVED])
930 remove (); 975 remove ();
931 976
932 destroy_inv (true); 977 attachable::do_destroy ();
933 978
934 deactivate (); 979 deactivate ();
935 unlink (); 980 unlink ();
936 981
937 flag [FLAG_FREED] = 1; 982 flag [FLAG_FREED] = 1;
938 983
939 // hack to ensure that freed objects still have a valid map 984 // hack to ensure that freed objects still have a valid map
940 {
941 static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943 if (!freed_map)
944 {
945 freed_map = new maptile;
946
947 freed_map->path = "<freed objects map>";
948 freed_map->name = "/internal/freed_objects_map";
949 freed_map->width = 3;
950 freed_map->height = 3;
951 freed_map->nodrop = 1;
952
953 freed_map->alloc ();
954 freed_map->in_memory = MAP_ACTIVE;
955 }
956
957 map = freed_map; 985 map = &freed_map;
958 x = 1; 986 x = 1;
959 y = 1; 987 y = 1;
960 }
961 988
962 if (more) 989 if (more)
963 { 990 {
964 more->destroy (); 991 more->destroy ();
965 more = 0; 992 more = 0;
… …
978object::destroy (bool destroy_inventory) 1005object::destroy (bool destroy_inventory)
979{ 1006{
980 if (destroyed ()) 1007 if (destroyed ())
981 return; 1008 return;
982 1009
1010 if (!is_head () && !head->destroyed ())
1011 {
1012 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1013 head->destroy (destroy_inventory);
1014 return;
1015 }
1016
983 if (destroy_inventory) 1017 destroy_inv (!destroy_inventory);
984 destroy_inv (false);
985 1018
986 if (is_head ()) 1019 if (is_head ())
987 if (sound_destroy) 1020 if (sound_destroy)
988 play_sound (sound_destroy); 1021 play_sound (sound_destroy);
989 else if (flag [FLAG_MONSTER]) 1022 else if (flag [FLAG_MONSTER])
… …
1003object::do_remove () 1036object::do_remove ()
1004{ 1037{
1005 object *tmp, *last = 0; 1038 object *tmp, *last = 0;
1006 object *otmp; 1039 object *otmp;
1007 1040
1008 if (QUERY_FLAG (this, FLAG_REMOVED)) 1041 if (flag [FLAG_REMOVED])
1009 return; 1042 return;
1010 1043
1011 SET_FLAG (this, FLAG_REMOVED);
1012 INVOKE_OBJECT (REMOVE, this); 1044 INVOKE_OBJECT (REMOVE, this);
1045
1046 flag [FLAG_REMOVED] = true;
1013 1047
1014 if (more) 1048 if (more)
1015 more->remove (); 1049 more->remove ();
1016 1050
1017 /* 1051 /*
1018 * In this case, the object to be removed is in someones 1052 * In this case, the object to be removed is in someones
1019 * inventory. 1053 * inventory.
1020 */ 1054 */
1021 if (env) 1055 if (env)
1022 { 1056 {
1057 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1058 if (object *pl = visible_to ())
1059 esrv_del_item (pl->contr, count);
1060 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1061
1023 adjust_weight (env, -total_weight ()); 1062 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
1027 if (below)
1028 below->above = above;
1029 1063
1030 /* we set up values so that it could be inserted into 1064 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up 1065 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do. 1066 * to the caller to decide what we want to do.
1033 */ 1067 */
1034 map = env->map; 1068 map = env->map;
1035 x = env->x; 1069 x = env->x;
1036 y = env->y; 1070 y = env->y;
1071
1072 // make sure cmov optimisation is applicable
1073 *(above ? &above->below : &env->inv) = below;
1074 *(below ? &below->above : &above ) = above; // &above is just a dummy
1075
1037 above = 0; 1076 above = 0;
1038 below = 0; 1077 below = 0;
1039 env = 0; 1078 env = 0;
1040 1079
1041 /* NO_FIX_PLAYER is set when a great many changes are being 1080 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1084 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046 otmp->update_stats (); 1085 otmp->update_stats ();
1047 } 1086 }
1048 else if (map) 1087 else if (map)
1049 { 1088 {
1050 if (type == PLAYER)
1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
1058 --map->players;
1059 map->touch ();
1060 }
1061
1062 map->dirty = true; 1089 map->dirty = true;
1063 mapspace &ms = this->ms (); 1090 mapspace &ms = this->ms ();
1064 1091
1092 if (object *pl = ms.player ())
1093 {
1094 if (type == PLAYER) // this == pl(!)
1095 {
1096 // leaving a spot always closes any open container on the ground
1097 if (container && !container->env)
1098 // this causes spurious floorbox updates, but it ensures
1099 // that the CLOSE event is being sent.
1100 close_container ();
1101
1102 --map->players;
1103 map->touch ();
1104 }
1105 else if (pl->container == this)
1106 {
1107 // removing a container should close it
1108 close_container ();
1109 }
1110
1111 esrv_del_item (pl->contr, count);
1112 }
1113
1065 /* link the object above us */ 1114 /* link the object above us */
1066 if (above) 1115 // re-link, make sure compiler can easily use cmove
1067 above->below = below; 1116 *(above ? &above->below : &ms.top) = below;
1068 else 1117 *(below ? &below->above : &ms.bot) = above;
1069 ms.top = below; /* we were top, set new top */
1070
1071 /* Relink the object below us, if there is one */
1072 if (below)
1073 below->above = above;
1074 else
1075 {
1076 /* Nothing below, which means we need to relink map object for this space
1077 * use translated coordinates in case some oddness with map tiling is
1078 * evident
1079 */
1080 if (GET_MAP_OB (map, x, y) != this)
1081 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 ());
1082
1083 ms.bot = above; /* goes on above it. */
1084 }
1085 1118
1086 above = 0; 1119 above = 0;
1087 below = 0; 1120 below = 0;
1088 1121
1089 if (map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
… …
1098 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1099 * appropriately. 1132 * appropriately.
1100 */ 1133 */
1101 pl->close_container (); 1134 pl->close_container ();
1102 1135
1136 //TODO: the floorbox prev/next might need updating
1137 //esrv_del_item (pl->contr, count);
1138 //TODO: update floorbox to preserve ordering
1139 if (pl->contr->ns)
1103 pl->contr->ns->floorbox_update (); 1140 pl->contr->ns->floorbox_update ();
1104 } 1141 }
1105 1142
1106 for (tmp = ms.bot; tmp; tmp = tmp->above) 1143 for (tmp = ms.bot; tmp; tmp = tmp->above)
1107 { 1144 {
1108 /* No point updating the players look faces if he is the object 1145 /* No point updating the players look faces if he is the object
… …
1152 if (!top) 1189 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1190 for (top = op; top && top->above; top = top->above)
1154 ; 1191 ;
1155 1192
1156 for (; top; top = top->below) 1193 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1194 if (object::can_merge (op, top))
1162 { 1195 {
1163 top->nrof += op->nrof; 1196 top->nrof += op->nrof;
1164 1197
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1198 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1199 esrv_update_item (UPD_NROF, pl, top);
1200
1201 op->weight = 0; // cancel the addition above
1202 op->carrying = 0; // must be 0 already
1203
1167 op->destroy (); 1204 op->destroy (1);
1205
1168 return top; 1206 return top;
1169 } 1207 }
1170 }
1171 1208
1172 return 0; 1209 return 0;
1173} 1210}
1174 1211
1175void 1212void
… …
1200 * job preparing multi-part monsters. 1237 * job preparing multi-part monsters.
1201 */ 1238 */
1202object * 1239object *
1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1240insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1204{ 1241{
1242 op->remove ();
1243
1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1244 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206 { 1245 {
1207 tmp->x = x + tmp->arch->x; 1246 tmp->x = x + tmp->arch->x;
1208 tmp->y = y + tmp->arch->y; 1247 tmp->y = y + tmp->arch->y;
1209 } 1248 }
… …
1232 * just 'op' otherwise 1271 * just 'op' otherwise
1233 */ 1272 */
1234object * 1273object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1274insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1275{
1237 assert (!op->flag [FLAG_FREED]); 1276 if (op->is_on_map ())
1277 {
1278 LOG (llevError, "insert_ob_in_map called for object already on map");
1279 abort ();
1280 }
1238 1281
1239 object *top, *floor = NULL; 1282 if (op->env)
1240 1283 {
1284 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1241 op->remove (); 1285 op->remove ();
1286 }
1287
1288 if (op->face && !face_info (op->face))//D TODO: remove soon
1289 {//D
1290 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1291 op->face = 1;//D
1292 }//D
1242 1293
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1294 /* Ideally, the caller figures this out. However, it complicates a lot
1244 * of areas of callers (eg, anything that uses find_free_spot would now 1295 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1296 * need extra work
1246 */ 1297 */
1247 if (!xy_normalise (m, op->x, op->y)) 1298 if (!xy_normalise (m, op->x, op->y))
1248 { 1299 {
1249 op->destroy (); 1300 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1250 return 0; 1301 return 0;
1251 } 1302 }
1252 1303
1253 if (object *more = op->more) 1304 if (object *more = op->more)
1254 if (!insert_ob_in_map (more, m, originator, flag)) 1305 if (!insert_ob_in_map (more, m, originator, flag))
… …
1263 */ 1314 */
1264 if (op->nrof && !(flag & INS_NO_MERGE)) 1315 if (op->nrof && !(flag & INS_NO_MERGE))
1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1316 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266 if (object::can_merge (op, tmp)) 1317 if (object::can_merge (op, tmp))
1267 { 1318 {
1319 // TODO: we actually want to update tmp, not op,
1320 // but some caller surely breaks when we return tmp
1321 // from here :/
1268 op->nrof += tmp->nrof; 1322 op->nrof += tmp->nrof;
1269 tmp->destroy (1); 1323 tmp->destroy (1);
1270 } 1324 }
1271 1325
1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1326 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1281 { 1335 {
1282 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1336 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283 abort (); 1337 abort ();
1284 } 1338 }
1285 1339
1340 if (!originator->is_on_map ())
1341 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1342 op->debug_desc (), originator->debug_desc ());
1343
1286 op->above = originator; 1344 op->above = originator;
1287 op->below = originator->below; 1345 op->below = originator->below;
1288
1289 if (op->below)
1290 op->below->above = op;
1291 else
1292 ms.bot = op;
1293
1294 /* since *below* originator, no need to update top */
1295 originator->below = op; 1346 originator->below = op;
1347
1348 *(op->below ? &op->below->above : &ms.bot) = op;
1296 } 1349 }
1297 else 1350 else
1298 { 1351 {
1299 top = ms.bot; 1352 object *floor = 0;
1353 object *top = ms.top;
1300 1354
1301 /* If there are other objects, then */ 1355 /* If there are other objects, then */
1302 if (top) 1356 if (top)
1303 { 1357 {
1304 object *last = 0;
1305
1306 /* 1358 /*
1307 * If there are multiple objects on this space, we do some trickier handling. 1359 * If there are multiple objects on this space, we do some trickier handling.
1308 * We've already dealt with merging if appropriate. 1360 * We've already dealt with merging if appropriate.
1309 * Generally, we want to put the new object on top. But if 1361 * Generally, we want to put the new object on top. But if
1310 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1362 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1313 * once we get to them. This reduces the need to traverse over all of 1365 * once we get to them. This reduces the need to traverse over all of
1314 * them when adding another one - this saves quite a bit of cpu time 1366 * them when adding another one - this saves quite a bit of cpu time
1315 * when lots of spells are cast in one area. Currently, it is presumed 1367 * when lots of spells are cast in one area. Currently, it is presumed
1316 * that flying non pickable objects are spell objects. 1368 * that flying non pickable objects are spell objects.
1317 */ 1369 */
1318 for (top = ms.bot; top; top = top->above) 1370 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319 { 1371 {
1320 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1372 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1321 floor = top; 1373 floor = tmp;
1322 1374
1323 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1375 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1324 { 1376 {
1325 /* We insert above top, so we want this object below this */ 1377 /* We insert above top, so we want this object below this */
1326 top = top->below; 1378 top = tmp->below;
1327 break; 1379 break;
1328 } 1380 }
1329 1381
1330 last = top; 1382 top = tmp;
1331 } 1383 }
1332
1333 /* Don't want top to be NULL, so set it to the last valid object */
1334 top = last;
1335 1384
1336 /* We let update_position deal with figuring out what the space 1385 /* We let update_position deal with figuring out what the space
1337 * looks like instead of lots of conditions here. 1386 * looks like instead of lots of conditions here.
1338 * makes things faster, and effectively the same result. 1387 * makes things faster, and effectively the same result.
1339 */ 1388 */
… …
1346 */ 1395 */
1347 if (!(flag & INS_ON_TOP) 1396 if (!(flag & INS_ON_TOP)
1348 && ms.flags () & P_BLOCKSVIEW 1397 && ms.flags () & P_BLOCKSVIEW
1349 && (op->face && !faces [op->face].visibility)) 1398 && (op->face && !faces [op->face].visibility))
1350 { 1399 {
1400 object *last;
1401
1351 for (last = top; last != floor; last = last->below) 1402 for (last = top; last != floor; last = last->below)
1352 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1403 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353 break; 1404 break;
1354 1405
1355 /* Check to see if we found the object that blocks view, 1406 /* Check to see if we found the object that blocks view,
… …
1363 } /* If objects on this space */ 1414 } /* If objects on this space */
1364 1415
1365 if (flag & INS_ABOVE_FLOOR_ONLY) 1416 if (flag & INS_ABOVE_FLOOR_ONLY)
1366 top = floor; 1417 top = floor;
1367 1418
1368 /* Top is the object that our object (op) is going to get inserted above. 1419 // insert object above top, or bottom-most if top = 0
1369 */
1370
1371 /* First object on this space */
1372 if (!top) 1420 if (!top)
1373 { 1421 {
1422 op->below = 0;
1374 op->above = ms.bot; 1423 op->above = ms.bot;
1375
1376 if (op->above)
1377 op->above->below = op;
1378
1379 op->below = 0;
1380 ms.bot = op; 1424 ms.bot = op;
1425
1426 *(op->above ? &op->above->below : &ms.top) = op;
1381 } 1427 }
1382 else 1428 else
1383 { /* get inserted into the stack above top */ 1429 {
1384 op->above = top->above; 1430 op->above = top->above;
1385
1386 if (op->above)
1387 op->above->below = op; 1431 top->above = op;
1388 1432
1389 op->below = top; 1433 op->below = top;
1390 top->above = op; 1434 *(op->above ? &op->above->below : &ms.top) = op;
1391 } 1435 }
1392 1436 }
1393 if (!op->above)
1394 ms.top = op;
1395 } /* else not INS_BELOW_ORIGINATOR */
1396 1437
1397 if (op->type == PLAYER) 1438 if (op->type == PLAYER)
1398 { 1439 {
1399 op->contr->do_los = 1; 1440 op->contr->do_los = 1;
1400 ++op->map->players; 1441 ++op->map->players;
… …
1402 } 1443 }
1403 1444
1404 op->map->dirty = true; 1445 op->map->dirty = true;
1405 1446
1406 if (object *pl = ms.player ()) 1447 if (object *pl = ms.player ())
1448 //TODO: the floorbox prev/next might need updating
1449 //esrv_send_item (pl, op);
1450 //TODO: update floorbox to preserve ordering
1451 if (pl->contr->ns)
1407 pl->contr->ns->floorbox_update (); 1452 pl->contr->ns->floorbox_update ();
1408 1453
1409 /* If this object glows, it may affect lighting conditions that are 1454 /* If this object glows, it may affect lighting conditions that are
1410 * visible to others on this map. But update_all_los is really 1455 * visible to others on this map. But update_all_los is really
1411 * an inefficient way to do this, as it means los for all players 1456 * an inefficient way to do this, as it means los for all players
1412 * on the map will get recalculated. The players could very well 1457 * on the map will get recalculated. The players could very well
… …
1477 return where->env->insert (this); 1522 return where->env->insert (this);
1478 else 1523 else
1479 return where->map->insert (this, where->x, where->y, originator, flags); 1524 return where->map->insert (this, where->x, where->y, originator, flags);
1480} 1525}
1481 1526
1482// find player who can see this object
1483static object *
1484visible_to (object *op)
1485{
1486 if (!op->flag [FLAG_REMOVED])
1487 {
1488 // see if we are in a container of sorts
1489 if (object *env = op->env)
1490 {
1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1494
1495 // else a player could have our env open
1496 env = env->outer_env ();
1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1513 return 0;
1514}
1515
1516/* 1527/*
1517 * decrease(object, number) decreases a specified number from 1528 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object 1529 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed. 1530 * is subsequently removed and freed.
1520 * 1531 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0 1532 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */ 1533 */
1523bool 1534bool
1524object::decrease (sint32 nr) 1535object::decrease (sint32 nr)
1525{ 1536{
1537 if (!nr)
1538 return true;
1539
1526 nr = min (nr, nrof); 1540 nr = min (nr, nrof);
1527 1541
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr; 1542 nrof -= nr;
1532 1543
1533 object *visible = visible_to (this);
1534
1535 if (nrof) 1544 if (nrof)
1536 { 1545 {
1537 adjust_weight (env, -weight * nr); // carrying == 0 1546 adjust_weight (env, -weight * nr); // carrying == 0
1538 1547
1539 if (visible) 1548 if (object *pl = visible_to ())
1540 esrv_send_item (visible, this); 1549 esrv_update_item (UPD_NROF, pl, this);
1541 1550
1542 return 1; 1551 return true;
1543 } 1552 }
1544 else 1553 else
1545 { 1554 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1); 1555 destroy (1);
1550 return 0; 1556 return false;
1551 } 1557 }
1552} 1558}
1553 1559
1554/* 1560/*
1555 * split(ob,nr) splits up ob into two parts. The part which 1561 * split(ob,nr) splits up ob into two parts. The part which
… …
1558 * On failure, NULL is returned. 1564 * On failure, NULL is returned.
1559 */ 1565 */
1560object * 1566object *
1561object::split (sint32 nr) 1567object::split (sint32 nr)
1562{ 1568{
1569 int have = number_of ();
1570
1563 if (nrof < nr) 1571 if (have < nr)
1564 return 0; 1572 return 0;
1565 else if (nrof == nr) 1573 else if (have == nr)
1566 { 1574 {
1567 remove (); 1575 remove ();
1568 return this; 1576 return this;
1569 } 1577 }
1570 else 1578 else
1571 { 1579 {
1572 decrease (nr); 1580 decrease (nr);
1573 1581
1574 object *op = object_create_clone (this); 1582 object *op = deep_clone ();
1575 op->nrof = nr; 1583 op->nrof = nr;
1576 return op; 1584 return op;
1577 } 1585 }
1578} 1586}
1579 1587
… …
1623 if (object::can_merge (tmp, op)) 1631 if (object::can_merge (tmp, op))
1624 { 1632 {
1625 /* return the original object and remove inserted object 1633 /* return the original object and remove inserted object
1626 (client needs the original object) */ 1634 (client needs the original object) */
1627 tmp->nrof += op->nrof; 1635 tmp->nrof += op->nrof;
1636
1637 if (object *pl = tmp->visible_to ())
1638 esrv_update_item (UPD_NROF, pl, tmp);
1639
1628 adjust_weight (this, op->total_weight ()); 1640 adjust_weight (this, op->total_weight ());
1629 1641
1630 op->destroy (1); 1642 op->destroy (1);
1631 op = tmp; 1643 op = tmp;
1632 goto inserted; 1644 goto inserted;
… …
1646 1658
1647 inv = op; 1659 inv = op;
1648 1660
1649 op->flag [FLAG_REMOVED] = 0; 1661 op->flag [FLAG_REMOVED] = 0;
1650 1662
1663 if (object *pl = op->visible_to ())
1664 esrv_send_item (pl, op);
1665
1651 adjust_weight (this, op->total_weight ()); 1666 adjust_weight (this, op->total_weight ());
1652 1667
1653inserted: 1668inserted:
1654 /* reset the light list and los of the players on the map */ 1669 /* reset the light list and los of the players on the map */
1655 if (op->glow_radius && map && map->darkness) 1670 if (op->glow_radius && map && map->darkness)
1656 update_all_los (map, x, y); 1671 update_all_los (map, x, y);
1657 1672
1658 if (object *otmp = in_player ()) 1673 // if this is a player's inventory, update stats
1659 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1674 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1660 otmp->update_stats (); 1675 update_stats ();
1661 1676
1662 INVOKE_OBJECT (INSERT, this); 1677 INVOKE_OBJECT (INSERT, this);
1663 1678
1664 return op; 1679 return op;
1665} 1680}
… …
1793 LOG (llevError, "Present_arch called outside map.\n"); 1808 LOG (llevError, "Present_arch called outside map.\n");
1794 return NULL; 1809 return NULL;
1795 } 1810 }
1796 1811
1797 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1812 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1798 if (tmp->arch == at) 1813 if (tmp->arch->archname == at->archname)
1799 return tmp; 1814 return tmp;
1800 1815
1801 return NULL; 1816 return NULL;
1802} 1817}
1803 1818
… …
1867 * The first matching object is returned, or NULL if none. 1882 * The first matching object is returned, or NULL if none.
1868 */ 1883 */
1869object * 1884object *
1870present_arch_in_ob (const archetype *at, const object *op) 1885present_arch_in_ob (const archetype *at, const object *op)
1871{ 1886{
1872 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1887 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1873 if (tmp->arch == at) 1888 if (tmp->arch->archname == at->archname)
1874 return tmp; 1889 return tmp;
1875 1890
1876 return NULL; 1891 return NULL;
1877} 1892}
1878 1893
… …
2287 2302
2288/* 2303/*
2289 * create clone from object to another 2304 * create clone from object to another
2290 */ 2305 */
2291object * 2306object *
2292object_create_clone (object *asrc) 2307object::deep_clone ()
2293{ 2308{
2294 object *dst = 0, *tmp, *src, *prev, *item; 2309 assert (("deep_clone called on non-head object", is_head ()));
2295 2310
2296 if (!asrc) 2311 object *dst = clone ();
2297 return 0;
2298 2312
2299 src = asrc->head_ (); 2313 object *prev = dst;
2300
2301 prev = 0;
2302 for (object *part = src; part; part = part->more) 2314 for (object *part = this->more; part; part = part->more)
2303 { 2315 {
2304 tmp = part->clone (); 2316 object *tmp = part->clone ();
2305 tmp->x -= src->x;
2306 tmp->y -= src->y;
2307
2308 if (!part->head)
2309 {
2310 dst = tmp;
2311 tmp->head = 0;
2312 }
2313 else
2314 tmp->head = dst; 2317 tmp->head = dst;
2315
2316 tmp->more = 0;
2317
2318 if (prev)
2319 prev->more = tmp; 2318 prev->more = tmp;
2320
2321 prev = tmp; 2319 prev = tmp;
2322 } 2320 }
2323 2321
2324 for (item = src->inv; item; item = item->below) 2322 for (object *item = inv; item; item = item->below)
2325 insert_ob_in_ob (object_create_clone (item), dst); 2323 insert_ob_in_ob (item->deep_clone (), dst);
2326 2324
2327 return dst; 2325 return dst;
2328} 2326}
2329 2327
2330/* This returns the first object in who's inventory that 2328/* This returns the first object in who's inventory that
… …
2339 return tmp; 2337 return tmp;
2340 2338
2341 return 0; 2339 return 0;
2342} 2340}
2343 2341
2344/* If ob has a field named key, return the link from the list, 2342const shstr &
2345 * otherwise return NULL. 2343object::kv_get (const shstr &key) const
2346 *
2347 * key must be a passed in shared string - otherwise, this won't
2348 * do the desired thing.
2349 */
2350key_value *
2351get_ob_key_link (const object *ob, const char *key)
2352{ 2344{
2353 for (key_value *link = ob->key_values; link; link = link->next) 2345 for (key_value *kv = key_values; kv; kv = kv->next)
2354 if (link->key == key) 2346 if (kv->key == key)
2355 return link;
2356
2357 return 0;
2358}
2359
2360/*
2361 * Returns the value of op has an extra_field for key, or NULL.
2362 *
2363 * The argument doesn't need to be a shared string.
2364 *
2365 * The returned string is shared.
2366 */
2367const char *
2368get_ob_key_value (const object *op, const char *const key)
2369{
2370 key_value *link;
2371 shstr_cmp canonical_key (key);
2372
2373 if (!canonical_key)
2374 {
2375 /* 1. There being a field named key on any object
2376 * implies there'd be a shared string to find.
2377 * 2. Since there isn't, no object has this field.
2378 * 3. Therefore, *this* object doesn't have this field.
2379 */
2380 return 0;
2381 }
2382
2383 /* This is copied from get_ob_key_link() above -
2384 * only 4 lines, and saves the function call overhead.
2385 */
2386 for (link = op->key_values; link; link = link->next)
2387 if (link->key == canonical_key)
2388 return link->value; 2347 return kv->value;
2389 2348
2390 return 0; 2349 return shstr_null;
2391} 2350}
2392 2351
2393/* 2352void
2394 * Updates the canonical_key in op to value. 2353object::kv_set (const shstr &key, const shstr &value)
2395 *
2396 * canonical_key is a shared string (value doesn't have to be).
2397 *
2398 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2399 * keys.
2400 *
2401 * Returns TRUE on success.
2402 */
2403int
2404set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2405{ 2354{
2406 key_value *field = NULL, *last = NULL; 2355 for (key_value *kv = key_values; kv; kv = kv->next)
2407 2356 if (kv->key == key)
2408 for (field = op->key_values; field != NULL; field = field->next)
2409 {
2410 if (field->key != canonical_key)
2411 { 2357 {
2412 last = field; 2358 kv->value = value;
2413 continue; 2359 return;
2414 } 2360 }
2415 2361
2416 if (value) 2362 key_value *kv = new key_value;
2417 field->value = value; 2363
2418 else 2364 kv->next = key_values;
2365 kv->key = key;
2366 kv->value = value;
2367
2368 key_values = kv;
2369}
2370
2371void
2372object::kv_del (const shstr &key)
2373{
2374 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2375 if ((*kvp)->key == key)
2419 { 2376 {
2420 /* Basically, if the archetype has this key set, 2377 key_value *kv = *kvp;
2421 * we need to store the null value so when we save 2378 *kvp = (*kvp)->next;
2422 * it, we save the empty value so that when we load, 2379 delete kv;
2423 * we get this value back again. 2380 return;
2424 */
2425 if (get_ob_key_link (op->arch, canonical_key))
2426 field->value = 0;
2427 else
2428 {
2429 if (last)
2430 last->next = field->next;
2431 else
2432 op->key_values = field->next;
2433
2434 delete field;
2435 }
2436 } 2381 }
2437 return TRUE;
2438 }
2439 /* IF we get here, key doesn't exist */
2440
2441 /* No field, we'll have to add it. */
2442
2443 if (!add_key)
2444 return FALSE;
2445
2446 /* There isn't any good reason to store a null
2447 * value in the key/value list. If the archetype has
2448 * this key, then we should also have it, so shouldn't
2449 * be here. If user wants to store empty strings,
2450 * should pass in ""
2451 */
2452 if (value == NULL)
2453 return TRUE;
2454
2455 field = new key_value;
2456
2457 field->key = canonical_key;
2458 field->value = value;
2459 /* Usual prepend-addition. */
2460 field->next = op->key_values;
2461 op->key_values = field;
2462
2463 return TRUE;
2464}
2465
2466/*
2467 * Updates the key in op to value.
2468 *
2469 * If add_key is FALSE, this will only update existing keys,
2470 * and not add new ones.
2471 * In general, should be little reason FALSE is ever passed in for add_key
2472 *
2473 * Returns TRUE on success.
2474 */
2475int
2476set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2477{
2478 shstr key_ (key);
2479
2480 return set_ob_key_value_s (op, key_, value, add_key);
2481} 2382}
2482 2383
2483object::depth_iterator::depth_iterator (object *container) 2384object::depth_iterator::depth_iterator (object *container)
2484: iterator_base (container) 2385: iterator_base (container)
2485{ 2386{
… …
2535{ 2436{
2536 char flagdesc[512]; 2437 char flagdesc[512];
2537 char info2[256 * 4]; 2438 char info2[256 * 4];
2538 char *p = info; 2439 char *p = info;
2539 2440
2540 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2441 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2541 count, 2442 count,
2542 uuid.c_str (), 2443 uuid.c_str (),
2543 &name, 2444 &name,
2544 title ? "\",title:\"" : "", 2445 title ? ",title:\"" : "",
2545 title ? (const char *)title : "", 2446 title ? (const char *)title : "",
2447 title ? "\"" : "",
2546 flag_desc (flagdesc, 512), type); 2448 flag_desc (flagdesc, 512), type);
2547 2449
2548 if (!this->flag[FLAG_REMOVED] && env) 2450 if (!flag[FLAG_REMOVED] && env)
2549 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2451 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2550 2452
2551 if (map) 2453 if (map)
2552 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2454 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2553 2455
… …
2583object::open_container (object *new_container) 2485object::open_container (object *new_container)
2584{ 2486{
2585 if (container == new_container) 2487 if (container == new_container)
2586 return; 2488 return;
2587 2489
2588 if (object *old_container = container) 2490 object *old_container = container;
2491
2492 if (old_container)
2589 { 2493 {
2590 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2494 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2591 return; 2495 return;
2592 2496
2593#if 0 2497#if 0
… …
2595 if (object *closer = old_container->inv) 2499 if (object *closer = old_container->inv)
2596 if (closer->type == CLOSE_CON) 2500 if (closer->type == CLOSE_CON)
2597 closer->destroy (); 2501 closer->destroy ();
2598#endif 2502#endif
2599 2503
2504 // make sure the container is available
2505 esrv_send_item (this, old_container);
2506
2600 old_container->flag [FLAG_APPLIED] = 0; 2507 old_container->flag [FLAG_APPLIED] = false;
2601 container = 0; 2508 container = 0;
2602 2509
2510 // client needs item update to make it work, client bug requires this to be separate
2603 esrv_update_item (UPD_FLAGS, this, old_container); 2511 esrv_update_item (UPD_FLAGS, this, old_container);
2512
2604 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2513 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2605 play_sound (sound_find ("chest_close")); 2514 play_sound (sound_find ("chest_close"));
2606 } 2515 }
2607 2516
2608 if (new_container) 2517 if (new_container)
… …
2621 } 2530 }
2622#endif 2531#endif
2623 2532
2624 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2533 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2625 2534
2535 // make sure the container is available, client bug requires this to be separate
2536 esrv_send_item (this, new_container);
2537
2626 new_container->flag [FLAG_APPLIED] = 1; 2538 new_container->flag [FLAG_APPLIED] = true;
2627 container = new_container; 2539 container = new_container;
2628 2540
2541 // client needs flag change
2629 esrv_update_item (UPD_FLAGS, this, new_container); 2542 esrv_update_item (UPD_FLAGS, this, new_container);
2630 esrv_send_inventory (this, new_container); 2543 esrv_send_inventory (this, new_container);
2631 play_sound (sound_find ("chest_open")); 2544 play_sound (sound_find ("chest_open"));
2632 } 2545 }
2546// else if (!old_container->env && contr && contr->ns)
2547// contr->ns->floorbox_reset ();
2633} 2548}
2634 2549
2635object * 2550object *
2636object::force_find (const shstr name) 2551object::force_find (const shstr name)
2637{ 2552{

Diff Legend

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