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.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 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 *
… …
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 207
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224 210
225 if (ob1->arch->name != ob2->arch->name 211 if (ob1->arch->archname != ob2->arch->archname
226 || ob1->name != ob2->name 212 || ob1->name != ob2->name
227 || ob1->title != ob2->title 213 || ob1->title != ob2->title
228 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
229 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
230 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
231 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
232 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
233 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
234 || ob1->value != ob2->value 220 || ob1->value != ob2->value
235 || 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
236 || ob1->client_type != ob2->client_type 223 || ob1->client_type != ob2->client_type
237 || ob1->materialname != ob2->materialname 224 || ob1->materialname != ob2->materialname
238 || ob1->lore != ob2->lore 225 || ob1->lore != ob2->lore
239 || ob1->subtype != ob2->subtype 226 || ob1->subtype != ob2->subtype
240 || ob1->move_type != ob2->move_type 227 || ob1->move_type != ob2->move_type
… …
358 else 345 else
359 { 346 {
360 // maybe there is a player standing on the same mapspace 347 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player 348 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ()) 349 if (object *pl = ms ().player ())
350 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363 if (!pl->container || this == pl->container) 351 || this == pl->container)
364 return pl; 352 return pl;
365 } 353 }
366 } 354 }
367 355
368 return 0; 356 return 0;
369} 357}
370 358
371// adjust weight per container type ("of holding") 359// adjust weight per container type ("of holding")
372static sint32 360static sint32
373weight_adjust (object *op, sint32 weight) 361weight_adjust_for (object *op, sint32 weight)
374{ 362{
375 return op->type == CONTAINER 363 return op->type == CONTAINER
376 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 364 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377 : weight; 365 : weight;
378} 366}
… …
384static void 372static void
385adjust_weight (object *op, sint32 weight) 373adjust_weight (object *op, sint32 weight)
386{ 374{
387 while (op) 375 while (op)
388 { 376 {
377 // adjust by actual difference to account for rounding errors
378 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389 weight = weight_adjust (op, weight); 379 weight = weight_adjust_for (op, op->carrying)
380 - weight_adjust_for (op, op->carrying - weight);
390 381
391 if (!weight) 382 if (!weight)
392 return; 383 return;
393 384
394 op->carrying += weight; 385 op->carrying += weight;
… …
417 op->update_weight (); 408 op->update_weight ();
418 409
419 sum += op->total_weight (); 410 sum += op->total_weight ();
420 } 411 }
421 412
422 sum = weight_adjust (this, sum); 413 sum = weight_adjust_for (this, sum);
423 414
424 if (sum != carrying) 415 if (sum != carrying)
425 { 416 {
426 carrying = sum; 417 carrying = sum;
427 418
… …
489 */ 480 */
490object * 481object *
491find_object_name (const char *str) 482find_object_name (const char *str)
492{ 483{
493 shstr_cmp str_ (str); 484 shstr_cmp str_ (str);
494 object *op;
495 485
486 if (str_)
496 for_all_objects (op) 487 for_all_objects (op)
497 if (op->name == str_) 488 if (op->name == str_)
498 break; 489 return op;
499 490
500 return op; 491 return 0;
501} 492}
502 493
503/* 494/*
504 * Sets the owner and sets the skill and exp pointers to owner's current 495 * Sets the owner and sets the skill and exp pointers to owner's current
505 * skill and experience objects. 496 * skill and experience objects.
… …
603 } 594 }
604 595
605 op->key_values = 0; 596 op->key_values = 0;
606} 597}
607 598
608object & 599/*
609object::operator =(const object &src) 600 * copy_to first frees everything allocated by the dst object,
601 * and then copies the contents of itself into the second
602 * object, allocating what needs to be allocated. Basically, any
603 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
604 * if the first object is freed, the pointers in the new object
605 * will point at garbage.
606 */
607void
608object::copy_to (object *dst)
610{ 609{
611 bool is_freed = flag [FLAG_FREED]; 610 dst->remove ();
612 bool is_removed = flag [FLAG_REMOVED];
613
614 *(object_copy *)this = src; 611 *(object_copy *)dst = *this;
615
616 flag [FLAG_FREED] = is_freed;
617 flag [FLAG_REMOVED] = is_removed; 612 dst->flag [FLAG_REMOVED] = true;
618 613
619 /* Copy over key_values, if any. */ 614 /* Copy over key_values, if any. */
620 if (src.key_values) 615 if (key_values)
621 { 616 {
622 key_value *tail = 0; 617 key_value *tail = 0;
623 key_values = 0; 618 dst->key_values = 0;
624 619
625 for (key_value *i = src.key_values; i; i = i->next) 620 for (key_value *i = key_values; i; i = i->next)
626 { 621 {
627 key_value *new_link = new key_value; 622 key_value *new_link = new key_value;
628 623
629 new_link->next = 0; 624 new_link->next = 0;
630 new_link->key = i->key; 625 new_link->key = i->key;
631 new_link->value = i->value; 626 new_link->value = i->value;
632 627
633 /* Try and be clever here, too. */ 628 /* Try and be clever here, too. */
634 if (!key_values) 629 if (!dst->key_values)
635 { 630 {
636 key_values = new_link; 631 dst->key_values = new_link;
637 tail = new_link; 632 tail = new_link;
638 } 633 }
639 else 634 else
640 { 635 {
641 tail->next = new_link; 636 tail->next = new_link;
642 tail = new_link; 637 tail = new_link;
643 } 638 }
644 } 639 }
645 } 640 }
646}
647
648/*
649 * copy_to first frees everything allocated by the dst object,
650 * and then copies the contents of itself into the second
651 * object, allocating what needs to be allocated. Basically, any
652 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
653 * if the first object is freed, the pointers in the new object
654 * will point at garbage.
655 */
656void
657object::copy_to (object *dst)
658{
659 *dst = *this;
660 641
661 if (speed < 0) 642 if (speed < 0)
662 dst->speed_left -= rndm (); 643 dst->speed_left -= rndm ();
663 644
664 dst->set_speed (dst->speed); 645 dst->set_speed (dst->speed);
… …
686object * 667object *
687object::clone () 668object::clone ()
688{ 669{
689 object *neu = create (); 670 object *neu = create ();
690 copy_to (neu); 671 copy_to (neu);
672 neu->map = map; // not copied by copy_to
691 return neu; 673 return neu;
692} 674}
693 675
694/* 676/*
695 * If an object with the IS_TURNABLE() flag needs to be turned due 677 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
746 * UP_OBJ_FACE: only the objects face has changed. 728 * UP_OBJ_FACE: only the objects face has changed.
747 */ 729 */
748void 730void
749update_object (object *op, int action) 731update_object (object *op, int action)
750{ 732{
751 if (op == NULL) 733 if (!op)
752 { 734 {
753 /* this should never happen */ 735 /* this should never happen */
754 LOG (llevDebug, "update_object() called for NULL object.\n"); 736 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
755 return; 737 return;
756 } 738 }
757 739
758 if (op->env) 740 if (!op->is_on_map ())
759 { 741 {
760 /* Animation is currently handled by client, so nothing 742 /* Animation is currently handled by client, so nothing
761 * to do in this case. 743 * to do in this case.
762 */ 744 */
763 return; 745 return;
764 } 746 }
765
766 /* If the map is saving, don't do anything as everything is
767 * going to get freed anyways.
768 */
769 if (!op->map || op->map->in_memory == MAP_SAVING)
770 return;
771 747
772 /* make sure the object is within map boundaries */ 748 /* make sure the object is within map boundaries */
773 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 749 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
774 { 750 {
775 LOG (llevError, "update_object() called for object out of map!\n"); 751 LOG (llevError, "update_object() called for object out of map!\n");
… …
930 * drop on that space. 906 * drop on that space.
931 */ 907 */
932 if (!drop_to_ground 908 if (!drop_to_ground
933 || !map 909 || !map
934 || map->in_memory != MAP_ACTIVE 910 || map->in_memory != MAP_ACTIVE
935 || map->nodrop 911 || map->no_drop
936 || ms ().move_block == MOVE_ALL) 912 || ms ().move_block == MOVE_ALL)
937 { 913 {
938 while (inv) 914 while (inv)
939 {
940 inv->destroy_inv (false);
941 inv->destroy (); 915 inv->destroy (true);
942 }
943 } 916 }
944 else 917 else
945 { /* Put objects in inventory onto this space */ 918 { /* Put objects in inventory onto this space */
946 while (inv) 919 while (inv)
947 { 920 {
… …
965 object *op = new object; 938 object *op = new object;
966 op->link (); 939 op->link ();
967 return op; 940 return op;
968} 941}
969 942
943static struct freed_map : maptile
944{
945 freed_map ()
946 {
947 path = "<freed objects map>";
948 name = "/internal/freed_objects_map";
949 width = 3;
950 height = 3;
951 no_drop = 1;
952 no_reset = 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
970void 964void
971object::do_destroy () 965object::do_destroy ()
972{ 966{
973 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
974 remove_button_link (this); 968 remove_button_link (this);
… …
984 unlink (); 978 unlink ();
985 979
986 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
987 981
988 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
989 {
990 static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992 if (!freed_map)
993 {
994 freed_map = new maptile;
995
996 freed_map->path = "<freed objects map>";
997 freed_map->name = "/internal/freed_objects_map";
998 freed_map->width = 3;
999 freed_map->height = 3;
1000 freed_map->nodrop = 1;
1001
1002 freed_map->alloc ();
1003 freed_map->in_memory = MAP_ACTIVE;
1004 }
1005
1006 map = freed_map; 983 map = &freed_map;
1007 x = 1; 984 x = 1;
1008 y = 1; 985 y = 1;
1009 }
1010 986
1011 if (more) 987 if (more)
1012 { 988 {
1013 more->destroy (); 989 more->destroy ();
1014 more = 0; 990 more = 0;
… …
1031 1007
1032 if (!is_head () && !head->destroyed ()) 1008 if (!is_head () && !head->destroyed ())
1033 { 1009 {
1034 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1035 head->destroy (destroy_inventory); 1011 head->destroy (destroy_inventory);
1012 return;
1036 } 1013 }
1037 1014
1038 destroy_inv (!destroy_inventory); 1015 destroy_inv (!destroy_inventory);
1039 1016
1040 if (is_head ()) 1017 if (is_head ())
… …
1073 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1074 * inventory. 1051 * inventory.
1075 */ 1052 */
1076 if (env) 1053 if (env)
1077 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1078 if (object *pl = visible_to ()) 1056 if (object *pl = visible_to ())
1079 esrv_del_item (pl->contr, count); 1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1080 1059
1081 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1082
1083 *(above ? &above->below : &env->inv) = below;
1084
1085 if (below)
1086 below->above = above;
1087 1061
1088 /* we set up values so that it could be inserted into 1062 /* we set up values so that it could be inserted into
1089 * the map, but we don't actually do that - it is up 1063 * the map, but we don't actually do that - it is up
1090 * to the caller to decide what we want to do. 1064 * to the caller to decide what we want to do.
1091 */ 1065 */
1092 map = env->map; 1066 map = env->map;
1093 x = env->x; 1067 x = env->x;
1094 y = env->y; 1068 y = env->y;
1069
1070 // make sure cmov optimisation is applicable
1071 *(above ? &above->below : &env->inv) = below;
1072 *(below ? &below->above : &above ) = above; // &above is just a dummy
1073
1095 above = 0; 1074 above = 0;
1096 below = 0; 1075 below = 0;
1097 env = 0; 1076 env = 0;
1098 1077
1099 /* 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
… …
1129 1108
1130 esrv_del_item (pl->contr, count); 1109 esrv_del_item (pl->contr, count);
1131 } 1110 }
1132 1111
1133 /* link the object above us */ 1112 /* link the object above us */
1134 if (above) 1113 // re-link, make sure compiler can easily use cmove
1135 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1136 else 1115 *(below ? &below->above : &ms.bot) = above;
1137 ms.top = below; /* we were top, set new top */
1138
1139 /* Relink the object below us, if there is one */
1140 if (below)
1141 below->above = above;
1142 else
1143 {
1144 /* Nothing below, which means we need to relink map object for this space
1145 * use translated coordinates in case some oddness with map tiling is
1146 * evident
1147 */
1148 if (GET_MAP_OB (map, x, y) != this)
1149 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 ());
1150
1151 ms.bot = above; /* goes on above it. */
1152 }
1153 1116
1154 above = 0; 1117 above = 0;
1155 below = 0; 1118 below = 0;
1156 1119
1157 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
… …
1167 * appropriately. 1130 * appropriately.
1168 */ 1131 */
1169 pl->close_container (); 1132 pl->close_container ();
1170 1133
1171 //TODO: the floorbox prev/next might need updating 1134 //TODO: the floorbox prev/next might need updating
1172 esrv_del_item (pl->contr, count); 1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns)
1138 pl->contr->ns->floorbox_update ();
1173 } 1139 }
1174 1140
1175 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1176 { 1142 {
1177 /* 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
… …
1269 * job preparing multi-part monsters. 1235 * job preparing multi-part monsters.
1270 */ 1236 */
1271object * 1237object *
1272insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1238insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1273{ 1239{
1240 op->remove ();
1241
1274 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1242 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1275 { 1243 {
1276 tmp->x = x + tmp->arch->x; 1244 tmp->x = x + tmp->arch->x;
1277 tmp->y = y + tmp->arch->y; 1245 tmp->y = y + tmp->arch->y;
1278 } 1246 }
… …
1301 * just 'op' otherwise 1269 * just 'op' otherwise
1302 */ 1270 */
1303object * 1271object *
1304insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1305{ 1273{
1306 assert (!op->flag [FLAG_FREED]); 1274 if (op->is_on_map ())
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object already on map");
1277 abort ();
1278 }
1307 1279
1280 if (op->env)
1281 {
1282 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1308 op->remove (); 1283 op->remove ();
1284 }
1285
1286 if (op->face && !face_info (op->face))//D TODO: remove soon
1287 {//D
1288 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1289 op->face = 1;//D
1290 }//D
1309 1291
1310 /* Ideally, the caller figures this out. However, it complicates a lot 1292 /* Ideally, the caller figures this out. However, it complicates a lot
1311 * of areas of callers (eg, anything that uses find_free_spot would now 1293 * of areas of callers (eg, anything that uses find_free_spot would now
1312 * need extra work 1294 * need extra work
1313 */ 1295 */
1314 if (!xy_normalise (m, op->x, op->y)) 1296 if (!xy_normalise (m, op->x, op->y))
1315 { 1297 {
1316 op->destroy (1); 1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1317 return 0; 1299 return 0;
1318 } 1300 }
1319 1301
1320 if (object *more = op->more) 1302 if (object *more = op->more)
1321 if (!insert_ob_in_map (more, m, originator, flag)) 1303 if (!insert_ob_in_map (more, m, originator, flag))
… …
1330 */ 1312 */
1331 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
1332 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1314 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1333 if (object::can_merge (op, tmp)) 1315 if (object::can_merge (op, tmp))
1334 { 1316 {
1335 // TODO: we atcually want to update tmp, not op, 1317 // TODO: we actually want to update tmp, not op,
1336 // but some caller surely breaks when we return tmp 1318 // but some caller surely breaks when we return tmp
1337 // from here :/ 1319 // from here :/
1338 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1339 tmp->destroy (1); 1321 tmp->destroy (1);
1340 } 1322 }
… …
1351 { 1333 {
1352 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1334 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1353 abort (); 1335 abort ();
1354 } 1336 }
1355 1337
1338 if (!originator->is_on_map ())
1339 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340 op->debug_desc (), originator->debug_desc ());
1341
1356 op->above = originator; 1342 op->above = originator;
1357 op->below = originator->below; 1343 op->below = originator->below;
1358
1359 if (op->below)
1360 op->below->above = op;
1361 else
1362 ms.bot = op;
1363
1364 /* since *below* originator, no need to update top */
1365 originator->below = op; 1344 originator->below = op;
1345
1346 *(op->below ? &op->below->above : &ms.bot) = op;
1366 } 1347 }
1367 else 1348 else
1368 { 1349 {
1369 object *top, *floor = NULL; 1350 object *floor = 0;
1370 1351 object *top = ms.top;
1371 top = ms.bot;
1372 1352
1373 /* If there are other objects, then */ 1353 /* If there are other objects, then */
1374 if (top) 1354 if (top)
1375 { 1355 {
1376 object *last = 0;
1377
1378 /* 1356 /*
1379 * If there are multiple objects on this space, we do some trickier handling. 1357 * If there are multiple objects on this space, we do some trickier handling.
1380 * We've already dealt with merging if appropriate. 1358 * We've already dealt with merging if appropriate.
1381 * Generally, we want to put the new object on top. But if 1359 * Generally, we want to put the new object on top. But if
1382 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1360 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1385 * once we get to them. This reduces the need to traverse over all of 1363 * once we get to them. This reduces the need to traverse over all of
1386 * them when adding another one - this saves quite a bit of cpu time 1364 * them when adding another one - this saves quite a bit of cpu time
1387 * when lots of spells are cast in one area. Currently, it is presumed 1365 * when lots of spells are cast in one area. Currently, it is presumed
1388 * that flying non pickable objects are spell objects. 1366 * that flying non pickable objects are spell objects.
1389 */ 1367 */
1390 for (top = ms.bot; top; top = top->above) 1368 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1391 { 1369 {
1392 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1370 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1393 floor = top; 1371 floor = tmp;
1394 1372
1395 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1373 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1396 { 1374 {
1397 /* We insert above top, so we want this object below this */ 1375 /* We insert above top, so we want this object below this */
1398 top = top->below; 1376 top = tmp->below;
1399 break; 1377 break;
1400 } 1378 }
1401 1379
1402 last = top; 1380 top = tmp;
1403 } 1381 }
1404
1405 /* Don't want top to be NULL, so set it to the last valid object */
1406 top = last;
1407 1382
1408 /* We let update_position deal with figuring out what the space 1383 /* We let update_position deal with figuring out what the space
1409 * looks like instead of lots of conditions here. 1384 * looks like instead of lots of conditions here.
1410 * makes things faster, and effectively the same result. 1385 * makes things faster, and effectively the same result.
1411 */ 1386 */
… …
1418 */ 1393 */
1419 if (!(flag & INS_ON_TOP) 1394 if (!(flag & INS_ON_TOP)
1420 && ms.flags () & P_BLOCKSVIEW 1395 && ms.flags () & P_BLOCKSVIEW
1421 && (op->face && !faces [op->face].visibility)) 1396 && (op->face && !faces [op->face].visibility))
1422 { 1397 {
1398 object *last;
1399
1423 for (last = top; last != floor; last = last->below) 1400 for (last = top; last != floor; last = last->below)
1424 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1401 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1425 break; 1402 break;
1426 1403
1427 /* Check to see if we found the object that blocks view, 1404 /* Check to see if we found the object that blocks view,
… …
1435 } /* If objects on this space */ 1412 } /* If objects on this space */
1436 1413
1437 if (flag & INS_ABOVE_FLOOR_ONLY) 1414 if (flag & INS_ABOVE_FLOOR_ONLY)
1438 top = floor; 1415 top = floor;
1439 1416
1440 /* Top is the object that our object (op) is going to get inserted above. 1417 // insert object above top, or bottom-most if top = 0
1441 */
1442
1443 /* First object on this space */
1444 if (!top) 1418 if (!top)
1445 { 1419 {
1420 op->below = 0;
1446 op->above = ms.bot; 1421 op->above = ms.bot;
1447
1448 if (op->above)
1449 op->above->below = op;
1450
1451 op->below = 0;
1452 ms.bot = op; 1422 ms.bot = op;
1423
1424 *(op->above ? &op->above->below : &ms.top) = op;
1453 } 1425 }
1454 else 1426 else
1455 { /* get inserted into the stack above top */ 1427 {
1456 op->above = top->above; 1428 op->above = top->above;
1457
1458 if (op->above)
1459 op->above->below = op; 1429 top->above = op;
1460 1430
1461 op->below = top; 1431 op->below = top;
1462 top->above = op; 1432 *(op->above ? &op->above->below : &ms.top) = op;
1463 } 1433 }
1464 1434 }
1465 if (!op->above)
1466 ms.top = op;
1467 } /* else not INS_BELOW_ORIGINATOR */
1468 1435
1469 if (op->type == PLAYER) 1436 if (op->type == PLAYER)
1470 { 1437 {
1471 op->contr->do_los = 1; 1438 op->contr->do_los = 1;
1472 ++op->map->players; 1439 ++op->map->players;
… …
1475 1442
1476 op->map->dirty = true; 1443 op->map->dirty = true;
1477 1444
1478 if (object *pl = ms.player ()) 1445 if (object *pl = ms.player ())
1479 //TODO: the floorbox prev/next might need updating 1446 //TODO: the floorbox prev/next might need updating
1480 esrv_send_item (pl, op); 1447 //esrv_send_item (pl, op);
1448 //TODO: update floorbox to preserve ordering
1449 if (pl->contr->ns)
1450 pl->contr->ns->floorbox_update ();
1481 1451
1482 /* If this object glows, it may affect lighting conditions that are 1452 /* If this object glows, it may affect lighting conditions that are
1483 * visible to others on this map. But update_all_los is really 1453 * visible to others on this map. But update_all_los is really
1484 * an inefficient way to do this, as it means los for all players 1454 * an inefficient way to do this, as it means los for all players
1485 * on the map will get recalculated. The players could very well 1455 * on the map will get recalculated. The players could very well
… …
1569 1539
1570 nrof -= nr; 1540 nrof -= nr;
1571 1541
1572 if (nrof) 1542 if (nrof)
1573 { 1543 {
1574 adjust_weight (env, -weight * nr); // carrying == 0 1544 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1575 1545
1576 if (object *pl = visible_to ()) 1546 if (object *pl = visible_to ())
1577 esrv_update_item (UPD_NROF, pl, this); 1547 esrv_update_item (UPD_NROF, pl, this);
1578 1548
1579 return true; 1549 return true;
1580 } 1550 }
1581 else 1551 else
1582 { 1552 {
1583 destroy (1); 1553 destroy ();
1584 return false; 1554 return false;
1585 } 1555 }
1586} 1556}
1587 1557
1588/* 1558/*
… …
1605 } 1575 }
1606 else 1576 else
1607 { 1577 {
1608 decrease (nr); 1578 decrease (nr);
1609 1579
1610 object *op = object_create_clone (this); 1580 object *op = deep_clone ();
1611 op->nrof = nr; 1581 op->nrof = nr;
1612 return op; 1582 return op;
1613 } 1583 }
1614} 1584}
1615 1585
… …
1836 LOG (llevError, "Present_arch called outside map.\n"); 1806 LOG (llevError, "Present_arch called outside map.\n");
1837 return NULL; 1807 return NULL;
1838 } 1808 }
1839 1809
1840 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1810 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1841 if (tmp->arch == at) 1811 if (tmp->arch->archname == at->archname)
1842 return tmp; 1812 return tmp;
1843 1813
1844 return NULL; 1814 return NULL;
1845} 1815}
1846 1816
… …
1910 * The first matching object is returned, or NULL if none. 1880 * The first matching object is returned, or NULL if none.
1911 */ 1881 */
1912object * 1882object *
1913present_arch_in_ob (const archetype *at, const object *op) 1883present_arch_in_ob (const archetype *at, const object *op)
1914{ 1884{
1915 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1916 if (tmp->arch == at) 1886 if (tmp->arch->archname == at->archname)
1917 return tmp; 1887 return tmp;
1918 1888
1919 return NULL; 1889 return NULL;
1920} 1890}
1921 1891
… …
2330 2300
2331/* 2301/*
2332 * create clone from object to another 2302 * create clone from object to another
2333 */ 2303 */
2334object * 2304object *
2335object_create_clone (object *asrc) 2305object::deep_clone ()
2336{ 2306{
2337 object *dst = 0, *tmp, *src, *prev, *item; 2307 assert (("deep_clone called on non-head object", is_head ()));
2338 2308
2339 if (!asrc) 2309 object *dst = clone ();
2340 return 0;
2341 2310
2342 src = asrc->head_ (); 2311 object *prev = dst;
2343
2344 prev = 0;
2345 for (object *part = src; part; part = part->more) 2312 for (object *part = this->more; part; part = part->more)
2346 { 2313 {
2347 tmp = part->clone (); 2314 object *tmp = part->clone ();
2348 tmp->x -= src->x;
2349 tmp->y -= src->y;
2350
2351 if (!part->head)
2352 {
2353 dst = tmp;
2354 tmp->head = 0;
2355 }
2356 else
2357 tmp->head = dst; 2315 tmp->head = dst;
2358
2359 tmp->more = 0;
2360
2361 if (prev)
2362 prev->more = tmp; 2316 prev->more = tmp;
2363
2364 prev = tmp; 2317 prev = tmp;
2365 } 2318 }
2366 2319
2367 for (item = src->inv; item; item = item->below) 2320 for (object *item = inv; item; item = item->below)
2368 insert_ob_in_ob (object_create_clone (item), dst); 2321 insert_ob_in_ob (item->deep_clone (), dst);
2369 2322
2370 return dst; 2323 return dst;
2371} 2324}
2372 2325
2373/* This returns the first object in who's inventory that 2326/* This returns the first object in who's inventory that
… …
2382 return tmp; 2335 return tmp;
2383 2336
2384 return 0; 2337 return 0;
2385} 2338}
2386 2339
2387/* If ob has a field named key, return the link from the list, 2340const shstr &
2388 * otherwise return NULL. 2341object::kv_get (const shstr &key) const
2389 *
2390 * key must be a passed in shared string - otherwise, this won't
2391 * do the desired thing.
2392 */
2393key_value *
2394get_ob_key_link (const object *ob, const char *key)
2395{ 2342{
2396 for (key_value *link = ob->key_values; link; link = link->next) 2343 for (key_value *kv = key_values; kv; kv = kv->next)
2397 if (link->key == key) 2344 if (kv->key == key)
2398 return link;
2399
2400 return 0;
2401}
2402
2403/*
2404 * Returns the value of op has an extra_field for key, or NULL.
2405 *
2406 * The argument doesn't need to be a shared string.
2407 *
2408 * The returned string is shared.
2409 */
2410const char *
2411get_ob_key_value (const object *op, const char *const key)
2412{
2413 key_value *link;
2414 shstr_cmp canonical_key (key);
2415
2416 if (!canonical_key)
2417 {
2418 /* 1. There being a field named key on any object
2419 * implies there'd be a shared string to find.
2420 * 2. Since there isn't, no object has this field.
2421 * 3. Therefore, *this* object doesn't have this field.
2422 */
2423 return 0;
2424 }
2425
2426 /* This is copied from get_ob_key_link() above -
2427 * only 4 lines, and saves the function call overhead.
2428 */
2429 for (link = op->key_values; link; link = link->next)
2430 if (link->key == canonical_key)
2431 return link->value; 2345 return kv->value;
2432 2346
2433 return 0; 2347 return shstr_null;
2434} 2348}
2435 2349
2436/* 2350void
2437 * Updates the canonical_key in op to value. 2351object::kv_set (const shstr &key, const shstr &value)
2438 *
2439 * canonical_key is a shared string (value doesn't have to be).
2440 *
2441 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2442 * keys.
2443 *
2444 * Returns TRUE on success.
2445 */
2446int
2447set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2448{ 2352{
2449 key_value *field = NULL, *last = NULL; 2353 for (key_value *kv = key_values; kv; kv = kv->next)
2450 2354 if (kv->key == key)
2451 for (field = op->key_values; field != NULL; field = field->next)
2452 {
2453 if (field->key != canonical_key)
2454 { 2355 {
2455 last = field; 2356 kv->value = value;
2456 continue; 2357 return;
2457 } 2358 }
2458 2359
2459 if (value) 2360 key_value *kv = new key_value;
2460 field->value = value; 2361
2461 else 2362 kv->next = key_values;
2363 kv->key = key;
2364 kv->value = value;
2365
2366 key_values = kv;
2367}
2368
2369void
2370object::kv_del (const shstr &key)
2371{
2372 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373 if ((*kvp)->key == key)
2462 { 2374 {
2463 /* Basically, if the archetype has this key set, 2375 key_value *kv = *kvp;
2464 * we need to store the null value so when we save 2376 *kvp = (*kvp)->next;
2465 * it, we save the empty value so that when we load, 2377 delete kv;
2466 * we get this value back again. 2378 return;
2467 */
2468 if (get_ob_key_link (op->arch, canonical_key))
2469 field->value = 0;
2470 else
2471 {
2472 if (last)
2473 last->next = field->next;
2474 else
2475 op->key_values = field->next;
2476
2477 delete field;
2478 }
2479 } 2379 }
2480 return TRUE;
2481 }
2482 /* IF we get here, key doesn't exist */
2483
2484 /* No field, we'll have to add it. */
2485
2486 if (!add_key)
2487 return FALSE;
2488
2489 /* There isn't any good reason to store a null
2490 * value in the key/value list. If the archetype has
2491 * this key, then we should also have it, so shouldn't
2492 * be here. If user wants to store empty strings,
2493 * should pass in ""
2494 */
2495 if (value == NULL)
2496 return TRUE;
2497
2498 field = new key_value;
2499
2500 field->key = canonical_key;
2501 field->value = value;
2502 /* Usual prepend-addition. */
2503 field->next = op->key_values;
2504 op->key_values = field;
2505
2506 return TRUE;
2507}
2508
2509/*
2510 * Updates the key in op to value.
2511 *
2512 * If add_key is FALSE, this will only update existing keys,
2513 * and not add new ones.
2514 * In general, should be little reason FALSE is ever passed in for add_key
2515 *
2516 * Returns TRUE on success.
2517 */
2518int
2519set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2520{
2521 shstr key_ (key);
2522
2523 return set_ob_key_value_s (op, key_, value, add_key);
2524} 2380}
2525 2381
2526object::depth_iterator::depth_iterator (object *container) 2382object::depth_iterator::depth_iterator (object *container)
2527: iterator_base (container) 2383: iterator_base (container)
2528{ 2384{
… …
2578{ 2434{
2579 char flagdesc[512]; 2435 char flagdesc[512];
2580 char info2[256 * 4]; 2436 char info2[256 * 4];
2581 char *p = info; 2437 char *p = info;
2582 2438
2583 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2439 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2584 count, 2440 count,
2585 uuid.c_str (), 2441 uuid.c_str (),
2586 &name, 2442 &name,
2587 title ? "\",title:\"" : "", 2443 title ? ",title:\"" : "",
2588 title ? (const char *)title : "", 2444 title ? (const char *)title : "",
2445 title ? "\"" : "",
2589 flag_desc (flagdesc, 512), type); 2446 flag_desc (flagdesc, 512), type);
2590 2447
2591 if (!flag[FLAG_REMOVED] && env) 2448 if (!flag[FLAG_REMOVED] && env)
2592 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2449 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593 2450

Diff Legend

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