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.225 by root, Fri May 2 20:28:44 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 remove (); 608 dst->remove ();
612
613 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
614
615 flag [FLAG_REMOVED] = true; 610 dst->flag [FLAG_REMOVED] = true;
616 611
617 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
618 if (src.key_values) 613 if (key_values)
619 { 614 {
620 key_value *tail = 0; 615 key_value *tail = 0;
621 key_values = 0; 616 dst->key_values = 0;
622 617
623 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
624 { 619 {
625 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
626 621
627 new_link->next = 0; 622 new_link->next = 0;
628 new_link->key = i->key; 623 new_link->key = i->key;
629 new_link->value = i->value; 624 new_link->value = i->value;
630 625
631 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
632 if (!key_values) 627 if (!dst->key_values)
633 { 628 {
634 key_values = new_link; 629 dst->key_values = new_link;
635 tail = new_link; 630 tail = new_link;
636 } 631 }
637 else 632 else
638 { 633 {
639 tail->next = new_link; 634 tail->next = new_link;
640 tail = new_link; 635 tail = new_link;
641 } 636 }
642 } 637 }
643 } 638 }
644}
645
646/*
647 * copy_to first frees everything allocated by the dst object,
648 * and then copies the contents of itself into the second
649 * object, allocating what needs to be allocated. Basically, any
650 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
651 * if the first object is freed, the pointers in the new object
652 * will point at garbage.
653 */
654void
655object::copy_to (object *dst)
656{
657 *dst = *this;
658 639
659 if (speed < 0) 640 if (speed < 0)
660 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
661 642
662 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
923 * drop on that space. 904 * drop on that space.
924 */ 905 */
925 if (!drop_to_ground 906 if (!drop_to_ground
926 || !map 907 || !map
927 || map->in_memory != MAP_ACTIVE 908 || map->in_memory != MAP_ACTIVE
928 || map->nodrop 909 || map->no_drop
929 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
930 { 911 {
931 while (inv) 912 while (inv)
932 { 913 {
933 inv->destroy_inv (false); 914 inv->destroy_inv (false);
… …
962 943
963static struct freed_map : maptile 944static struct freed_map : maptile
964{ 945{
965 freed_map () 946 freed_map ()
966 { 947 {
967 path = "<freed objects map>"; 948 path = "<freed objects map>";
968 name = "/internal/freed_objects_map"; 949 name = "/internal/freed_objects_map";
969 width = 3; 950 width = 3;
970 height = 3; 951 height = 3;
971 nodrop = 1; 952 no_drop = 1;
953 no_reset = 1;
972 954
973 alloc (); 955 alloc ();
974 in_memory = MAP_ACTIVE; 956 in_memory = MAP_ACTIVE;
957 }
958
959 ~freed_map ()
960 {
961 destroy ();
975 } 962 }
976} freed_map; // freed objects are moved here to avoid crashes 963} freed_map; // freed objects are moved here to avoid crashes
977 964
978void 965void
979object::do_destroy () 966object::do_destroy ()
… …
1070 if (object *pl = visible_to ()) 1057 if (object *pl = visible_to ())
1071 esrv_del_item (pl->contr, count); 1058 esrv_del_item (pl->contr, count);
1072 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
1073 1060
1074 adjust_weight (env, -total_weight ()); 1061 adjust_weight (env, -total_weight ());
1075
1076 *(above ? &above->below : &env->inv) = below;
1077
1078 if (below)
1079 below->above = above;
1080 1062
1081 /* we set up values so that it could be inserted into 1063 /* we set up values so that it could be inserted into
1082 * 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
1083 * to the caller to decide what we want to do. 1065 * to the caller to decide what we want to do.
1084 */ 1066 */
1085 map = env->map; 1067 map = env->map;
1086 x = env->x; 1068 x = env->x;
1087 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
1088 above = 0; 1075 above = 0;
1089 below = 0; 1076 below = 0;
1090 env = 0; 1077 env = 0;
1091 1078
1092 /* 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
… …
1122 1109
1123 esrv_del_item (pl->contr, count); 1110 esrv_del_item (pl->contr, count);
1124 } 1111 }
1125 1112
1126 /* link the object above us */ 1113 /* link the object above us */
1127 if (above) 1114 // re-link, make sure compiler can easily use cmove
1128 above->below = below; 1115 *(above ? &above->below : &ms.top) = below;
1129 else 1116 *(below ? &below->above : &ms.bot) = above;
1130 ms.top = below; /* we were top, set new top */
1131
1132 /* Relink the object below us, if there is one */
1133 if (below)
1134 below->above = above;
1135 else
1136 {
1137 /* Nothing below, which means we need to relink map object for this space
1138 * use translated coordinates in case some oddness with map tiling is
1139 * evident
1140 */
1141 if (GET_MAP_OB (map, x, y) != this)
1142 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 ());
1143
1144 ms.bot = above; /* goes on above it. */
1145 }
1146 1117
1147 above = 0; 1118 above = 0;
1148 below = 0; 1119 below = 0;
1149 1120
1150 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
… …
1160 * appropriately. 1131 * appropriately.
1161 */ 1132 */
1162 pl->close_container (); 1133 pl->close_container ();
1163 1134
1164 //TODO: the floorbox prev/next might need updating 1135 //TODO: the floorbox prev/next might need updating
1165 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 ();
1166 } 1140 }
1167 1141
1168 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (tmp = ms.bot; tmp; tmp = tmp->above)
1169 { 1143 {
1170 /* 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
… …
1294 * just 'op' otherwise 1268 * just 'op' otherwise
1295 */ 1269 */
1296object * 1270object *
1297insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298{ 1272{
1299 assert (!op->flag [FLAG_FREED]);
1300
1301 op->remove (); 1273 op->remove ();
1302 1274
1303 /* Ideally, the caller figures this out. However, it complicates a lot 1275 /* Ideally, the caller figures this out. However, it complicates a lot
1304 * 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
1305 * need extra work 1277 * need extra work
1306 */ 1278 */
1307 if (!xy_normalise (m, op->x, op->y)) 1279 if (!xy_normalise (m, op->x, op->y))
1308 { 1280 {
1309 op->destroy (1); 1281 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1310 return 0; 1282 return 0;
1311 } 1283 }
1312 1284
1313 if (object *more = op->more) 1285 if (object *more = op->more)
1314 if (!insert_ob_in_map (more, m, originator, flag)) 1286 if (!insert_ob_in_map (more, m, originator, flag))
… …
1323 */ 1295 */
1324 if (op->nrof && !(flag & INS_NO_MERGE)) 1296 if (op->nrof && !(flag & INS_NO_MERGE))
1325 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1326 if (object::can_merge (op, tmp)) 1298 if (object::can_merge (op, tmp))
1327 { 1299 {
1328 // TODO: we atcually want to update tmp, not op, 1300 // TODO: we actually want to update tmp, not op,
1329 // but some caller surely breaks when we return tmp 1301 // but some caller surely breaks when we return tmp
1330 // from here :/ 1302 // from here :/
1331 op->nrof += tmp->nrof; 1303 op->nrof += tmp->nrof;
1332 tmp->destroy (1); 1304 tmp->destroy (1);
1333 } 1305 }
… …
1344 { 1316 {
1345 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");
1346 abort (); 1318 abort ();
1347 } 1319 }
1348 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
1349 op->above = originator; 1325 op->above = originator;
1350 op->below = originator->below; 1326 op->below = originator->below;
1351
1352 if (op->below)
1353 op->below->above = op;
1354 else
1355 ms.bot = op;
1356
1357 /* since *below* originator, no need to update top */
1358 originator->below = op; 1327 originator->below = op;
1328
1329 *(op->below ? &op->below->above : &ms.bot) = op;
1359 } 1330 }
1360 else 1331 else
1361 { 1332 {
1362 object *top, *floor = NULL; 1333 object *floor = 0;
1363 1334 object *top = ms.top;
1364 top = ms.bot;
1365 1335
1366 /* If there are other objects, then */ 1336 /* If there are other objects, then */
1367 if (top) 1337 if (top)
1368 { 1338 {
1369 object *last = 0;
1370
1371 /* 1339 /*
1372 * 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.
1373 * We've already dealt with merging if appropriate. 1341 * We've already dealt with merging if appropriate.
1374 * 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
1375 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1343 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1378 * 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
1379 * 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
1380 * 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
1381 * that flying non pickable objects are spell objects. 1349 * that flying non pickable objects are spell objects.
1382 */ 1350 */
1383 for (top = ms.bot; top; top = top->above) 1351 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1384 { 1352 {
1385 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))
1386 floor = top; 1354 floor = tmp;
1387 1355
1388 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))
1389 { 1357 {
1390 /* We insert above top, so we want this object below this */ 1358 /* We insert above top, so we want this object below this */
1391 top = top->below; 1359 top = tmp->below;
1392 break; 1360 break;
1393 } 1361 }
1394 1362
1395 last = top; 1363 top = tmp;
1396 } 1364 }
1397
1398 /* Don't want top to be NULL, so set it to the last valid object */
1399 top = last;
1400 1365
1401 /* We let update_position deal with figuring out what the space 1366 /* We let update_position deal with figuring out what the space
1402 * looks like instead of lots of conditions here. 1367 * looks like instead of lots of conditions here.
1403 * makes things faster, and effectively the same result. 1368 * makes things faster, and effectively the same result.
1404 */ 1369 */
… …
1411 */ 1376 */
1412 if (!(flag & INS_ON_TOP) 1377 if (!(flag & INS_ON_TOP)
1413 && ms.flags () & P_BLOCKSVIEW 1378 && ms.flags () & P_BLOCKSVIEW
1414 && (op->face && !faces [op->face].visibility)) 1379 && (op->face && !faces [op->face].visibility))
1415 { 1380 {
1381 object *last;
1382
1416 for (last = top; last != floor; last = last->below) 1383 for (last = top; last != floor; last = last->below)
1417 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1384 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418 break; 1385 break;
1419 1386
1420 /* Check to see if we found the object that blocks view, 1387 /* Check to see if we found the object that blocks view,
… …
1428 } /* If objects on this space */ 1395 } /* If objects on this space */
1429 1396
1430 if (flag & INS_ABOVE_FLOOR_ONLY) 1397 if (flag & INS_ABOVE_FLOOR_ONLY)
1431 top = floor; 1398 top = floor;
1432 1399
1433 /* 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
1434 */
1435
1436 /* First object on this space */
1437 if (!top) 1401 if (!top)
1438 { 1402 {
1403 op->below = 0;
1439 op->above = ms.bot; 1404 op->above = ms.bot;
1440
1441 if (op->above)
1442 op->above->below = op;
1443
1444 op->below = 0;
1445 ms.bot = op; 1405 ms.bot = op;
1406
1407 *(op->above ? &op->above->below : &ms.top) = op;
1446 } 1408 }
1447 else 1409 else
1448 { /* get inserted into the stack above top */ 1410 {
1449 op->above = top->above; 1411 op->above = top->above;
1450
1451 if (op->above)
1452 op->above->below = op; 1412 top->above = op;
1453 1413
1454 op->below = top; 1414 op->below = top;
1455 top->above = op; 1415 *(op->above ? &op->above->below : &ms.top) = op;
1456 } 1416 }
1457 1417 }
1458 if (!op->above)
1459 ms.top = op;
1460 } /* else not INS_BELOW_ORIGINATOR */
1461 1418
1462 if (op->type == PLAYER) 1419 if (op->type == PLAYER)
1463 { 1420 {
1464 op->contr->do_los = 1; 1421 op->contr->do_los = 1;
1465 ++op->map->players; 1422 ++op->map->players;
… …
1468 1425
1469 op->map->dirty = true; 1426 op->map->dirty = true;
1470 1427
1471 if (object *pl = ms.player ()) 1428 if (object *pl = ms.player ())
1472 //TODO: the floorbox prev/next might need updating 1429 //TODO: the floorbox prev/next might need updating
1473 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 ();
1474 1434
1475 /* If this object glows, it may affect lighting conditions that are 1435 /* If this object glows, it may affect lighting conditions that are
1476 * 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
1477 * 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
1478 * on the map will get recalculated. The players could very well 1438 * on the map will get recalculated. The players could very well
… …
1598 } 1558 }
1599 else 1559 else
1600 { 1560 {
1601 decrease (nr); 1561 decrease (nr);
1602 1562
1603 object *op = object_create_clone (this); 1563 object *op = deep_clone ();
1604 op->nrof = nr; 1564 op->nrof = nr;
1605 return op; 1565 return op;
1606 } 1566 }
1607} 1567}
1608 1568
… …
1829 LOG (llevError, "Present_arch called outside map.\n"); 1789 LOG (llevError, "Present_arch called outside map.\n");
1830 return NULL; 1790 return NULL;
1831 } 1791 }
1832 1792
1833 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)
1834 if (tmp->arch == at) 1794 if (tmp->arch->archname == at->archname)
1835 return tmp; 1795 return tmp;
1836 1796
1837 return NULL; 1797 return NULL;
1838} 1798}
1839 1799
… …
1903 * The first matching object is returned, or NULL if none. 1863 * The first matching object is returned, or NULL if none.
1904 */ 1864 */
1905object * 1865object *
1906present_arch_in_ob (const archetype *at, const object *op) 1866present_arch_in_ob (const archetype *at, const object *op)
1907{ 1867{
1908 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1868 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909 if (tmp->arch == at) 1869 if (tmp->arch->archname == at->archname)
1910 return tmp; 1870 return tmp;
1911 1871
1912 return NULL; 1872 return NULL;
1913} 1873}
1914 1874
… …
2323 2283
2324/* 2284/*
2325 * create clone from object to another 2285 * create clone from object to another
2326 */ 2286 */
2327object * 2287object *
2328object_create_clone (object *asrc) 2288object::deep_clone ()
2329{ 2289{
2290 assert (("deep_clone called on non-head object", is_head ()));
2291
2330 object *dst = 0; 2292 object *dst = clone ();
2331 2293
2332 if (!asrc)
2333 return 0;
2334
2335 object *src = asrc->head_ ();
2336
2337 object *prev = 0; 2294 object *prev = dst;
2338 for (object *part = src; part; part = part->more) 2295 for (object *part = this->more; part; part = part->more)
2339 { 2296 {
2340 object *tmp = part->clone (); 2297 object *tmp = part->clone ();
2341
2342 tmp->x -= src->x;
2343 tmp->y -= src->y;
2344
2345 if (!part->head)
2346 {
2347 dst = tmp;
2348 tmp->head = 0;
2349 }
2350 else
2351 tmp->head = dst; 2298 tmp->head = dst;
2352
2353 tmp->more = 0;
2354
2355 if (prev)
2356 prev->more = tmp; 2299 prev->more = tmp;
2357
2358 prev = tmp; 2300 prev = tmp;
2359 } 2301 }
2360 2302
2361 for (object *item = src->inv; item; item = item->below) 2303 for (object *item = inv; item; item = item->below)
2362 insert_ob_in_ob (object_create_clone (item), dst); 2304 insert_ob_in_ob (item->deep_clone (), dst);
2363 2305
2364 return dst; 2306 return dst;
2365} 2307}
2366 2308
2367/* This returns the first object in who's inventory that 2309/* This returns the first object in who's inventory that
… …
2376 return tmp; 2318 return tmp;
2377 2319
2378 return 0; 2320 return 0;
2379} 2321}
2380 2322
2381/* If ob has a field named key, return the link from the list, 2323const shstr &
2382 * otherwise return NULL. 2324object::kv_get (const shstr &key) const
2383 *
2384 * key must be a passed in shared string - otherwise, this won't
2385 * do the desired thing.
2386 */
2387key_value *
2388get_ob_key_link (const object *ob, const char *key)
2389{ 2325{
2390 for (key_value *link = ob->key_values; link; link = link->next) 2326 for (key_value *kv = key_values; kv; kv = kv->next)
2391 if (link->key == key) 2327 if (kv->key == key)
2392 return link;
2393
2394 return 0;
2395}
2396
2397/*
2398 * Returns the value of op has an extra_field for key, or NULL.
2399 *
2400 * The argument doesn't need to be a shared string.
2401 *
2402 * The returned string is shared.
2403 */
2404const char *
2405get_ob_key_value (const object *op, const char *const key)
2406{
2407 key_value *link;
2408 shstr_cmp canonical_key (key);
2409
2410 if (!canonical_key)
2411 {
2412 /* 1. There being a field named key on any object
2413 * implies there'd be a shared string to find.
2414 * 2. Since there isn't, no object has this field.
2415 * 3. Therefore, *this* object doesn't have this field.
2416 */
2417 return 0;
2418 }
2419
2420 /* This is copied from get_ob_key_link() above -
2421 * only 4 lines, and saves the function call overhead.
2422 */
2423 for (link = op->key_values; link; link = link->next)
2424 if (link->key == canonical_key)
2425 return link->value; 2328 return kv->value;
2426 2329
2427 return 0; 2330 return shstr_null;
2428} 2331}
2429 2332
2430/* 2333void
2431 * Updates the canonical_key in op to value. 2334object::kv_set (const shstr &key, const shstr &value)
2432 *
2433 * canonical_key is a shared string (value doesn't have to be).
2434 *
2435 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2436 * keys.
2437 *
2438 * Returns TRUE on success.
2439 */
2440int
2441set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2442{ 2335{
2443 key_value *field = NULL, *last = NULL; 2336 for (key_value *kv = key_values; kv; kv = kv->next)
2444 2337 if (kv->key == key)
2445 for (field = op->key_values; field != NULL; field = field->next)
2446 {
2447 if (field->key != canonical_key)
2448 { 2338 {
2449 last = field; 2339 kv->value = value;
2450 continue; 2340 return;
2451 } 2341 }
2452 2342
2453 if (value) 2343 key_value *kv = new key_value;
2454 field->value = value; 2344
2455 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)
2456 { 2357 {
2457 /* Basically, if the archetype has this key set, 2358 key_value *kv = *kvp;
2458 * we need to store the null value so when we save 2359 *kvp = (*kvp)->next;
2459 * it, we save the empty value so that when we load, 2360 delete kv;
2460 * we get this value back again. 2361 return;
2461 */
2462 if (get_ob_key_link (op->arch, canonical_key))
2463 field->value = 0;
2464 else
2465 {
2466 if (last)
2467 last->next = field->next;
2468 else
2469 op->key_values = field->next;
2470
2471 delete field;
2472 }
2473 } 2362 }
2474 return TRUE;
2475 }
2476 /* IF we get here, key doesn't exist */
2477
2478 /* No field, we'll have to add it. */
2479
2480 if (!add_key)
2481 return FALSE;
2482
2483 /* There isn't any good reason to store a null
2484 * value in the key/value list. If the archetype has
2485 * this key, then we should also have it, so shouldn't
2486 * be here. If user wants to store empty strings,
2487 * should pass in ""
2488 */
2489 if (value == NULL)
2490 return TRUE;
2491
2492 field = new key_value;
2493
2494 field->key = canonical_key;
2495 field->value = value;
2496 /* Usual prepend-addition. */
2497 field->next = op->key_values;
2498 op->key_values = field;
2499
2500 return TRUE;
2501}
2502
2503/*
2504 * Updates the key in op to value.
2505 *
2506 * If add_key is FALSE, this will only update existing keys,
2507 * and not add new ones.
2508 * In general, should be little reason FALSE is ever passed in for add_key
2509 *
2510 * Returns TRUE on success.
2511 */
2512int
2513set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2514{
2515 shstr key_ (key);
2516
2517 return set_ob_key_value_s (op, key_, value, add_key);
2518} 2363}
2519 2364
2520object::depth_iterator::depth_iterator (object *container) 2365object::depth_iterator::depth_iterator (object *container)
2521: iterator_base (container) 2366: iterator_base (container)
2522{ 2367{

Diff Legend

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