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.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 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 *
… …
334 320
335// find player who can see this object 321// find player who can see this object
336object * 322object *
337object::visible_to () const 323object::visible_to () const
338{ 324{
339 if (!flag [FLAG_REMOVED]) 325 if (client_visible () && !flag [FLAG_REMOVED])
340 { 326 {
341 // see if we are in a container of sorts 327 // see if we are in a container of sorts
342 if (env) 328 if (env)
343 { 329 {
344 // the player inventory itself is always visible 330 // the player inventory itself is always visible
… …
358 else 344 else
359 { 345 {
360 // maybe there is a player standing on the same mapspace 346 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player 347 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ()) 348 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container)
363 return pl; 350 return pl;
364 } 351 }
365 } 352 }
366 353
367 return 0; 354 return 0;
368} 355}
369 356
370// adjust weight per container type ("of holding") 357// adjust weight per container type ("of holding")
371static sint32 358static sint32
372weight_adjust (object *op, sint32 weight) 359weight_adjust_for (object *op, sint32 weight)
373{ 360{
374 return op->type == CONTAINER 361 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight; 363 : weight;
377} 364}
… …
383static void 370static void
384adjust_weight (object *op, sint32 weight) 371adjust_weight (object *op, sint32 weight)
385{ 372{
386 while (op) 373 while (op)
387 { 374 {
375 // adjust by actual difference to account for rounding errors
376 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388 weight = weight_adjust (op, weight); 377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
389 379
390 if (!weight) 380 if (!weight)
391 return; 381 return;
392 382
393 op->carrying += weight; 383 op->carrying += weight;
394 384
395 if (object *pl = op->visible_to ()) 385 if (object *pl = op->visible_to ())
386 if (pl != op) // player is handled lazily
396 esrv_update_item (UPD_WEIGHT, pl, op); 387 esrv_update_item (UPD_WEIGHT, pl, op);
397 388
398 op = op->env; 389 op = op->env;
399 } 390 }
400} 391}
401 392
… …
415 op->update_weight (); 406 op->update_weight ();
416 407
417 sum += op->total_weight (); 408 sum += op->total_weight ();
418 } 409 }
419 410
420 sum = weight_adjust (this, sum); 411 sum = weight_adjust_for (this, sum);
421 412
422 if (sum != carrying) 413 if (sum != carrying)
423 { 414 {
424 carrying = sum; 415 carrying = sum;
425 416
426 if (object *pl = visible_to ()) 417 if (object *pl = visible_to ())
418 if (pl != this) // player is handled lazily
427 esrv_update_item (UPD_WEIGHT, pl, this); 419 esrv_update_item (UPD_WEIGHT, pl, this);
428 } 420 }
429} 421}
430 422
431/* 423/*
432 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 424 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
… …
600 } 592 }
601 593
602 op->key_values = 0; 594 op->key_values = 0;
603} 595}
604 596
605object & 597/*
606object::operator =(const object &src) 598 * copy_to first frees everything allocated by the dst object,
599 * and then copies the contents of itself into the second
600 * object, allocating what needs to be allocated. Basically, any
601 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
602 * if the first object is freed, the pointers in the new object
603 * will point at garbage.
604 */
605void
606object::copy_to (object *dst)
607{ 607{
608 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
609 bool is_removed = flag [FLAG_REMOVED];
610
611 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
612
613 flag [FLAG_FREED] = is_freed;
614 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
615 611
616 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
617 if (src.key_values) 613 if (key_values)
618 { 614 {
619 key_value *tail = 0; 615 key_value *tail = 0;
620 key_values = 0; 616 dst->key_values = 0;
621 617
622 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
623 { 619 {
624 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
625 621
626 new_link->next = 0; 622 new_link->next = 0;
627 new_link->key = i->key; 623 new_link->key = i->key;
628 new_link->value = i->value; 624 new_link->value = i->value;
629 625
630 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
631 if (!key_values) 627 if (!dst->key_values)
632 { 628 {
633 key_values = new_link; 629 dst->key_values = new_link;
634 tail = new_link; 630 tail = new_link;
635 } 631 }
636 else 632 else
637 { 633 {
638 tail->next = new_link; 634 tail->next = new_link;
639 tail = new_link; 635 tail = new_link;
640 } 636 }
641 } 637 }
642 } 638 }
643}
644
645/*
646 * copy_to first frees everything allocated by the dst object,
647 * and then copies the contents of itself into the second
648 * object, allocating what needs to be allocated. Basically, any
649 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
650 * if the first object is freed, the pointers in the new object
651 * will point at garbage.
652 */
653void
654object::copy_to (object *dst)
655{
656 *dst = *this;
657 639
658 if (speed < 0) 640 if (speed < 0)
659 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
660 642
661 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
683object * 665object *
684object::clone () 666object::clone ()
685{ 667{
686 object *neu = create (); 668 object *neu = create ();
687 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
688 return neu; 671 return neu;
689} 672}
690 673
691/* 674/*
692 * If an object with the IS_TURNABLE() flag needs to be turned due 675 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
743 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
744 */ 727 */
745void 728void
746update_object (object *op, int action) 729update_object (object *op, int action)
747{ 730{
748 if (op == NULL) 731 if (!op)
749 { 732 {
750 /* this should never happen */ 733 /* this should never happen */
751 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
752 return; 735 return;
753 } 736 }
754 737
755 if (op->env) 738 if (!op->is_on_map ())
756 { 739 {
757 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
758 * to do in this case. 741 * to do in this case.
759 */ 742 */
760 return; 743 return;
761 } 744 }
762
763 /* If the map is saving, don't do anything as everything is
764 * going to get freed anyways.
765 */
766 if (!op->map || op->map->in_memory == MAP_SAVING)
767 return;
768 745
769 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
770 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
771 { 748 {
772 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
… …
915object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
916{ 893{
917 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
918 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
919 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
920 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
921 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
922 if (!inv) 899 if (!inv)
923 return; 900 return;
924 901
925 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
… …
932 || map->nodrop 909 || map->nodrop
933 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
934 { 911 {
935 while (inv) 912 while (inv)
936 { 913 {
937 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
938 inv->destroy (); 915 inv->destroy ();
939 } 916 }
940 } 917 }
941 else 918 else
942 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
… …
948 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
949 || op->type == RUNE 926 || op->type == RUNE
950 || op->type == TRAP 927 || op->type == TRAP
951 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
952 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
953 op->destroy (); 930 op->destroy (true);
954 else 931 else
955 map->insert (op, x, y); 932 map->insert (op, x, y);
956 } 933 }
957 } 934 }
958} 935}
… …
962 object *op = new object; 939 object *op = new object;
963 op->link (); 940 op->link ();
964 return op; 941 return op;
965} 942}
966 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
967void 964void
968object::do_destroy () 965object::do_destroy ()
969{ 966{
970 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
971 remove_button_link (this); 968 remove_button_link (this);
… …
975 972
976 remove (); 973 remove ();
977 974
978 attachable::do_destroy (); 975 attachable::do_destroy ();
979 976
980 destroy_inv (true);
981
982 deactivate (); 977 deactivate ();
983 unlink (); 978 unlink ();
984 979
985 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
986 981
987 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
988 {
989 static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991 if (!freed_map)
992 {
993 freed_map = new maptile;
994
995 freed_map->path = "<freed objects map>";
996 freed_map->name = "/internal/freed_objects_map";
997 freed_map->width = 3;
998 freed_map->height = 3;
999 freed_map->nodrop = 1;
1000
1001 freed_map->alloc ();
1002 freed_map->in_memory = MAP_ACTIVE;
1003 }
1004
1005 map = freed_map; 983 map = &freed_map;
1006 x = 1; 984 x = 1;
1007 y = 1; 985 y = 1;
1008 }
1009 986
1010 if (more) 987 if (more)
1011 { 988 {
1012 more->destroy (); 989 more->destroy ();
1013 more = 0; 990 more = 0;
… …
1026object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
1027{ 1004{
1028 if (destroyed ()) 1005 if (destroyed ())
1029 return; 1006 return;
1030 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
1031 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
1032 destroy_inv (false);
1033 1016
1034 if (is_head ()) 1017 if (is_head ())
1035 if (sound_destroy) 1018 if (sound_destroy)
1036 play_sound (sound_destroy); 1019 play_sound (sound_destroy);
1037 else if (flag [FLAG_MONSTER]) 1020 else if (flag [FLAG_MONSTER])
… …
1056 if (flag [FLAG_REMOVED]) 1039 if (flag [FLAG_REMOVED])
1057 return; 1040 return;
1058 1041
1059 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1060 1043
1061 if (object *pl = visible_to ())
1062 esrv_del_item (pl->contr, count);
1063
1064 flag [FLAG_REMOVED] = true; 1044 flag [FLAG_REMOVED] = true;
1065 1045
1066 if (more) 1046 if (more)
1067 more->remove (); 1047 more->remove ();
1068 1048
… …
1070 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1071 * inventory. 1051 * inventory.
1072 */ 1052 */
1073 if (env) 1053 if (env)
1074 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1075 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1076 1061
1062 // make sure cmov optimisation is applicable
1077 *(above ? &above->below : &env->inv) = below; 1063 *(above ? &above->below : &env->inv) = below;
1064 *(below ? &below->above : &above ) = above; // &above is just a dummy
1078 1065
1079 if (below) 1066 above = 0;
1080 below->above = above; 1067 below = 0;
1068 env = 0;
1081 1069
1082 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1083 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1084 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1085 */ 1073 */
1086 map = env->map; 1074 map = env->map;
1087 x = env->x; 1075 x = env->x;
1088 y = env->y; 1076 y = env->y;
1089 above = 0;
1090 below = 0;
1091 env = 0;
1092 1077
1093 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
1094 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
1095 * to save cpu time. 1080 * to save cpu time.
1096 */ 1081 */
1097 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1098 otmp->update_stats (); 1083 otmp->update_stats ();
1099 } 1084 }
1100 else if (map) 1085 else if (map)
1101 { 1086 {
1102 if (type == PLAYER)
1103 {
1104 // leaving a spot always closes any open container on the ground
1105 if (container && !container->env)
1106 // this causes spurious floorbox updates, but it ensures
1107 // that the CLOSE event is being sent.
1108 close_container ();
1109
1110 --map->players;
1111 map->touch ();
1112 }
1113
1114 map->dirty = true; 1087 map->dirty = true;
1115 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1116 1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
1111
1117 /* link the object above us */ 1112 /* link the object above us */
1118 if (above) 1113 // re-link, make sure compiler can easily use cmove
1119 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1120 else 1115 *(below ? &below->above : &ms.bot) = above;
1121 ms.top = below; /* we were top, set new top */
1122
1123 /* Relink the object below us, if there is one */
1124 if (below)
1125 below->above = above;
1126 else
1127 {
1128 /* Nothing below, which means we need to relink map object for this space
1129 * use translated coordinates in case some oddness with map tiling is
1130 * evident
1131 */
1132 if (GET_MAP_OB (map, x, y) != this)
1133 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 ());
1134
1135 ms.bot = above; /* goes on above it. */
1136 }
1137 1116
1138 above = 0; 1117 above = 0;
1139 below = 0; 1118 below = 0;
1140 1119
1141 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
… …
1150 * removed (most likely destroyed), update the player view 1129 * removed (most likely destroyed), update the player view
1151 * appropriately. 1130 * appropriately.
1152 */ 1131 */
1153 pl->close_container (); 1132 pl->close_container ();
1154 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)
1155 pl->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1156 } 1139 }
1157 1140
1158 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1159 { 1142 {
1160 /* 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
… …
1286object * 1269object *
1287insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1288{ 1271{
1289 assert (!op->flag [FLAG_FREED]); 1272 assert (!op->flag [FLAG_FREED]);
1290 1273
1291 object *top, *floor = NULL;
1292
1293 op->remove (); 1274 op->remove ();
1294 1275
1295 /* Ideally, the caller figures this out. However, it complicates a lot 1276 /* Ideally, the caller figures this out. However, it complicates a lot
1296 * of areas of callers (eg, anything that uses find_free_spot would now 1277 * of areas of callers (eg, anything that uses find_free_spot would now
1297 * need extra work 1278 * need extra work
1298 */ 1279 */
1299 if (!xy_normalise (m, op->x, op->y)) 1280 if (!xy_normalise (m, op->x, op->y))
1300 { 1281 {
1301 op->destroy (); 1282 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1302 return 0; 1283 return 0;
1303 } 1284 }
1304 1285
1305 if (object *more = op->more) 1286 if (object *more = op->more)
1306 if (!insert_ob_in_map (more, m, originator, flag)) 1287 if (!insert_ob_in_map (more, m, originator, flag))
… …
1315 */ 1296 */
1316 if (op->nrof && !(flag & INS_NO_MERGE)) 1297 if (op->nrof && !(flag & INS_NO_MERGE))
1317 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1298 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318 if (object::can_merge (op, tmp)) 1299 if (object::can_merge (op, tmp))
1319 { 1300 {
1301 // TODO: we atcually want to update tmp, not op,
1302 // but some caller surely breaks when we return tmp
1303 // from here :/
1320 op->nrof += tmp->nrof; 1304 op->nrof += tmp->nrof;
1321 tmp->destroy (1); 1305 tmp->destroy (1);
1322 } 1306 }
1323 1307
1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1308 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1346 /* since *below* originator, no need to update top */ 1330 /* since *below* originator, no need to update top */
1347 originator->below = op; 1331 originator->below = op;
1348 } 1332 }
1349 else 1333 else
1350 { 1334 {
1335 object *top, *floor = NULL;
1336
1351 top = ms.bot; 1337 top = ms.bot;
1352 1338
1353 /* If there are other objects, then */ 1339 /* If there are other objects, then */
1354 if (top) 1340 if (top)
1355 { 1341 {
… …
1454 } 1440 }
1455 1441
1456 op->map->dirty = true; 1442 op->map->dirty = true;
1457 1443
1458 if (object *pl = ms.player ()) 1444 if (object *pl = ms.player ())
1445 //TODO: the floorbox prev/next might need updating
1446 //esrv_send_item (pl, op);
1447 //TODO: update floorbox to preserve ordering
1448 if (pl->contr->ns)
1459 pl->contr->ns->floorbox_update (); 1449 pl->contr->ns->floorbox_update ();
1460 1450
1461 /* If this object glows, it may affect lighting conditions that are 1451 /* If this object glows, it may affect lighting conditions that are
1462 * visible to others on this map. But update_all_los is really 1452 * visible to others on this map. But update_all_los is really
1463 * an inefficient way to do this, as it means los for all players 1453 * an inefficient way to do this, as it means los for all players
1464 * on the map will get recalculated. The players could very well 1454 * on the map will get recalculated. The players could very well
… …
1584 } 1574 }
1585 else 1575 else
1586 { 1576 {
1587 decrease (nr); 1577 decrease (nr);
1588 1578
1589 object *op = object_create_clone (this); 1579 object *op = deep_clone ();
1590 op->nrof = nr; 1580 op->nrof = nr;
1591 return op; 1581 return op;
1592 } 1582 }
1593} 1583}
1594 1584
… …
1815 LOG (llevError, "Present_arch called outside map.\n"); 1805 LOG (llevError, "Present_arch called outside map.\n");
1816 return NULL; 1806 return NULL;
1817 } 1807 }
1818 1808
1819 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820 if (tmp->arch == at) 1810 if (tmp->arch->archname == at->archname)
1821 return tmp; 1811 return tmp;
1822 1812
1823 return NULL; 1813 return NULL;
1824} 1814}
1825 1815
… …
1889 * The first matching object is returned, or NULL if none. 1879 * The first matching object is returned, or NULL if none.
1890 */ 1880 */
1891object * 1881object *
1892present_arch_in_ob (const archetype *at, const object *op) 1882present_arch_in_ob (const archetype *at, const object *op)
1893{ 1883{
1894 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1884 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895 if (tmp->arch == at) 1885 if (tmp->arch->archname == at->archname)
1896 return tmp; 1886 return tmp;
1897 1887
1898 return NULL; 1888 return NULL;
1899} 1889}
1900 1890
… …
2309 2299
2310/* 2300/*
2311 * create clone from object to another 2301 * create clone from object to another
2312 */ 2302 */
2313object * 2303object *
2314object_create_clone (object *asrc) 2304object::deep_clone ()
2315{ 2305{
2316 object *dst = 0, *tmp, *src, *prev, *item; 2306 assert (("deep_clone called on non-head object", is_head ()));
2317 2307
2318 if (!asrc) 2308 object *dst = clone ();
2319 return 0;
2320 2309
2321 src = asrc->head_ (); 2310 object *prev = dst;
2322
2323 prev = 0;
2324 for (object *part = src; part; part = part->more) 2311 for (object *part = this->more; part; part = part->more)
2325 { 2312 {
2326 tmp = part->clone (); 2313 object *tmp = part->clone ();
2327 tmp->x -= src->x;
2328 tmp->y -= src->y;
2329
2330 if (!part->head)
2331 {
2332 dst = tmp;
2333 tmp->head = 0;
2334 }
2335 else
2336 tmp->head = dst; 2314 tmp->head = dst;
2337
2338 tmp->more = 0;
2339
2340 if (prev)
2341 prev->more = tmp; 2315 prev->more = tmp;
2342
2343 prev = tmp; 2316 prev = tmp;
2344 } 2317 }
2345 2318
2346 for (item = src->inv; item; item = item->below) 2319 for (object *item = inv; item; item = item->below)
2347 insert_ob_in_ob (object_create_clone (item), dst); 2320 insert_ob_in_ob (item->deep_clone (), dst);
2348 2321
2349 return dst; 2322 return dst;
2350} 2323}
2351 2324
2352/* This returns the first object in who's inventory that 2325/* This returns the first object in who's inventory that
… …
2361 return tmp; 2334 return tmp;
2362 2335
2363 return 0; 2336 return 0;
2364} 2337}
2365 2338
2366/* If ob has a field named key, return the link from the list, 2339const shstr &
2367 * otherwise return NULL. 2340object::kv_get (const shstr &key) const
2368 *
2369 * key must be a passed in shared string - otherwise, this won't
2370 * do the desired thing.
2371 */
2372key_value *
2373get_ob_key_link (const object *ob, const char *key)
2374{ 2341{
2375 for (key_value *link = ob->key_values; link; link = link->next) 2342 for (key_value *kv = key_values; kv; kv = kv->next)
2376 if (link->key == key) 2343 if (kv->key == key)
2377 return link;
2378
2379 return 0;
2380}
2381
2382/*
2383 * Returns the value of op has an extra_field for key, or NULL.
2384 *
2385 * The argument doesn't need to be a shared string.
2386 *
2387 * The returned string is shared.
2388 */
2389const char *
2390get_ob_key_value (const object *op, const char *const key)
2391{
2392 key_value *link;
2393 shstr_cmp canonical_key (key);
2394
2395 if (!canonical_key)
2396 {
2397 /* 1. There being a field named key on any object
2398 * implies there'd be a shared string to find.
2399 * 2. Since there isn't, no object has this field.
2400 * 3. Therefore, *this* object doesn't have this field.
2401 */
2402 return 0;
2403 }
2404
2405 /* This is copied from get_ob_key_link() above -
2406 * only 4 lines, and saves the function call overhead.
2407 */
2408 for (link = op->key_values; link; link = link->next)
2409 if (link->key == canonical_key)
2410 return link->value; 2344 return kv->value;
2411 2345
2412 return 0; 2346 return shstr_null;
2413} 2347}
2414 2348
2415/* 2349void
2416 * Updates the canonical_key in op to value. 2350object::kv_set (const shstr &key, const shstr &value)
2417 *
2418 * canonical_key is a shared string (value doesn't have to be).
2419 *
2420 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2421 * keys.
2422 *
2423 * Returns TRUE on success.
2424 */
2425int
2426set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2427{ 2351{
2428 key_value *field = NULL, *last = NULL; 2352 for (key_value *kv = key_values; kv; kv = kv->next)
2429 2353 if (kv->key == key)
2430 for (field = op->key_values; field != NULL; field = field->next)
2431 {
2432 if (field->key != canonical_key)
2433 { 2354 {
2434 last = field; 2355 kv->value = value;
2435 continue; 2356 return;
2436 } 2357 }
2437 2358
2438 if (value) 2359 key_value *kv = new key_value;
2439 field->value = value; 2360
2440 else 2361 kv->next = key_values;
2362 kv->key = key;
2363 kv->value = value;
2364
2365 key_values = kv;
2366}
2367
2368void
2369object::kv_del (const shstr &key)
2370{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key)
2441 { 2373 {
2442 /* Basically, if the archetype has this key set, 2374 key_value *kv = *kvp;
2443 * we need to store the null value so when we save 2375 *kvp = (*kvp)->next;
2444 * it, we save the empty value so that when we load, 2376 delete kv;
2445 * we get this value back again. 2377 return;
2446 */
2447 if (get_ob_key_link (op->arch, canonical_key))
2448 field->value = 0;
2449 else
2450 {
2451 if (last)
2452 last->next = field->next;
2453 else
2454 op->key_values = field->next;
2455
2456 delete field;
2457 }
2458 } 2378 }
2459 return TRUE;
2460 }
2461 /* IF we get here, key doesn't exist */
2462
2463 /* No field, we'll have to add it. */
2464
2465 if (!add_key)
2466 return FALSE;
2467
2468 /* There isn't any good reason to store a null
2469 * value in the key/value list. If the archetype has
2470 * this key, then we should also have it, so shouldn't
2471 * be here. If user wants to store empty strings,
2472 * should pass in ""
2473 */
2474 if (value == NULL)
2475 return TRUE;
2476
2477 field = new key_value;
2478
2479 field->key = canonical_key;
2480 field->value = value;
2481 /* Usual prepend-addition. */
2482 field->next = op->key_values;
2483 op->key_values = field;
2484
2485 return TRUE;
2486}
2487
2488/*
2489 * Updates the key in op to value.
2490 *
2491 * If add_key is FALSE, this will only update existing keys,
2492 * and not add new ones.
2493 * In general, should be little reason FALSE is ever passed in for add_key
2494 *
2495 * Returns TRUE on success.
2496 */
2497int
2498set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2499{
2500 shstr key_ (key);
2501
2502 return set_ob_key_value_s (op, key_, value, add_key);
2503} 2379}
2504 2380
2505object::depth_iterator::depth_iterator (object *container) 2381object::depth_iterator::depth_iterator (object *container)
2506: iterator_base (container) 2382: iterator_base (container)
2507{ 2383{
… …
2565 &name, 2441 &name,
2566 title ? "\",title:\"" : "", 2442 title ? "\",title:\"" : "",
2567 title ? (const char *)title : "", 2443 title ? (const char *)title : "",
2568 flag_desc (flagdesc, 512), type); 2444 flag_desc (flagdesc, 512), type);
2569 2445
2570 if (!this->flag[FLAG_REMOVED] && env) 2446 if (!flag[FLAG_REMOVED] && env)
2571 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2447 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572 2448
2573 if (map) 2449 if (map)
2574 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2450 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575 2451
… …
2605object::open_container (object *new_container) 2481object::open_container (object *new_container)
2606{ 2482{
2607 if (container == new_container) 2483 if (container == new_container)
2608 return; 2484 return;
2609 2485
2610 if (object *old_container = container) 2486 object *old_container = container;
2487
2488 if (old_container)
2611 { 2489 {
2612 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2490 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613 return; 2491 return;
2614 2492
2615#if 0 2493#if 0
… …
2617 if (object *closer = old_container->inv) 2495 if (object *closer = old_container->inv)
2618 if (closer->type == CLOSE_CON) 2496 if (closer->type == CLOSE_CON)
2619 closer->destroy (); 2497 closer->destroy ();
2620#endif 2498#endif
2621 2499
2500 // make sure the container is available
2501 esrv_send_item (this, old_container);
2502
2622 old_container->flag [FLAG_APPLIED] = 0; 2503 old_container->flag [FLAG_APPLIED] = false;
2623 container = 0; 2504 container = 0;
2624 2505
2506 // client needs item update to make it work, client bug requires this to be separate
2625 esrv_update_item (UPD_FLAGS, this, old_container); 2507 esrv_update_item (UPD_FLAGS, this, old_container);
2508
2626 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627 play_sound (sound_find ("chest_close")); 2510 play_sound (sound_find ("chest_close"));
2628 } 2511 }
2629 2512
2630 if (new_container) 2513 if (new_container)
… …
2643 } 2526 }
2644#endif 2527#endif
2645 2528
2646 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2529 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647 2530
2531 // make sure the container is available, client bug requires this to be separate
2532 esrv_send_item (this, new_container);
2533
2648 new_container->flag [FLAG_APPLIED] = 1; 2534 new_container->flag [FLAG_APPLIED] = true;
2649 container = new_container; 2535 container = new_container;
2650 2536
2537 // client needs flag change
2651 esrv_update_item (UPD_FLAGS, this, new_container); 2538 esrv_update_item (UPD_FLAGS, this, new_container);
2652 esrv_send_inventory (this, new_container); 2539 esrv_send_inventory (this, new_container);
2653 play_sound (sound_find ("chest_open")); 2540 play_sound (sound_find ("chest_open"));
2654 } 2541 }
2542// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset ();
2655} 2544}
2656 2545
2657object * 2546object *
2658object::force_find (const shstr name) 2547object::force_find (const shstr name)
2659{ 2548{

Diff Legend

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