… | |
… | |
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. */ |
141 | static bool |
141 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_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. */ |
174 | static bool |
159 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_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") |
372 | static sint32 |
358 | static sint32 |
373 | weight_adjust (object *op, sint32 weight) |
359 | weight_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 | } |
… | |
… | |
384 | static void |
370 | static void |
385 | adjust_weight (object *op, sint32 weight) |
371 | adjust_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 | |
608 | object & |
597 | /* |
609 | object::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 | */ |
|
|
605 | void |
|
|
606 | object::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 | */ |
|
|
656 | void |
|
|
657 | object::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); |
… | |
… | |
686 | object * |
665 | object * |
687 | object::clone () |
666 | object::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 |
… | |
… | |
972 | nodrop = 1; |
952 | nodrop = 1; |
973 | |
953 | |
974 | alloc (); |
954 | alloc (); |
975 | in_memory = MAP_ACTIVE; |
955 | in_memory = MAP_ACTIVE; |
976 | } |
956 | } |
|
|
957 | |
|
|
958 | ~freed_map () |
|
|
959 | { |
|
|
960 | destroy (); |
|
|
961 | } |
977 | } freed_map; // freed objects are moved here to avoid crashes |
962 | } freed_map; // freed objects are moved here to avoid crashes |
978 | |
963 | |
979 | void |
964 | void |
980 | object::do_destroy () |
965 | object::do_destroy () |
981 | { |
966 | { |
… | |
… | |
1071 | if (object *pl = visible_to ()) |
1056 | if (object *pl = visible_to ()) |
1072 | esrv_del_item (pl->contr, count); |
1057 | esrv_del_item (pl->contr, count); |
1073 | 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 |
1074 | |
1059 | |
1075 | adjust_weight (env, -total_weight ()); |
1060 | adjust_weight (env, -total_weight ()); |
1076 | |
|
|
1077 | *(above ? &above->below : &env->inv) = below; |
|
|
1078 | |
|
|
1079 | if (below) |
|
|
1080 | below->above = above; |
|
|
1081 | |
1061 | |
1082 | /* we set up values so that it could be inserted into |
1062 | /* we set up values so that it could be inserted into |
1083 | * 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 |
1084 | * to the caller to decide what we want to do. |
1064 | * to the caller to decide what we want to do. |
1085 | */ |
1065 | */ |
1086 | map = env->map; |
1066 | map = env->map; |
1087 | x = env->x; |
1067 | x = env->x; |
1088 | 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 | |
1089 | above = 0; |
1074 | above = 0; |
1090 | below = 0; |
1075 | below = 0; |
1091 | env = 0; |
1076 | env = 0; |
1092 | |
1077 | |
1093 | /* 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 |
… | |
… | |
1123 | |
1108 | |
1124 | esrv_del_item (pl->contr, count); |
1109 | esrv_del_item (pl->contr, count); |
1125 | } |
1110 | } |
1126 | |
1111 | |
1127 | /* link the object above us */ |
1112 | /* link the object above us */ |
1128 | if (above) |
1113 | // re-link, make sure compiler can easily use cmove |
1129 | above->below = below; |
1114 | *(above ? &above->below : &ms.top) = below; |
1130 | else |
1115 | *(below ? &below->above : &ms.bot) = above; |
1131 | ms.top = below; /* we were top, set new top */ |
|
|
1132 | |
|
|
1133 | /* Relink the object below us, if there is one */ |
|
|
1134 | if (below) |
|
|
1135 | below->above = above; |
|
|
1136 | else |
|
|
1137 | { |
|
|
1138 | /* Nothing below, which means we need to relink map object for this space |
|
|
1139 | * use translated coordinates in case some oddness with map tiling is |
|
|
1140 | * evident |
|
|
1141 | */ |
|
|
1142 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1143 | 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 ()); |
|
|
1144 | |
|
|
1145 | ms.bot = above; /* goes on above it. */ |
|
|
1146 | } |
|
|
1147 | |
1116 | |
1148 | above = 0; |
1117 | above = 0; |
1149 | below = 0; |
1118 | below = 0; |
1150 | |
1119 | |
1151 | if (map->in_memory == MAP_SAVING) |
1120 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1161 | * appropriately. |
1130 | * appropriately. |
1162 | */ |
1131 | */ |
1163 | pl->close_container (); |
1132 | pl->close_container (); |
1164 | |
1133 | |
1165 | //TODO: the floorbox prev/next might need updating |
1134 | //TODO: the floorbox prev/next might need updating |
1166 | 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 (); |
1167 | } |
1139 | } |
1168 | |
1140 | |
1169 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1141 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1170 | { |
1142 | { |
1171 | /* 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 |
… | |
… | |
1295 | * just 'op' otherwise |
1267 | * just 'op' otherwise |
1296 | */ |
1268 | */ |
1297 | object * |
1269 | object * |
1298 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1270 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1299 | { |
1271 | { |
1300 | assert (!op->flag [FLAG_FREED]); |
|
|
1301 | |
|
|
1302 | op->remove (); |
1272 | op->remove (); |
1303 | |
1273 | |
1304 | /* Ideally, the caller figures this out. However, it complicates a lot |
1274 | /* Ideally, the caller figures this out. However, it complicates a lot |
1305 | * 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 |
1306 | * need extra work |
1276 | * need extra work |
1307 | */ |
1277 | */ |
1308 | if (!xy_normalise (m, op->x, op->y)) |
1278 | if (!xy_normalise (m, op->x, op->y)) |
1309 | { |
1279 | { |
1310 | op->destroy (1); |
1280 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1311 | return 0; |
1281 | return 0; |
1312 | } |
1282 | } |
1313 | |
1283 | |
1314 | if (object *more = op->more) |
1284 | if (object *more = op->more) |
1315 | if (!insert_ob_in_map (more, m, originator, flag)) |
1285 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1324 | */ |
1294 | */ |
1325 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1295 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1326 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1296 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1327 | if (object::can_merge (op, tmp)) |
1297 | if (object::can_merge (op, tmp)) |
1328 | { |
1298 | { |
1329 | // TODO: we atcually want to update tmp, not op, |
1299 | // TODO: we actually want to update tmp, not op, |
1330 | // but some caller surely breaks when we return tmp |
1300 | // but some caller surely breaks when we return tmp |
1331 | // from here :/ |
1301 | // from here :/ |
1332 | op->nrof += tmp->nrof; |
1302 | op->nrof += tmp->nrof; |
1333 | tmp->destroy (1); |
1303 | tmp->destroy (1); |
1334 | } |
1304 | } |
… | |
… | |
1339 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1309 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1340 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1310 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1341 | |
1311 | |
1342 | if (flag & INS_BELOW_ORIGINATOR) |
1312 | if (flag & INS_BELOW_ORIGINATOR) |
1343 | { |
1313 | { |
1344 | 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 ()) |
1345 | { |
1315 | { |
1346 | 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"); |
1347 | abort (); |
1317 | abort (); |
1348 | } |
1318 | } |
1349 | |
1319 | |
1350 | op->above = originator; |
1320 | op->above = originator; |
1351 | op->below = originator->below; |
1321 | op->below = originator->below; |
1352 | |
|
|
1353 | if (op->below) |
|
|
1354 | op->below->above = op; |
|
|
1355 | else |
|
|
1356 | ms.bot = op; |
|
|
1357 | |
|
|
1358 | /* since *below* originator, no need to update top */ |
|
|
1359 | originator->below = op; |
1322 | originator->below = op; |
|
|
1323 | |
|
|
1324 | *(op->below ? &op->below->above : &ms.bot) = op; |
1360 | } |
1325 | } |
1361 | else |
1326 | else |
1362 | { |
1327 | { |
1363 | object *top, *floor = NULL; |
1328 | object *floor = 0; |
1364 | |
1329 | object *top = ms.top; |
1365 | top = ms.bot; |
|
|
1366 | |
1330 | |
1367 | /* If there are other objects, then */ |
1331 | /* If there are other objects, then */ |
1368 | if (top) |
1332 | if (top) |
1369 | { |
1333 | { |
1370 | object *last = 0; |
|
|
1371 | |
|
|
1372 | /* |
1334 | /* |
1373 | * 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. |
1374 | * We've already dealt with merging if appropriate. |
1336 | * We've already dealt with merging if appropriate. |
1375 | * 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 |
1376 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1338 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1379 | * 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 |
1380 | * 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 |
1381 | * 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 |
1382 | * that flying non pickable objects are spell objects. |
1344 | * that flying non pickable objects are spell objects. |
1383 | */ |
1345 | */ |
1384 | for (top = ms.bot; top; top = top->above) |
1346 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1385 | { |
1347 | { |
1386 | 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)) |
1387 | floor = top; |
1349 | floor = tmp; |
1388 | |
1350 | |
1389 | 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)) |
1390 | { |
1352 | { |
1391 | /* We insert above top, so we want this object below this */ |
1353 | /* We insert above top, so we want this object below this */ |
1392 | top = top->below; |
1354 | top = tmp->below; |
1393 | break; |
1355 | break; |
1394 | } |
1356 | } |
1395 | |
1357 | |
1396 | last = top; |
1358 | top = tmp; |
1397 | } |
1359 | } |
1398 | |
|
|
1399 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1400 | top = last; |
|
|
1401 | |
1360 | |
1402 | /* We let update_position deal with figuring out what the space |
1361 | /* We let update_position deal with figuring out what the space |
1403 | * looks like instead of lots of conditions here. |
1362 | * looks like instead of lots of conditions here. |
1404 | * makes things faster, and effectively the same result. |
1363 | * makes things faster, and effectively the same result. |
1405 | */ |
1364 | */ |
… | |
… | |
1412 | */ |
1371 | */ |
1413 | if (!(flag & INS_ON_TOP) |
1372 | if (!(flag & INS_ON_TOP) |
1414 | && ms.flags () & P_BLOCKSVIEW |
1373 | && ms.flags () & P_BLOCKSVIEW |
1415 | && (op->face && !faces [op->face].visibility)) |
1374 | && (op->face && !faces [op->face].visibility)) |
1416 | { |
1375 | { |
|
|
1376 | object *last; |
|
|
1377 | |
1417 | for (last = top; last != floor; last = last->below) |
1378 | for (last = top; last != floor; last = last->below) |
1418 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1379 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1419 | break; |
1380 | break; |
1420 | |
1381 | |
1421 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1432 | top = floor; |
1393 | top = floor; |
1433 | |
1394 | |
1434 | /* 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. |
1435 | */ |
1396 | */ |
1436 | |
1397 | |
1437 | /* First object on this space */ |
1398 | /* no top found, insert on top */ |
1438 | if (!top) |
1399 | if (!top) |
1439 | { |
1400 | { |
1440 | op->above = ms.bot; |
|
|
1441 | |
|
|
1442 | if (op->above) |
|
|
1443 | op->above->below = op; |
|
|
1444 | |
|
|
1445 | op->below = 0; |
1401 | op->above = 0; |
|
|
1402 | op->below = ms.top; |
1446 | ms.bot = op; |
1403 | ms.top = op; |
|
|
1404 | |
|
|
1405 | *(op->below ? &op->below->above : &ms.bot) = op; |
1447 | } |
1406 | } |
1448 | else |
1407 | else |
1449 | { /* get inserted into the stack above top */ |
1408 | { /* get inserted into the stack above top */ |
1450 | op->above = top->above; |
1409 | op->above = top->above; |
1451 | |
|
|
1452 | if (op->above) |
|
|
1453 | op->above->below = op; |
1410 | top->above = op; |
1454 | |
1411 | |
1455 | op->below = top; |
1412 | op->below = top; |
1456 | top->above = op; |
1413 | *(op->above ? &op->above->below : &ms.top) = op; |
1457 | } |
1414 | } |
1458 | |
|
|
1459 | if (!op->above) |
|
|
1460 | ms.top = op; |
|
|
1461 | } /* else not INS_BELOW_ORIGINATOR */ |
1415 | } /* else not INS_BELOW_ORIGINATOR */ |
1462 | |
1416 | |
1463 | if (op->type == PLAYER) |
1417 | if (op->type == PLAYER) |
1464 | { |
1418 | { |
1465 | op->contr->do_los = 1; |
1419 | op->contr->do_los = 1; |
… | |
… | |
1469 | |
1423 | |
1470 | op->map->dirty = true; |
1424 | op->map->dirty = true; |
1471 | |
1425 | |
1472 | if (object *pl = ms.player ()) |
1426 | if (object *pl = ms.player ()) |
1473 | //TODO: the floorbox prev/next might need updating |
1427 | //TODO: the floorbox prev/next might need updating |
1474 | 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 (); |
1475 | |
1432 | |
1476 | /* If this object glows, it may affect lighting conditions that are |
1433 | /* If this object glows, it may affect lighting conditions that are |
1477 | * 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 |
1478 | * 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 |
1479 | * on the map will get recalculated. The players could very well |
1436 | * on the map will get recalculated. The players could very well |
… | |
… | |
1599 | } |
1556 | } |
1600 | else |
1557 | else |
1601 | { |
1558 | { |
1602 | decrease (nr); |
1559 | decrease (nr); |
1603 | |
1560 | |
1604 | object *op = object_create_clone (this); |
1561 | object *op = deep_clone (); |
1605 | op->nrof = nr; |
1562 | op->nrof = nr; |
1606 | return op; |
1563 | return op; |
1607 | } |
1564 | } |
1608 | } |
1565 | } |
1609 | |
1566 | |
… | |
… | |
1830 | LOG (llevError, "Present_arch called outside map.\n"); |
1787 | LOG (llevError, "Present_arch called outside map.\n"); |
1831 | return NULL; |
1788 | return NULL; |
1832 | } |
1789 | } |
1833 | |
1790 | |
1834 | 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) |
1835 | if (tmp->arch == at) |
1792 | if (tmp->arch->archname == at->archname) |
1836 | return tmp; |
1793 | return tmp; |
1837 | |
1794 | |
1838 | return NULL; |
1795 | return NULL; |
1839 | } |
1796 | } |
1840 | |
1797 | |
… | |
… | |
1904 | * The first matching object is returned, or NULL if none. |
1861 | * The first matching object is returned, or NULL if none. |
1905 | */ |
1862 | */ |
1906 | object * |
1863 | object * |
1907 | present_arch_in_ob (const archetype *at, const object *op) |
1864 | present_arch_in_ob (const archetype *at, const object *op) |
1908 | { |
1865 | { |
1909 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1866 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1910 | if (tmp->arch == at) |
1867 | if (tmp->arch->archname == at->archname) |
1911 | return tmp; |
1868 | return tmp; |
1912 | |
1869 | |
1913 | return NULL; |
1870 | return NULL; |
1914 | } |
1871 | } |
1915 | |
1872 | |
… | |
… | |
2324 | |
2281 | |
2325 | /* |
2282 | /* |
2326 | * create clone from object to another |
2283 | * create clone from object to another |
2327 | */ |
2284 | */ |
2328 | object * |
2285 | object * |
2329 | object_create_clone (object *asrc) |
2286 | object::deep_clone () |
2330 | { |
2287 | { |
2331 | object *dst = 0, *tmp, *src, *prev, *item; |
2288 | assert (("deep_clone called on non-head object", is_head ())); |
2332 | |
2289 | |
2333 | if (!asrc) |
2290 | object *dst = clone (); |
2334 | return 0; |
|
|
2335 | |
2291 | |
2336 | src = asrc->head_ (); |
2292 | object *prev = dst; |
2337 | |
|
|
2338 | prev = 0; |
|
|
2339 | for (object *part = src; part; part = part->more) |
2293 | for (object *part = this->more; part; part = part->more) |
2340 | { |
2294 | { |
2341 | tmp = part->clone (); |
2295 | object *tmp = part->clone (); |
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; |
2296 | tmp->head = dst; |
2352 | |
|
|
2353 | tmp->more = 0; |
|
|
2354 | |
|
|
2355 | if (prev) |
|
|
2356 | prev->more = tmp; |
2297 | prev->more = tmp; |
2357 | |
|
|
2358 | prev = tmp; |
2298 | prev = tmp; |
2359 | } |
2299 | } |
2360 | |
2300 | |
2361 | for (item = src->inv; item; item = item->below) |
2301 | for (object *item = inv; item; item = item->below) |
2362 | insert_ob_in_ob (object_create_clone (item), dst); |
2302 | insert_ob_in_ob (item->deep_clone (), dst); |
2363 | |
2303 | |
2364 | return dst; |
2304 | return dst; |
2365 | } |
2305 | } |
2366 | |
2306 | |
2367 | /* This returns the first object in who's inventory that |
2307 | /* This returns the first object in who's inventory that |
… | |
… | |
2376 | return tmp; |
2316 | return tmp; |
2377 | |
2317 | |
2378 | return 0; |
2318 | return 0; |
2379 | } |
2319 | } |
2380 | |
2320 | |
2381 | /* If ob has a field named key, return the link from the list, |
2321 | const shstr & |
2382 | * otherwise return NULL. |
2322 | object::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 | */ |
|
|
2387 | key_value * |
|
|
2388 | get_ob_key_link (const object *ob, const char *key) |
|
|
2389 | { |
2323 | { |
2390 | for (key_value *link = ob->key_values; link; link = link->next) |
2324 | for (key_value *kv = key_values; kv; kv = kv->next) |
2391 | if (link->key == key) |
2325 | 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 | */ |
|
|
2404 | const char * |
|
|
2405 | get_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; |
2326 | return kv->value; |
2426 | |
2327 | |
2427 | return 0; |
2328 | return shstr_null; |
2428 | } |
2329 | } |
2429 | |
2330 | |
2430 | /* |
2331 | void |
2431 | * Updates the canonical_key in op to value. |
2332 | object::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 | */ |
|
|
2440 | int |
|
|
2441 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2442 | { |
2333 | { |
2443 | key_value *field = NULL, *last = NULL; |
2334 | for (key_value *kv = key_values; kv; kv = kv->next) |
2444 | |
2335 | if (kv->key == key) |
2445 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2446 | { |
|
|
2447 | if (field->key != canonical_key) |
|
|
2448 | { |
2336 | { |
2449 | last = field; |
2337 | kv->value = value; |
2450 | continue; |
2338 | return; |
2451 | } |
2339 | } |
2452 | |
2340 | |
2453 | if (value) |
2341 | key_value *kv = new key_value; |
2454 | field->value = value; |
2342 | |
2455 | else |
2343 | kv->next = key_values; |
|
|
2344 | kv->key = key; |
|
|
2345 | kv->value = value; |
|
|
2346 | |
|
|
2347 | key_values = kv; |
|
|
2348 | } |
|
|
2349 | |
|
|
2350 | void |
|
|
2351 | object::kv_del (const shstr &key) |
|
|
2352 | { |
|
|
2353 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2354 | if ((*kvp)->key == key) |
2456 | { |
2355 | { |
2457 | /* Basically, if the archetype has this key set, |
2356 | key_value *kv = *kvp; |
2458 | * we need to store the null value so when we save |
2357 | *kvp = (*kvp)->next; |
2459 | * it, we save the empty value so that when we load, |
2358 | delete kv; |
2460 | * we get this value back again. |
2359 | 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 | } |
2360 | } |
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 | */ |
|
|
2512 | int |
|
|
2513 | set_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 | } |
2361 | } |
2519 | |
2362 | |
2520 | object::depth_iterator::depth_iterator (object *container) |
2363 | object::depth_iterator::depth_iterator (object *container) |
2521 | : iterator_base (container) |
2364 | : iterator_base (container) |
2522 | { |
2365 | { |