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.221 by root, Thu Apr 24 12:06:01 2008 UTC vs.
Revision 1.241 by root, Wed May 7 19:19:09 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 *
… …
368 return 0; 354 return 0;
369} 355}
370 356
371// adjust weight per container type ("of holding") 357// adjust weight per container type ("of holding")
372static sint32 358static sint32
373weight_adjust (object *op, sint32 weight) 359weight_adjust_for (object *op, sint32 weight)
374{ 360{
375 return op->type == CONTAINER 361 return op->type == CONTAINER
376 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377 : weight; 363 : weight;
378} 364}
… …
384static void 370static void
385adjust_weight (object *op, sint32 weight) 371adjust_weight (object *op, sint32 weight)
386{ 372{
387 while (op) 373 while (op)
388 { 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
389 weight = weight_adjust (op, weight); 377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
390 379
391 if (!weight) 380 if (!weight)
392 return; 381 return;
393 382
394 op->carrying += weight; 383 op->carrying += weight;
… …
417 op->update_weight (); 406 op->update_weight ();
418 407
419 sum += op->total_weight (); 408 sum += op->total_weight ();
420 } 409 }
421 410
422 sum = weight_adjust (this, sum); 411 sum = weight_adjust_for (this, sum);
423 412
424 if (sum != carrying) 413 if (sum != carrying)
425 { 414 {
426 carrying = sum; 415 carrying = sum;
427 416
… …
603 } 592 }
604 593
605 op->key_values = 0; 594 op->key_values = 0;
606} 595}
607 596
608object & 597/*
609object::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)
610{ 607{
611 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
612 bool is_removed = flag [FLAG_REMOVED];
613
614 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
615
616 flag [FLAG_FREED] = is_freed;
617 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
618 611
619 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
620 if (src.key_values) 613 if (key_values)
621 { 614 {
622 key_value *tail = 0; 615 key_value *tail = 0;
623 key_values = 0; 616 dst->key_values = 0;
624 617
625 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
626 { 619 {
627 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
628 621
629 new_link->next = 0; 622 new_link->next = 0;
630 new_link->key = i->key; 623 new_link->key = i->key;
631 new_link->value = i->value; 624 new_link->value = i->value;
632 625
633 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
634 if (!key_values) 627 if (!dst->key_values)
635 { 628 {
636 key_values = new_link; 629 dst->key_values = new_link;
637 tail = new_link; 630 tail = new_link;
638 } 631 }
639 else 632 else
640 { 633 {
641 tail->next = new_link; 634 tail->next = new_link;
642 tail = new_link; 635 tail = new_link;
643 } 636 }
644 } 637 }
645 } 638 }
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 639
661 if (speed < 0) 640 if (speed < 0)
662 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
663 642
664 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
686object * 665object *
687object::clone () 666object::clone ()
688{ 667{
689 object *neu = create (); 668 object *neu = create ();
690 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
691 return neu; 671 return neu;
692} 672}
693 673
694/* 674/*
695 * 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
… …
746 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
747 */ 727 */
748void 728void
749update_object (object *op, int action) 729update_object (object *op, int action)
750{ 730{
751 if (op == NULL) 731 if (!op)
752 { 732 {
753 /* this should never happen */ 733 /* this should never happen */
754 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
755 return; 735 return;
756 } 736 }
757 737
758 if (op->env) 738 if (!op->is_on_map ())
759 { 739 {
760 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
761 * to do in this case. 741 * to do in this case.
762 */ 742 */
763 return; 743 return;
764 } 744 }
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 745
772 /* make sure the object is within map boundaries */ 746 /* 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) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
774 { 748 {
775 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
… …
930 * drop on that space. 904 * drop on that space.
931 */ 905 */
932 if (!drop_to_ground 906 if (!drop_to_ground
933 || !map 907 || !map
934 || map->in_memory != MAP_ACTIVE 908 || map->in_memory != MAP_ACTIVE
935 || map->nodrop 909 || map->no_drop
936 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
937 { 911 {
938 while (inv) 912 while (inv)
939 { 913 {
940 inv->destroy_inv (false); 914 inv->destroy_inv (false);
… …
965 object *op = new object; 939 object *op = new object;
966 op->link (); 940 op->link ();
967 return op; 941 return op;
968} 942}
969 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 no_drop = 1;
953 no_reset = 1;
954
955 alloc ();
956 in_memory = MAP_ACTIVE;
957 }
958
959 ~freed_map ()
960 {
961 destroy ();
962 }
963} freed_map; // freed objects are moved here to avoid crashes
964
970void 965void
971object::do_destroy () 966object::do_destroy ()
972{ 967{
973 if (flag [FLAG_IS_LINKED]) 968 if (flag [FLAG_IS_LINKED])
974 remove_button_link (this); 969 remove_button_link (this);
… …
984 unlink (); 979 unlink ();
985 980
986 flag [FLAG_FREED] = 1; 981 flag [FLAG_FREED] = 1;
987 982
988 // hack to ensure that freed objects still have a valid map 983 // 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; 984 map = &freed_map;
1007 x = 1; 985 x = 1;
1008 y = 1; 986 y = 1;
1009 }
1010 987
1011 if (more) 988 if (more)
1012 { 989 {
1013 more->destroy (); 990 more->destroy ();
1014 more = 0; 991 more = 0;
… …
1031 1008
1032 if (!is_head () && !head->destroyed ()) 1009 if (!is_head () && !head->destroyed ())
1033 { 1010 {
1034 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1011 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1035 head->destroy (destroy_inventory); 1012 head->destroy (destroy_inventory);
1013 return;
1036 } 1014 }
1037 1015
1038 destroy_inv (!destroy_inventory); 1016 destroy_inv (!destroy_inventory);
1039 1017
1040 if (is_head ()) 1018 if (is_head ())
… …
1079 if (object *pl = visible_to ()) 1057 if (object *pl = visible_to ())
1080 esrv_del_item (pl->contr, count); 1058 esrv_del_item (pl->contr, count);
1081 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1059 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1082 1060
1083 adjust_weight (env, -total_weight ()); 1061 adjust_weight (env, -total_weight ());
1084
1085 *(above ? &above->below : &env->inv) = below;
1086
1087 if (below)
1088 below->above = above;
1089 1062
1090 /* we set up values so that it could be inserted into 1063 /* we set up values so that it could be inserted into
1091 * the map, but we don't actually do that - it is up 1064 * the map, but we don't actually do that - it is up
1092 * to the caller to decide what we want to do. 1065 * to the caller to decide what we want to do.
1093 */ 1066 */
1094 map = env->map; 1067 map = env->map;
1095 x = env->x; 1068 x = env->x;
1096 y = env->y; 1069 y = env->y;
1070
1071 // make sure cmov optimisation is applicable
1072 *(above ? &above->below : &env->inv) = below;
1073 *(below ? &below->above : &above ) = above; // &above is just a dummy
1074
1097 above = 0; 1075 above = 0;
1098 below = 0; 1076 below = 0;
1099 env = 0; 1077 env = 0;
1100 1078
1101 /* NO_FIX_PLAYER is set when a great many changes are being 1079 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1131 1109
1132 esrv_del_item (pl->contr, count); 1110 esrv_del_item (pl->contr, count);
1133 } 1111 }
1134 1112
1135 /* link the object above us */ 1113 /* link the object above us */
1136 if (above) 1114 // re-link, make sure compiler can easily use cmove
1137 above->below = below; 1115 *(above ? &above->below : &ms.top) = below;
1138 else 1116 *(below ? &below->above : &ms.bot) = above;
1139 ms.top = below; /* we were top, set new top */
1140
1141 /* Relink the object below us, if there is one */
1142 if (below)
1143 below->above = above;
1144 else
1145 {
1146 /* Nothing below, which means we need to relink map object for this space
1147 * use translated coordinates in case some oddness with map tiling is
1148 * evident
1149 */
1150 if (GET_MAP_OB (map, x, y) != this)
1151 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 ());
1152
1153 ms.bot = above; /* goes on above it. */
1154 }
1155 1117
1156 above = 0; 1118 above = 0;
1157 below = 0; 1119 below = 0;
1158 1120
1159 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
… …
1169 * appropriately. 1131 * appropriately.
1170 */ 1132 */
1171 pl->close_container (); 1133 pl->close_container ();
1172 1134
1173 //TODO: the floorbox prev/next might need updating 1135 //TODO: the floorbox prev/next might need updating
1174 esrv_del_item (pl->contr, count); 1136 //esrv_del_item (pl->contr, count);
1137 //TODO: update floorbox to preserve ordering
1138 if (pl->contr->ns)
1139 pl->contr->ns->floorbox_update ();
1175 } 1140 }
1176 1141
1177 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (tmp = ms.bot; tmp; tmp = tmp->above)
1178 { 1143 {
1179 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
… …
1303 * just 'op' otherwise 1268 * just 'op' otherwise
1304 */ 1269 */
1305object * 1270object *
1306insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1307{ 1272{
1308 assert (!op->flag [FLAG_FREED]);
1309
1310 op->remove (); 1273 op->remove ();
1311 1274
1312 /* Ideally, the caller figures this out. However, it complicates a lot 1275 /* Ideally, the caller figures this out. However, it complicates a lot
1313 * of areas of callers (eg, anything that uses find_free_spot would now 1276 * of areas of callers (eg, anything that uses find_free_spot would now
1314 * need extra work 1277 * need extra work
1315 */ 1278 */
1316 if (!xy_normalise (m, op->x, op->y)) 1279 if (!xy_normalise (m, op->x, op->y))
1317 { 1280 {
1318 op->destroy (1); 1281 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1319 return 0; 1282 return 0;
1320 } 1283 }
1321 1284
1322 if (object *more = op->more) 1285 if (object *more = op->more)
1323 if (!insert_ob_in_map (more, m, originator, flag)) 1286 if (!insert_ob_in_map (more, m, originator, flag))
… …
1332 */ 1295 */
1333 if (op->nrof && !(flag & INS_NO_MERGE)) 1296 if (op->nrof && !(flag & INS_NO_MERGE))
1334 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1335 if (object::can_merge (op, tmp)) 1298 if (object::can_merge (op, tmp))
1336 { 1299 {
1337 // TODO: we atcually want to update tmp, not op, 1300 // TODO: we actually want to update tmp, not op,
1338 // but some caller surely breaks when we return tmp 1301 // but some caller surely breaks when we return tmp
1339 // from here :/ 1302 // from here :/
1340 op->nrof += tmp->nrof; 1303 op->nrof += tmp->nrof;
1341 tmp->destroy (1); 1304 tmp->destroy (1);
1342 } 1305 }
… …
1353 { 1316 {
1354 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1355 abort (); 1318 abort ();
1356 } 1319 }
1357 1320
1321 if (!originator->is_on_map ())
1322 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323 op->debug_desc (), originator->debug_desc ());
1324
1358 op->above = originator; 1325 op->above = originator;
1359 op->below = originator->below; 1326 op->below = originator->below;
1360
1361 if (op->below)
1362 op->below->above = op;
1363 else
1364 ms.bot = op;
1365
1366 /* since *below* originator, no need to update top */
1367 originator->below = op; 1327 originator->below = op;
1328
1329 *(op->below ? &op->below->above : &ms.bot) = op;
1368 } 1330 }
1369 else 1331 else
1370 { 1332 {
1371 object *top, *floor = NULL; 1333 object *floor = 0;
1372 1334 object *top = ms.top;
1373 top = ms.bot;
1374 1335
1375 /* If there are other objects, then */ 1336 /* If there are other objects, then */
1376 if (top) 1337 if (top)
1377 { 1338 {
1378 object *last = 0;
1379
1380 /* 1339 /*
1381 * If there are multiple objects on this space, we do some trickier handling. 1340 * If there are multiple objects on this space, we do some trickier handling.
1382 * We've already dealt with merging if appropriate. 1341 * We've already dealt with merging if appropriate.
1383 * Generally, we want to put the new object on top. But if 1342 * Generally, we want to put the new object on top. But if
1384 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1343 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1387 * once we get to them. This reduces the need to traverse over all of 1346 * once we get to them. This reduces the need to traverse over all of
1388 * them when adding another one - this saves quite a bit of cpu time 1347 * them when adding another one - this saves quite a bit of cpu time
1389 * when lots of spells are cast in one area. Currently, it is presumed 1348 * when lots of spells are cast in one area. Currently, it is presumed
1390 * that flying non pickable objects are spell objects. 1349 * that flying non pickable objects are spell objects.
1391 */ 1350 */
1392 for (top = ms.bot; top; top = top->above) 1351 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1393 { 1352 {
1394 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1353 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1395 floor = top; 1354 floor = tmp;
1396 1355
1397 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1356 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1398 { 1357 {
1399 /* We insert above top, so we want this object below this */ 1358 /* We insert above top, so we want this object below this */
1400 top = top->below; 1359 top = tmp->below;
1401 break; 1360 break;
1402 } 1361 }
1403 1362
1404 last = top; 1363 top = tmp;
1405 } 1364 }
1406
1407 /* Don't want top to be NULL, so set it to the last valid object */
1408 top = last;
1409 1365
1410 /* We let update_position deal with figuring out what the space 1366 /* We let update_position deal with figuring out what the space
1411 * looks like instead of lots of conditions here. 1367 * looks like instead of lots of conditions here.
1412 * makes things faster, and effectively the same result. 1368 * makes things faster, and effectively the same result.
1413 */ 1369 */
… …
1420 */ 1376 */
1421 if (!(flag & INS_ON_TOP) 1377 if (!(flag & INS_ON_TOP)
1422 && ms.flags () & P_BLOCKSVIEW 1378 && ms.flags () & P_BLOCKSVIEW
1423 && (op->face && !faces [op->face].visibility)) 1379 && (op->face && !faces [op->face].visibility))
1424 { 1380 {
1381 object *last;
1382
1425 for (last = top; last != floor; last = last->below) 1383 for (last = top; last != floor; last = last->below)
1426 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1384 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1427 break; 1385 break;
1428 1386
1429 /* Check to see if we found the object that blocks view, 1387 /* Check to see if we found the object that blocks view,
… …
1437 } /* If objects on this space */ 1395 } /* If objects on this space */
1438 1396
1439 if (flag & INS_ABOVE_FLOOR_ONLY) 1397 if (flag & INS_ABOVE_FLOOR_ONLY)
1440 top = floor; 1398 top = floor;
1441 1399
1442 /* Top is the object that our object (op) is going to get inserted above. 1400 // insert object above top, or bottom-most if top = 0
1443 */
1444
1445 /* First object on this space */
1446 if (!top) 1401 if (!top)
1447 { 1402 {
1403 op->below = 0;
1448 op->above = ms.bot; 1404 op->above = ms.bot;
1449
1450 if (op->above)
1451 op->above->below = op;
1452
1453 op->below = 0;
1454 ms.bot = op; 1405 ms.bot = op;
1406
1407 *(op->above ? &op->above->below : &ms.top) = op;
1455 } 1408 }
1456 else 1409 else
1457 { /* get inserted into the stack above top */ 1410 {
1458 op->above = top->above; 1411 op->above = top->above;
1459
1460 if (op->above)
1461 op->above->below = op; 1412 top->above = op;
1462 1413
1463 op->below = top; 1414 op->below = top;
1464 top->above = op; 1415 *(op->above ? &op->above->below : &ms.top) = op;
1465 } 1416 }
1466 1417 }
1467 if (!op->above)
1468 ms.top = op;
1469 } /* else not INS_BELOW_ORIGINATOR */
1470 1418
1471 if (op->type == PLAYER) 1419 if (op->type == PLAYER)
1472 { 1420 {
1473 op->contr->do_los = 1; 1421 op->contr->do_los = 1;
1474 ++op->map->players; 1422 ++op->map->players;
… …
1477 1425
1478 op->map->dirty = true; 1426 op->map->dirty = true;
1479 1427
1480 if (object *pl = ms.player ()) 1428 if (object *pl = ms.player ())
1481 //TODO: the floorbox prev/next might need updating 1429 //TODO: the floorbox prev/next might need updating
1482 esrv_send_item (pl, op); 1430 //esrv_send_item (pl, op);
1431 //TODO: update floorbox to preserve ordering
1432 if (pl->contr->ns)
1433 pl->contr->ns->floorbox_update ();
1483 1434
1484 /* If this object glows, it may affect lighting conditions that are 1435 /* If this object glows, it may affect lighting conditions that are
1485 * visible to others on this map. But update_all_los is really 1436 * visible to others on this map. But update_all_los is really
1486 * an inefficient way to do this, as it means los for all players 1437 * an inefficient way to do this, as it means los for all players
1487 * on the map will get recalculated. The players could very well 1438 * on the map will get recalculated. The players could very well
… …
1607 } 1558 }
1608 else 1559 else
1609 { 1560 {
1610 decrease (nr); 1561 decrease (nr);
1611 1562
1612 object *op = object_create_clone (this); 1563 object *op = deep_clone ();
1613 op->nrof = nr; 1564 op->nrof = nr;
1614 return op; 1565 return op;
1615 } 1566 }
1616} 1567}
1617 1568
… …
1838 LOG (llevError, "Present_arch called outside map.\n"); 1789 LOG (llevError, "Present_arch called outside map.\n");
1839 return NULL; 1790 return NULL;
1840 } 1791 }
1841 1792
1842 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1793 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1843 if (tmp->arch == at) 1794 if (tmp->arch->archname == at->archname)
1844 return tmp; 1795 return tmp;
1845 1796
1846 return NULL; 1797 return NULL;
1847} 1798}
1848 1799
… …
1912 * The first matching object is returned, or NULL if none. 1863 * The first matching object is returned, or NULL if none.
1913 */ 1864 */
1914object * 1865object *
1915present_arch_in_ob (const archetype *at, const object *op) 1866present_arch_in_ob (const archetype *at, const object *op)
1916{ 1867{
1917 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1868 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1918 if (tmp->arch == at) 1869 if (tmp->arch->archname == at->archname)
1919 return tmp; 1870 return tmp;
1920 1871
1921 return NULL; 1872 return NULL;
1922} 1873}
1923 1874
… …
2332 2283
2333/* 2284/*
2334 * create clone from object to another 2285 * create clone from object to another
2335 */ 2286 */
2336object * 2287object *
2337object_create_clone (object *asrc) 2288object::deep_clone ()
2338{ 2289{
2339 object *dst = 0, *tmp, *src, *prev, *item; 2290 assert (("deep_clone called on non-head object", is_head ()));
2340 2291
2341 if (!asrc) 2292 object *dst = clone ();
2342 return 0;
2343 2293
2344 src = asrc->head_ (); 2294 object *prev = dst;
2345
2346 prev = 0;
2347 for (object *part = src; part; part = part->more) 2295 for (object *part = this->more; part; part = part->more)
2348 { 2296 {
2349 tmp = part->clone (); 2297 object *tmp = part->clone ();
2350 tmp->x -= src->x;
2351 tmp->y -= src->y;
2352
2353 if (!part->head)
2354 {
2355 dst = tmp;
2356 tmp->head = 0;
2357 }
2358 else
2359 tmp->head = dst; 2298 tmp->head = dst;
2360
2361 tmp->more = 0;
2362
2363 if (prev)
2364 prev->more = tmp; 2299 prev->more = tmp;
2365
2366 prev = tmp; 2300 prev = tmp;
2367 } 2301 }
2368 2302
2369 for (item = src->inv; item; item = item->below) 2303 for (object *item = inv; item; item = item->below)
2370 insert_ob_in_ob (object_create_clone (item), dst); 2304 insert_ob_in_ob (item->deep_clone (), dst);
2371 2305
2372 return dst; 2306 return dst;
2373} 2307}
2374 2308
2375/* This returns the first object in who's inventory that 2309/* This returns the first object in who's inventory that
… …
2384 return tmp; 2318 return tmp;
2385 2319
2386 return 0; 2320 return 0;
2387} 2321}
2388 2322
2389/* If ob has a field named key, return the link from the list, 2323const shstr &
2390 * otherwise return NULL. 2324object::kv_get (const shstr &key) const
2391 *
2392 * key must be a passed in shared string - otherwise, this won't
2393 * do the desired thing.
2394 */
2395key_value *
2396get_ob_key_link (const object *ob, const char *key)
2397{ 2325{
2398 for (key_value *link = ob->key_values; link; link = link->next) 2326 for (key_value *kv = key_values; kv; kv = kv->next)
2399 if (link->key == key) 2327 if (kv->key == key)
2400 return link;
2401
2402 return 0;
2403}
2404
2405/*
2406 * Returns the value of op has an extra_field for key, or NULL.
2407 *
2408 * The argument doesn't need to be a shared string.
2409 *
2410 * The returned string is shared.
2411 */
2412const char *
2413get_ob_key_value (const object *op, const char *const key)
2414{
2415 key_value *link;
2416 shstr_cmp canonical_key (key);
2417
2418 if (!canonical_key)
2419 {
2420 /* 1. There being a field named key on any object
2421 * implies there'd be a shared string to find.
2422 * 2. Since there isn't, no object has this field.
2423 * 3. Therefore, *this* object doesn't have this field.
2424 */
2425 return 0;
2426 }
2427
2428 /* This is copied from get_ob_key_link() above -
2429 * only 4 lines, and saves the function call overhead.
2430 */
2431 for (link = op->key_values; link; link = link->next)
2432 if (link->key == canonical_key)
2433 return link->value; 2328 return kv->value;
2434 2329
2435 return 0; 2330 return shstr_null;
2436} 2331}
2437 2332
2438/* 2333void
2439 * Updates the canonical_key in op to value. 2334object::kv_set (const shstr &key, const shstr &value)
2440 *
2441 * canonical_key is a shared string (value doesn't have to be).
2442 *
2443 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2444 * keys.
2445 *
2446 * Returns TRUE on success.
2447 */
2448int
2449set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2450{ 2335{
2451 key_value *field = NULL, *last = NULL; 2336 for (key_value *kv = key_values; kv; kv = kv->next)
2452 2337 if (kv->key == key)
2453 for (field = op->key_values; field != NULL; field = field->next)
2454 {
2455 if (field->key != canonical_key)
2456 { 2338 {
2457 last = field; 2339 kv->value = value;
2458 continue; 2340 return;
2459 } 2341 }
2460 2342
2461 if (value) 2343 key_value *kv = new key_value;
2462 field->value = value; 2344
2463 else 2345 kv->next = key_values;
2346 kv->key = key;
2347 kv->value = value;
2348
2349 key_values = kv;
2350}
2351
2352void
2353object::kv_del (const shstr &key)
2354{
2355 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2356 if ((*kvp)->key == key)
2464 { 2357 {
2465 /* Basically, if the archetype has this key set, 2358 key_value *kv = *kvp;
2466 * we need to store the null value so when we save 2359 *kvp = (*kvp)->next;
2467 * it, we save the empty value so that when we load, 2360 delete kv;
2468 * we get this value back again. 2361 return;
2469 */
2470 if (get_ob_key_link (op->arch, canonical_key))
2471 field->value = 0;
2472 else
2473 {
2474 if (last)
2475 last->next = field->next;
2476 else
2477 op->key_values = field->next;
2478
2479 delete field;
2480 }
2481 } 2362 }
2482 return TRUE;
2483 }
2484 /* IF we get here, key doesn't exist */
2485
2486 /* No field, we'll have to add it. */
2487
2488 if (!add_key)
2489 return FALSE;
2490
2491 /* There isn't any good reason to store a null
2492 * value in the key/value list. If the archetype has
2493 * this key, then we should also have it, so shouldn't
2494 * be here. If user wants to store empty strings,
2495 * should pass in ""
2496 */
2497 if (value == NULL)
2498 return TRUE;
2499
2500 field = new key_value;
2501
2502 field->key = canonical_key;
2503 field->value = value;
2504 /* Usual prepend-addition. */
2505 field->next = op->key_values;
2506 op->key_values = field;
2507
2508 return TRUE;
2509}
2510
2511/*
2512 * Updates the key in op to value.
2513 *
2514 * If add_key is FALSE, this will only update existing keys,
2515 * and not add new ones.
2516 * In general, should be little reason FALSE is ever passed in for add_key
2517 *
2518 * Returns TRUE on success.
2519 */
2520int
2521set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2522{
2523 shstr key_ (key);
2524
2525 return set_ob_key_value_s (op, key_, value, add_key);
2526} 2363}
2527 2364
2528object::depth_iterator::depth_iterator (object *container) 2365object::depth_iterator::depth_iterator (object *container)
2529: iterator_base (container) 2366: iterator_base (container)
2530{ 2367{

Diff Legend

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