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

Diff Legend

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