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.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC

… …
139 139
140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141static bool 141static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
143{ 143{
144 key_value *wants_field;
145
146 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 144 /* n-squared behaviour (see kv_get), but I'm hoping both
147 * objects with lists are rare, and lists stay short. If not, use a 145 * objects with lists are rare, and lists stay short. If not, use a
148 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
149 */ 147 */
150 148
151 /* For each field in wants, */ 149 /* For each field in wants, */
152 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 150 for (key_value *kv = wants->key_values; kv; kv = kv->next)
153 { 151 if (has->kv_get (kv->key) != kv->value)
154 key_value *has_field; 152 return false;
155
156 /* Look for a field in has with the same key. */
157 has_field = get_ob_key_link (has, wants_field->key);
158
159 if (!has_field)
160 return 0; /* No field with that name. */
161
162 /* Found the matching field. */
163 if (has_field->value != wants_field->value)
164 return 0; /* Values don't match, so this half of the comparison is false. */
165
166 /* If we get here, we found a match. Now for the next field in wants. */
167 }
168 153
169 /* If we get here, every field in wants has a matching field in has. */ 154 /* If we get here, every field in wants has a matching field in has. */
170 return 1; 155 return true;
171} 156}
172 157
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
174static bool 159static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 161{
177 /* However, there may be fields in has which aren't partnered in wants, 162 /* However, there may be fields in has which aren't partnered in wants,
178 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
179 */ 164 */
180 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 165 return compare_ob_value_lists_one (ob1, ob2)
166 && compare_ob_value_lists_one (ob2, ob1);
181} 167}
182 168
183/* Function examines the 2 objects given to it, and returns true if 169/* Function examines the 2 objects given to it, and returns true if
184 * they can be merged together. 170 * they can be merged together.
185 * 171 *
… …
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
… …
959 object *op = new object; 939 object *op = new object;
960 op->link (); 940 op->link ();
961 return op; 941 return op;
962} 942}
963 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
964void 964void
965object::do_destroy () 965object::do_destroy ()
966{ 966{
967 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 968 remove_button_link (this);
… …
978 unlink (); 978 unlink ();
979 979
980 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
981 981
982 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
983 {
984 static maptile *freed_map; // freed objects are moved here to avoid crashes
985
986 if (!freed_map)
987 {
988 freed_map = new maptile;
989
990 freed_map->path = "<freed objects map>";
991 freed_map->name = "/internal/freed_objects_map";
992 freed_map->width = 3;
993 freed_map->height = 3;
994 freed_map->nodrop = 1;
995
996 freed_map->alloc ();
997 freed_map->in_memory = MAP_ACTIVE;
998 }
999
1000 map = freed_map; 983 map = &freed_map;
1001 x = 1; 984 x = 1;
1002 y = 1; 985 y = 1;
1003 }
1004 986
1005 if (more) 987 if (more)
1006 { 988 {
1007 more->destroy (); 989 more->destroy ();
1008 more = 0; 990 more = 0;
… …
1025 1007
1026 if (!is_head () && !head->destroyed ()) 1008 if (!is_head () && !head->destroyed ())
1027 { 1009 {
1028 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1029 head->destroy (destroy_inventory); 1011 head->destroy (destroy_inventory);
1012 return;
1030 } 1013 }
1031 1014
1032 destroy_inv (!destroy_inventory); 1015 destroy_inv (!destroy_inventory);
1033 1016
1034 if (is_head ()) 1017 if (is_head ())
… …
1073 if (object *pl = visible_to ()) 1056 if (object *pl = visible_to ())
1074 esrv_del_item (pl->contr, count); 1057 esrv_del_item (pl->contr, count);
1075 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1076 1059
1077 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1078
1079 *(above ? &above->below : &env->inv) = below;
1080
1081 if (below)
1082 below->above = above;
1083 1061
1084 /* we set up values so that it could be inserted into 1062 /* we set up values so that it could be inserted into
1085 * 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
1086 * to the caller to decide what we want to do. 1064 * to the caller to decide what we want to do.
1087 */ 1065 */
1088 map = env->map; 1066 map = env->map;
1089 x = env->x; 1067 x = env->x;
1090 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
1091 above = 0; 1074 above = 0;
1092 below = 0; 1075 below = 0;
1093 env = 0; 1076 env = 0;
1094 1077
1095 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1125 1108
1126 esrv_del_item (pl->contr, count); 1109 esrv_del_item (pl->contr, count);
1127 } 1110 }
1128 1111
1129 /* link the object above us */ 1112 /* link the object above us */
1130 if (above) 1113 // re-link, make sure compiler can easily use cmove
1131 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1132 else 1115 *(below ? &below->above : &ms.bot) = above;
1133 ms.top = below; /* we were top, set new top */
1134
1135 /* Relink the object below us, if there is one */
1136 if (below)
1137 below->above = above;
1138 else
1139 {
1140 /* Nothing below, which means we need to relink map object for this space
1141 * use translated coordinates in case some oddness with map tiling is
1142 * evident
1143 */
1144 if (GET_MAP_OB (map, x, y) != this)
1145 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 ());
1146
1147 ms.bot = above; /* goes on above it. */
1148 }
1149 1116
1150 above = 0; 1117 above = 0;
1151 below = 0; 1118 below = 0;
1152 1119
1153 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
… …
1163 * appropriately. 1130 * appropriately.
1164 */ 1131 */
1165 pl->close_container (); 1132 pl->close_container ();
1166 1133
1167 //TODO: the floorbox prev/next might need updating 1134 //TODO: the floorbox prev/next might need updating
1168 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 ();
1169 } 1139 }
1170 1140
1171 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1172 { 1142 {
1173 /* 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
… …
1297 * just 'op' otherwise 1267 * just 'op' otherwise
1298 */ 1268 */
1299object * 1269object *
1300insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301{ 1271{
1302 assert (!op->flag [FLAG_FREED]);
1303
1304 op->remove (); 1272 op->remove ();
1305 1273
1306 /* Ideally, the caller figures this out. However, it complicates a lot 1274 /* Ideally, the caller figures this out. However, it complicates a lot
1307 * of areas of callers (eg, anything that uses find_free_spot would now 1275 * of areas of callers (eg, anything that uses find_free_spot would now
1308 * need extra work 1276 * need extra work
1309 */ 1277 */
1310 if (!xy_normalise (m, op->x, op->y)) 1278 if (!xy_normalise (m, op->x, op->y))
1311 { 1279 {
1312 op->destroy (1); 1280 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1313 return 0; 1281 return 0;
1314 } 1282 }
1315 1283
1316 if (object *more = op->more) 1284 if (object *more = op->more)
1317 if (!insert_ob_in_map (more, m, originator, flag)) 1285 if (!insert_ob_in_map (more, m, originator, flag))
… …
1326 */ 1294 */
1327 if (op->nrof && !(flag & INS_NO_MERGE)) 1295 if (op->nrof && !(flag & INS_NO_MERGE))
1328 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1296 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329 if (object::can_merge (op, tmp)) 1297 if (object::can_merge (op, tmp))
1330 { 1298 {
1331 // TODO: we atcually want to update tmp, not op, 1299 // TODO: we actually want to update tmp, not op,
1332 // but some caller surely breaks when we return tmp 1300 // but some caller surely breaks when we return tmp
1333 // from here :/ 1301 // from here :/
1334 op->nrof += tmp->nrof; 1302 op->nrof += tmp->nrof;
1335 tmp->destroy (1); 1303 tmp->destroy (1);
1336 } 1304 }
… …
1341 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1309 if (!QUERY_FLAG (op, FLAG_ALIVE))
1342 CLEAR_FLAG (op, FLAG_NO_STEAL); 1310 CLEAR_FLAG (op, FLAG_NO_STEAL);
1343 1311
1344 if (flag & INS_BELOW_ORIGINATOR) 1312 if (flag & INS_BELOW_ORIGINATOR)
1345 { 1313 {
1346 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1314 if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ())
1347 { 1315 {
1348 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1316 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349 abort (); 1317 abort ();
1350 } 1318 }
1351 1319
1352 op->above = originator; 1320 op->above = originator;
1353 op->below = originator->below; 1321 op->below = originator->below;
1354
1355 if (op->below)
1356 op->below->above = op;
1357 else
1358 ms.bot = op;
1359
1360 /* since *below* originator, no need to update top */
1361 originator->below = op; 1322 originator->below = op;
1323
1324 *(op->below ? &op->below->above : &ms.bot) = op;
1362 } 1325 }
1363 else 1326 else
1364 { 1327 {
1365 object *top, *floor = NULL; 1328 object *floor = 0;
1366 1329 object *top = ms.top;
1367 top = ms.bot;
1368 1330
1369 /* If there are other objects, then */ 1331 /* If there are other objects, then */
1370 if (top) 1332 if (top)
1371 { 1333 {
1372 object *last = 0;
1373
1374 /* 1334 /*
1375 * If there are multiple objects on this space, we do some trickier handling. 1335 * If there are multiple objects on this space, we do some trickier handling.
1376 * We've already dealt with merging if appropriate. 1336 * We've already dealt with merging if appropriate.
1377 * Generally, we want to put the new object on top. But if 1337 * Generally, we want to put the new object on top. But if
1378 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1338 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1381 * once we get to them. This reduces the need to traverse over all of 1341 * once we get to them. This reduces the need to traverse over all of
1382 * them when adding another one - this saves quite a bit of cpu time 1342 * them when adding another one - this saves quite a bit of cpu time
1383 * when lots of spells are cast in one area. Currently, it is presumed 1343 * when lots of spells are cast in one area. Currently, it is presumed
1384 * that flying non pickable objects are spell objects. 1344 * that flying non pickable objects are spell objects.
1385 */ 1345 */
1386 for (top = ms.bot; top; top = top->above) 1346 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387 { 1347 {
1388 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1348 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389 floor = top; 1349 floor = tmp;
1390 1350
1391 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1351 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392 { 1352 {
1393 /* We insert above top, so we want this object below this */ 1353 /* We insert above top, so we want this object below this */
1394 top = top->below; 1354 top = tmp->below;
1395 break; 1355 break;
1396 } 1356 }
1397 1357
1398 last = top; 1358 top = tmp;
1399 } 1359 }
1400
1401 /* Don't want top to be NULL, so set it to the last valid object */
1402 top = last;
1403 1360
1404 /* We let update_position deal with figuring out what the space 1361 /* We let update_position deal with figuring out what the space
1405 * looks like instead of lots of conditions here. 1362 * looks like instead of lots of conditions here.
1406 * makes things faster, and effectively the same result. 1363 * makes things faster, and effectively the same result.
1407 */ 1364 */
… …
1414 */ 1371 */
1415 if (!(flag & INS_ON_TOP) 1372 if (!(flag & INS_ON_TOP)
1416 && ms.flags () & P_BLOCKSVIEW 1373 && ms.flags () & P_BLOCKSVIEW
1417 && (op->face && !faces [op->face].visibility)) 1374 && (op->face && !faces [op->face].visibility))
1418 { 1375 {
1376 object *last;
1377
1419 for (last = top; last != floor; last = last->below) 1378 for (last = top; last != floor; last = last->below)
1420 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1379 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421 break; 1380 break;
1422 1381
1423 /* Check to see if we found the object that blocks view, 1382 /* Check to see if we found the object that blocks view,
… …
1434 top = floor; 1393 top = floor;
1435 1394
1436 /* Top is the object that our object (op) is going to get inserted above. 1395 /* Top is the object that our object (op) is going to get inserted above.
1437 */ 1396 */
1438 1397
1439 /* First object on this space */ 1398 /* no top found, insert on top */
1440 if (!top) 1399 if (!top)
1441 { 1400 {
1442 op->above = ms.bot;
1443
1444 if (op->above)
1445 op->above->below = op;
1446
1447 op->below = 0; 1401 op->above = 0;
1402 op->below = ms.top;
1448 ms.bot = op; 1403 ms.top = op;
1404
1405 *(op->below ? &op->below->above : &ms.bot) = op;
1449 } 1406 }
1450 else 1407 else
1451 { /* get inserted into the stack above top */ 1408 { /* get inserted into the stack above top */
1452 op->above = top->above; 1409 op->above = top->above;
1453
1454 if (op->above)
1455 op->above->below = op; 1410 top->above = op;
1456 1411
1457 op->below = top; 1412 op->below = top;
1458 top->above = op; 1413 *(op->above ? &op->above->below : &ms.top) = op;
1459 } 1414 }
1460
1461 if (!op->above)
1462 ms.top = op;
1463 } /* else not INS_BELOW_ORIGINATOR */ 1415 } /* else not INS_BELOW_ORIGINATOR */
1464 1416
1465 if (op->type == PLAYER) 1417 if (op->type == PLAYER)
1466 { 1418 {
1467 op->contr->do_los = 1; 1419 op->contr->do_los = 1;
… …
1471 1423
1472 op->map->dirty = true; 1424 op->map->dirty = true;
1473 1425
1474 if (object *pl = ms.player ()) 1426 if (object *pl = ms.player ())
1475 //TODO: the floorbox prev/next might need updating 1427 //TODO: the floorbox prev/next might need updating
1476 esrv_send_item (pl, op); 1428 //esrv_send_item (pl, op);
1429 //TODO: update floorbox to preserve ordering
1430 if (pl->contr->ns)
1431 pl->contr->ns->floorbox_update ();
1477 1432
1478 /* If this object glows, it may affect lighting conditions that are 1433 /* If this object glows, it may affect lighting conditions that are
1479 * visible to others on this map. But update_all_los is really 1434 * visible to others on this map. But update_all_los is really
1480 * an inefficient way to do this, as it means los for all players 1435 * an inefficient way to do this, as it means los for all players
1481 * on the map will get recalculated. The players could very well 1436 * on the map will get recalculated. The players could very well
… …
1601 } 1556 }
1602 else 1557 else
1603 { 1558 {
1604 decrease (nr); 1559 decrease (nr);
1605 1560
1606 object *op = object_create_clone (this); 1561 object *op = deep_clone ();
1607 op->nrof = nr; 1562 op->nrof = nr;
1608 return op; 1563 return op;
1609 } 1564 }
1610} 1565}
1611 1566
… …
1832 LOG (llevError, "Present_arch called outside map.\n"); 1787 LOG (llevError, "Present_arch called outside map.\n");
1833 return NULL; 1788 return NULL;
1834 } 1789 }
1835 1790
1836 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1791 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837 if (tmp->arch == at) 1792 if (tmp->arch->archname == at->archname)
1838 return tmp; 1793 return tmp;
1839 1794
1840 return NULL; 1795 return NULL;
1841} 1796}
1842 1797
… …
1906 * The first matching object is returned, or NULL if none. 1861 * The first matching object is returned, or NULL if none.
1907 */ 1862 */
1908object * 1863object *
1909present_arch_in_ob (const archetype *at, const object *op) 1864present_arch_in_ob (const archetype *at, const object *op)
1910{ 1865{
1911 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1866 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912 if (tmp->arch == at) 1867 if (tmp->arch->archname == at->archname)
1913 return tmp; 1868 return tmp;
1914 1869
1915 return NULL; 1870 return NULL;
1916} 1871}
1917 1872
… …
2326 2281
2327/* 2282/*
2328 * create clone from object to another 2283 * create clone from object to another
2329 */ 2284 */
2330object * 2285object *
2331object_create_clone (object *asrc) 2286object::deep_clone ()
2332{ 2287{
2333 object *dst = 0, *tmp, *src, *prev, *item; 2288 assert (("deep_clone called on non-head object", is_head ()));
2334 2289
2335 if (!asrc) 2290 object *dst = clone ();
2336 return 0;
2337 2291
2338 src = asrc->head_ (); 2292 object *prev = dst;
2339
2340 prev = 0;
2341 for (object *part = src; part; part = part->more) 2293 for (object *part = this->more; part; part = part->more)
2342 { 2294 {
2343 tmp = part->clone (); 2295 object *tmp = part->clone ();
2344 tmp->x -= src->x;
2345 tmp->y -= src->y;
2346
2347 if (!part->head)
2348 {
2349 dst = tmp;
2350 tmp->head = 0;
2351 }
2352 else
2353 tmp->head = dst; 2296 tmp->head = dst;
2354
2355 tmp->more = 0;
2356
2357 if (prev)
2358 prev->more = tmp; 2297 prev->more = tmp;
2359
2360 prev = tmp; 2298 prev = tmp;
2361 } 2299 }
2362 2300
2363 for (item = src->inv; item; item = item->below) 2301 for (object *item = inv; item; item = item->below)
2364 insert_ob_in_ob (object_create_clone (item), dst); 2302 insert_ob_in_ob (item->deep_clone (), dst);
2365 2303
2366 return dst; 2304 return dst;
2367} 2305}
2368 2306
2369/* This returns the first object in who's inventory that 2307/* This returns the first object in who's inventory that
… …
2378 return tmp; 2316 return tmp;
2379 2317
2380 return 0; 2318 return 0;
2381} 2319}
2382 2320
2383/* If ob has a field named key, return the link from the list, 2321const shstr &
2384 * otherwise return NULL. 2322object::kv_get (const shstr &key) const
2385 *
2386 * key must be a passed in shared string - otherwise, this won't
2387 * do the desired thing.
2388 */
2389key_value *
2390get_ob_key_link (const object *ob, const char *key)
2391{ 2323{
2392 for (key_value *link = ob->key_values; link; link = link->next) 2324 for (key_value *kv = key_values; kv; kv = kv->next)
2393 if (link->key == key) 2325 if (kv->key == key)
2394 return link;
2395
2396 return 0;
2397}
2398
2399/*
2400 * Returns the value of op has an extra_field for key, or NULL.
2401 *
2402 * The argument doesn't need to be a shared string.
2403 *
2404 * The returned string is shared.
2405 */
2406const char *
2407get_ob_key_value (const object *op, const char *const key)
2408{
2409 key_value *link;
2410 shstr_cmp canonical_key (key);
2411
2412 if (!canonical_key)
2413 {
2414 /* 1. There being a field named key on any object
2415 * implies there'd be a shared string to find.
2416 * 2. Since there isn't, no object has this field.
2417 * 3. Therefore, *this* object doesn't have this field.
2418 */
2419 return 0;
2420 }
2421
2422 /* This is copied from get_ob_key_link() above -
2423 * only 4 lines, and saves the function call overhead.
2424 */
2425 for (link = op->key_values; link; link = link->next)
2426 if (link->key == canonical_key)
2427 return link->value; 2326 return kv->value;
2428 2327
2429 return 0; 2328 return shstr_null;
2430} 2329}
2431 2330
2432/* 2331void
2433 * Updates the canonical_key in op to value. 2332object::kv_set (const shstr &key, const shstr &value)
2434 *
2435 * canonical_key is a shared string (value doesn't have to be).
2436 *
2437 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2438 * keys.
2439 *
2440 * Returns TRUE on success.
2441 */
2442int
2443set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2444{ 2333{
2445 key_value *field = NULL, *last = NULL; 2334 for (key_value *kv = key_values; kv; kv = kv->next)
2446 2335 if (kv->key == key)
2447 for (field = op->key_values; field != NULL; field = field->next)
2448 {
2449 if (field->key != canonical_key)
2450 { 2336 {
2451 last = field; 2337 kv->value = value;
2452 continue; 2338 return;
2453 } 2339 }
2454 2340
2455 if (value) 2341 key_value *kv = new key_value;
2456 field->value = value; 2342
2457 else 2343 kv->next = key_values;
2344 kv->key = key;
2345 kv->value = value;
2346
2347 key_values = kv;
2348}
2349
2350void
2351object::kv_del (const shstr &key)
2352{
2353 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2354 if ((*kvp)->key == key)
2458 { 2355 {
2459 /* Basically, if the archetype has this key set, 2356 key_value *kv = *kvp;
2460 * we need to store the null value so when we save 2357 *kvp = (*kvp)->next;
2461 * it, we save the empty value so that when we load, 2358 delete kv;
2462 * we get this value back again. 2359 return;
2463 */
2464 if (get_ob_key_link (op->arch, canonical_key))
2465 field->value = 0;
2466 else
2467 {
2468 if (last)
2469 last->next = field->next;
2470 else
2471 op->key_values = field->next;
2472
2473 delete field;
2474 }
2475 } 2360 }
2476 return TRUE;
2477 }
2478 /* IF we get here, key doesn't exist */
2479
2480 /* No field, we'll have to add it. */
2481
2482 if (!add_key)
2483 return FALSE;
2484
2485 /* There isn't any good reason to store a null
2486 * value in the key/value list. If the archetype has
2487 * this key, then we should also have it, so shouldn't
2488 * be here. If user wants to store empty strings,
2489 * should pass in ""
2490 */
2491 if (value == NULL)
2492 return TRUE;
2493
2494 field = new key_value;
2495
2496 field->key = canonical_key;
2497 field->value = value;
2498 /* Usual prepend-addition. */
2499 field->next = op->key_values;
2500 op->key_values = field;
2501
2502 return TRUE;
2503}
2504
2505/*
2506 * Updates the key in op to value.
2507 *
2508 * If add_key is FALSE, this will only update existing keys,
2509 * and not add new ones.
2510 * In general, should be little reason FALSE is ever passed in for add_key
2511 *
2512 * Returns TRUE on success.
2513 */
2514int
2515set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2516{
2517 shstr key_ (key);
2518
2519 return set_ob_key_value_s (op, key_, value, add_key);
2520} 2361}
2521 2362
2522object::depth_iterator::depth_iterator (object *container) 2363object::depth_iterator::depth_iterator (object *container)
2523: iterator_base (container) 2364: iterator_base (container)
2524{ 2365{

Diff Legend

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