… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
207 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
210 | |
211 | if (ob1->arch->name != ob2->arch->name |
211 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
212 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
213 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
214 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
215 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
216 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
217 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
218 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
219 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
220 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
221 | || ob1->animation_id != ob2->animation_id |
|
|
222 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
223 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
224 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
225 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
226 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
227 | || ob1->move_type != ob2->move_type |
… | |
… | |
354 | return 0; |
355 | return 0; |
355 | } |
356 | } |
356 | |
357 | |
357 | // adjust weight per container type ("of holding") |
358 | // adjust weight per container type ("of holding") |
358 | static sint32 |
359 | static sint32 |
359 | weight_adjust (object *op, sint32 weight) |
360 | weight_adjust_for (object *op, sint32 weight) |
360 | { |
361 | { |
361 | return op->type == CONTAINER |
362 | return op->type == CONTAINER |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | : weight; |
364 | : weight; |
364 | } |
365 | } |
… | |
… | |
370 | static void |
371 | static void |
371 | adjust_weight (object *op, sint32 weight) |
372 | adjust_weight (object *op, sint32 weight) |
372 | { |
373 | { |
373 | while (op) |
374 | while (op) |
374 | { |
375 | { |
|
|
376 | // adjust by actual difference to account for rounding errors |
|
|
377 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
375 | weight = weight_adjust (op, weight); |
378 | weight = weight_adjust_for (op, op->carrying) |
|
|
379 | - weight_adjust_for (op, op->carrying - weight); |
376 | |
380 | |
377 | if (!weight) |
381 | if (!weight) |
378 | return; |
382 | return; |
379 | |
383 | |
380 | op->carrying += weight; |
384 | op->carrying += weight; |
… | |
… | |
403 | op->update_weight (); |
407 | op->update_weight (); |
404 | |
408 | |
405 | sum += op->total_weight (); |
409 | sum += op->total_weight (); |
406 | } |
410 | } |
407 | |
411 | |
408 | sum = weight_adjust (this, sum); |
412 | sum = weight_adjust_for (this, sum); |
409 | |
413 | |
410 | if (sum != carrying) |
414 | if (sum != carrying) |
411 | { |
415 | { |
412 | carrying = sum; |
416 | carrying = sum; |
413 | |
417 | |
… | |
… | |
475 | */ |
479 | */ |
476 | object * |
480 | object * |
477 | find_object_name (const char *str) |
481 | find_object_name (const char *str) |
478 | { |
482 | { |
479 | shstr_cmp str_ (str); |
483 | shstr_cmp str_ (str); |
480 | object *op; |
|
|
481 | |
484 | |
|
|
485 | if (str_) |
482 | for_all_objects (op) |
486 | for_all_objects (op) |
483 | if (op->name == str_) |
487 | if (op->name == str_) |
484 | break; |
488 | return op; |
485 | |
489 | |
486 | return op; |
490 | return 0; |
487 | } |
491 | } |
488 | |
492 | |
489 | /* |
493 | /* |
490 | * Sets the owner and sets the skill and exp pointers to owner's current |
494 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * skill and experience objects. |
495 | * skill and experience objects. |
… | |
… | |
901 | * drop on that space. |
905 | * drop on that space. |
902 | */ |
906 | */ |
903 | if (!drop_to_ground |
907 | if (!drop_to_ground |
904 | || !map |
908 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
910 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
908 | { |
912 | { |
909 | while (inv) |
913 | while (inv) |
910 | { |
914 | { |
911 | inv->destroy_inv (false); |
915 | inv->destroy_inv (false); |
… | |
… | |
940 | |
944 | |
941 | static struct freed_map : maptile |
945 | static struct freed_map : maptile |
942 | { |
946 | { |
943 | freed_map () |
947 | freed_map () |
944 | { |
948 | { |
945 | path = "<freed objects map>"; |
949 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
950 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
951 | width = 3; |
948 | height = 3; |
952 | height = 3; |
949 | nodrop = 1; |
953 | no_drop = 1; |
|
|
954 | no_reset = 1; |
950 | |
955 | |
951 | alloc (); |
956 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
957 | in_memory = MAP_ACTIVE; |
|
|
958 | } |
|
|
959 | |
|
|
960 | ~freed_map () |
|
|
961 | { |
|
|
962 | destroy (); |
953 | } |
963 | } |
954 | } freed_map; // freed objects are moved here to avoid crashes |
964 | } freed_map; // freed objects are moved here to avoid crashes |
955 | |
965 | |
956 | void |
966 | void |
957 | object::do_destroy () |
967 | object::do_destroy () |
… | |
… | |
1048 | if (object *pl = visible_to ()) |
1058 | if (object *pl = visible_to ()) |
1049 | esrv_del_item (pl->contr, count); |
1059 | esrv_del_item (pl->contr, count); |
1050 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1060 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1051 | |
1061 | |
1052 | adjust_weight (env, -total_weight ()); |
1062 | adjust_weight (env, -total_weight ()); |
1053 | |
|
|
1054 | *(above ? &above->below : &env->inv) = below; |
|
|
1055 | |
|
|
1056 | if (below) |
|
|
1057 | below->above = above; |
|
|
1058 | |
1063 | |
1059 | /* we set up values so that it could be inserted into |
1064 | /* we set up values so that it could be inserted into |
1060 | * the map, but we don't actually do that - it is up |
1065 | * the map, but we don't actually do that - it is up |
1061 | * to the caller to decide what we want to do. |
1066 | * to the caller to decide what we want to do. |
1062 | */ |
1067 | */ |
1063 | map = env->map; |
1068 | map = env->map; |
1064 | x = env->x; |
1069 | x = env->x; |
1065 | y = env->y; |
1070 | y = env->y; |
|
|
1071 | |
|
|
1072 | // make sure cmov optimisation is applicable |
|
|
1073 | *(above ? &above->below : &env->inv) = below; |
|
|
1074 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1075 | |
1066 | above = 0; |
1076 | above = 0; |
1067 | below = 0; |
1077 | below = 0; |
1068 | env = 0; |
1078 | env = 0; |
1069 | |
1079 | |
1070 | /* NO_FIX_PLAYER is set when a great many changes are being |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1100 | |
1110 | |
1101 | esrv_del_item (pl->contr, count); |
1111 | esrv_del_item (pl->contr, count); |
1102 | } |
1112 | } |
1103 | |
1113 | |
1104 | /* link the object above us */ |
1114 | /* link the object above us */ |
1105 | if (above) |
1115 | // re-link, make sure compiler can easily use cmove |
1106 | above->below = below; |
1116 | *(above ? &above->below : &ms.top) = below; |
1107 | else |
1117 | *(below ? &below->above : &ms.bot) = above; |
1108 | ms.top = below; /* we were top, set new top */ |
|
|
1109 | |
|
|
1110 | /* Relink the object below us, if there is one */ |
|
|
1111 | if (below) |
|
|
1112 | below->above = above; |
|
|
1113 | else |
|
|
1114 | { |
|
|
1115 | /* Nothing below, which means we need to relink map object for this space |
|
|
1116 | * use translated coordinates in case some oddness with map tiling is |
|
|
1117 | * evident |
|
|
1118 | */ |
|
|
1119 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1120 | 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 ()); |
|
|
1121 | |
|
|
1122 | ms.bot = above; /* goes on above it. */ |
|
|
1123 | } |
|
|
1124 | |
1118 | |
1125 | above = 0; |
1119 | above = 0; |
1126 | below = 0; |
1120 | below = 0; |
1127 | |
1121 | |
1128 | if (map->in_memory == MAP_SAVING) |
1122 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1243 | * job preparing multi-part monsters. |
1237 | * job preparing multi-part monsters. |
1244 | */ |
1238 | */ |
1245 | object * |
1239 | object * |
1246 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1247 | { |
1241 | { |
|
|
1242 | op->remove (); |
|
|
1243 | |
1248 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1244 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1249 | { |
1245 | { |
1250 | tmp->x = x + tmp->arch->x; |
1246 | tmp->x = x + tmp->arch->x; |
1251 | tmp->y = y + tmp->arch->y; |
1247 | tmp->y = y + tmp->arch->y; |
1252 | } |
1248 | } |
… | |
… | |
1275 | * just 'op' otherwise |
1271 | * just 'op' otherwise |
1276 | */ |
1272 | */ |
1277 | object * |
1273 | object * |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1279 | { |
1275 | { |
1280 | assert (!op->flag [FLAG_FREED]); |
1276 | if (op->is_on_map ()) |
|
|
1277 | { |
|
|
1278 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1279 | abort (); |
|
|
1280 | } |
1281 | |
1281 | |
|
|
1282 | if (op->env) |
|
|
1283 | { |
|
|
1284 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1282 | op->remove (); |
1285 | op->remove (); |
|
|
1286 | } |
|
|
1287 | |
|
|
1288 | if (op->face && !face_info (op->face))//D TODO: remove soon |
|
|
1289 | {//D |
|
|
1290 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
|
|
1291 | op->face = 1;//D |
|
|
1292 | }//D |
1283 | |
1293 | |
1284 | /* Ideally, the caller figures this out. However, it complicates a lot |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | * of areas of callers (eg, anything that uses find_free_spot would now |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1286 | * need extra work |
1296 | * need extra work |
1287 | */ |
1297 | */ |
1288 | if (!xy_normalise (m, op->x, op->y)) |
1298 | if (!xy_normalise (m, op->x, op->y)) |
1289 | { |
1299 | { |
1290 | op->destroy (1); |
1300 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | return 0; |
1301 | return 0; |
1292 | } |
1302 | } |
1293 | |
1303 | |
1294 | if (object *more = op->more) |
1304 | if (object *more = op->more) |
1295 | if (!insert_ob_in_map (more, m, originator, flag)) |
1305 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1304 | */ |
1314 | */ |
1305 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1306 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1316 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1307 | if (object::can_merge (op, tmp)) |
1317 | if (object::can_merge (op, tmp)) |
1308 | { |
1318 | { |
1309 | // TODO: we atcually want to update tmp, not op, |
1319 | // TODO: we actually want to update tmp, not op, |
1310 | // but some caller surely breaks when we return tmp |
1320 | // but some caller surely breaks when we return tmp |
1311 | // from here :/ |
1321 | // from here :/ |
1312 | op->nrof += tmp->nrof; |
1322 | op->nrof += tmp->nrof; |
1313 | tmp->destroy (1); |
1323 | tmp->destroy (1); |
1314 | } |
1324 | } |
… | |
… | |
1325 | { |
1335 | { |
1326 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1327 | abort (); |
1337 | abort (); |
1328 | } |
1338 | } |
1329 | |
1339 | |
|
|
1340 | if (!originator->is_on_map ()) |
|
|
1341 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1342 | op->debug_desc (), originator->debug_desc ()); |
|
|
1343 | |
1330 | op->above = originator; |
1344 | op->above = originator; |
1331 | op->below = originator->below; |
1345 | op->below = originator->below; |
1332 | |
|
|
1333 | if (op->below) |
|
|
1334 | op->below->above = op; |
|
|
1335 | else |
|
|
1336 | ms.bot = op; |
|
|
1337 | |
|
|
1338 | /* since *below* originator, no need to update top */ |
|
|
1339 | originator->below = op; |
1346 | originator->below = op; |
|
|
1347 | |
|
|
1348 | *(op->below ? &op->below->above : &ms.bot) = op; |
1340 | } |
1349 | } |
1341 | else |
1350 | else |
1342 | { |
1351 | { |
1343 | object *top, *floor = NULL; |
1352 | object *floor = 0; |
1344 | |
1353 | object *top = ms.top; |
1345 | top = ms.bot; |
|
|
1346 | |
1354 | |
1347 | /* If there are other objects, then */ |
1355 | /* If there are other objects, then */ |
1348 | if (top) |
1356 | if (top) |
1349 | { |
1357 | { |
1350 | object *last = 0; |
|
|
1351 | |
|
|
1352 | /* |
1358 | /* |
1353 | * If there are multiple objects on this space, we do some trickier handling. |
1359 | * If there are multiple objects on this space, we do some trickier handling. |
1354 | * We've already dealt with merging if appropriate. |
1360 | * We've already dealt with merging if appropriate. |
1355 | * Generally, we want to put the new object on top. But if |
1361 | * Generally, we want to put the new object on top. But if |
1356 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1362 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1359 | * once we get to them. This reduces the need to traverse over all of |
1365 | * once we get to them. This reduces the need to traverse over all of |
1360 | * them when adding another one - this saves quite a bit of cpu time |
1366 | * them when adding another one - this saves quite a bit of cpu time |
1361 | * when lots of spells are cast in one area. Currently, it is presumed |
1367 | * when lots of spells are cast in one area. Currently, it is presumed |
1362 | * that flying non pickable objects are spell objects. |
1368 | * that flying non pickable objects are spell objects. |
1363 | */ |
1369 | */ |
1364 | for (top = ms.bot; top; top = top->above) |
1370 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1365 | { |
1371 | { |
1366 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1372 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1367 | floor = top; |
1373 | floor = tmp; |
1368 | |
1374 | |
1369 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1375 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1370 | { |
1376 | { |
1371 | /* We insert above top, so we want this object below this */ |
1377 | /* We insert above top, so we want this object below this */ |
1372 | top = top->below; |
1378 | top = tmp->below; |
1373 | break; |
1379 | break; |
1374 | } |
1380 | } |
1375 | |
1381 | |
1376 | last = top; |
1382 | top = tmp; |
1377 | } |
1383 | } |
1378 | |
|
|
1379 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1380 | top = last; |
|
|
1381 | |
1384 | |
1382 | /* We let update_position deal with figuring out what the space |
1385 | /* We let update_position deal with figuring out what the space |
1383 | * looks like instead of lots of conditions here. |
1386 | * looks like instead of lots of conditions here. |
1384 | * makes things faster, and effectively the same result. |
1387 | * makes things faster, and effectively the same result. |
1385 | */ |
1388 | */ |
… | |
… | |
1392 | */ |
1395 | */ |
1393 | if (!(flag & INS_ON_TOP) |
1396 | if (!(flag & INS_ON_TOP) |
1394 | && ms.flags () & P_BLOCKSVIEW |
1397 | && ms.flags () & P_BLOCKSVIEW |
1395 | && (op->face && !faces [op->face].visibility)) |
1398 | && (op->face && !faces [op->face].visibility)) |
1396 | { |
1399 | { |
|
|
1400 | object *last; |
|
|
1401 | |
1397 | for (last = top; last != floor; last = last->below) |
1402 | for (last = top; last != floor; last = last->below) |
1398 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1399 | break; |
1404 | break; |
1400 | |
1405 | |
1401 | /* Check to see if we found the object that blocks view, |
1406 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1409 | } /* If objects on this space */ |
1414 | } /* If objects on this space */ |
1410 | |
1415 | |
1411 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1416 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1412 | top = floor; |
1417 | top = floor; |
1413 | |
1418 | |
1414 | /* Top is the object that our object (op) is going to get inserted above. |
1419 | // insert object above top, or bottom-most if top = 0 |
1415 | */ |
|
|
1416 | |
|
|
1417 | /* First object on this space */ |
|
|
1418 | if (!top) |
1420 | if (!top) |
1419 | { |
1421 | { |
|
|
1422 | op->below = 0; |
1420 | op->above = ms.bot; |
1423 | op->above = ms.bot; |
1421 | |
|
|
1422 | if (op->above) |
|
|
1423 | op->above->below = op; |
|
|
1424 | |
|
|
1425 | op->below = 0; |
|
|
1426 | ms.bot = op; |
1424 | ms.bot = op; |
|
|
1425 | |
|
|
1426 | *(op->above ? &op->above->below : &ms.top) = op; |
1427 | } |
1427 | } |
1428 | else |
1428 | else |
1429 | { /* get inserted into the stack above top */ |
1429 | { |
1430 | op->above = top->above; |
1430 | op->above = top->above; |
1431 | |
|
|
1432 | if (op->above) |
|
|
1433 | op->above->below = op; |
1431 | top->above = op; |
1434 | |
1432 | |
1435 | op->below = top; |
1433 | op->below = top; |
1436 | top->above = op; |
1434 | *(op->above ? &op->above->below : &ms.top) = op; |
1437 | } |
1435 | } |
1438 | |
1436 | } |
1439 | if (!op->above) |
|
|
1440 | ms.top = op; |
|
|
1441 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1442 | |
1437 | |
1443 | if (op->type == PLAYER) |
1438 | if (op->type == PLAYER) |
1444 | { |
1439 | { |
1445 | op->contr->do_los = 1; |
1440 | op->contr->do_los = 1; |
1446 | ++op->map->players; |
1441 | ++op->map->players; |
… | |
… | |
1582 | } |
1577 | } |
1583 | else |
1578 | else |
1584 | { |
1579 | { |
1585 | decrease (nr); |
1580 | decrease (nr); |
1586 | |
1581 | |
1587 | object *op = object_create_clone (this); |
1582 | object *op = deep_clone (); |
1588 | op->nrof = nr; |
1583 | op->nrof = nr; |
1589 | return op; |
1584 | return op; |
1590 | } |
1585 | } |
1591 | } |
1586 | } |
1592 | |
1587 | |
… | |
… | |
1813 | LOG (llevError, "Present_arch called outside map.\n"); |
1808 | LOG (llevError, "Present_arch called outside map.\n"); |
1814 | return NULL; |
1809 | return NULL; |
1815 | } |
1810 | } |
1816 | |
1811 | |
1817 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1812 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1818 | if (tmp->arch == at) |
1813 | if (tmp->arch->archname == at->archname) |
1819 | return tmp; |
1814 | return tmp; |
1820 | |
1815 | |
1821 | return NULL; |
1816 | return NULL; |
1822 | } |
1817 | } |
1823 | |
1818 | |
… | |
… | |
1887 | * The first matching object is returned, or NULL if none. |
1882 | * The first matching object is returned, or NULL if none. |
1888 | */ |
1883 | */ |
1889 | object * |
1884 | object * |
1890 | present_arch_in_ob (const archetype *at, const object *op) |
1885 | present_arch_in_ob (const archetype *at, const object *op) |
1891 | { |
1886 | { |
1892 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1887 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1893 | if (tmp->arch == at) |
1888 | if (tmp->arch->archname == at->archname) |
1894 | return tmp; |
1889 | return tmp; |
1895 | |
1890 | |
1896 | return NULL; |
1891 | return NULL; |
1897 | } |
1892 | } |
1898 | |
1893 | |
… | |
… | |
2307 | |
2302 | |
2308 | /* |
2303 | /* |
2309 | * create clone from object to another |
2304 | * create clone from object to another |
2310 | */ |
2305 | */ |
2311 | object * |
2306 | object * |
2312 | object_create_clone (object *asrc) |
2307 | object::deep_clone () |
2313 | { |
2308 | { |
|
|
2309 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2310 | |
2314 | object *dst = 0; |
2311 | object *dst = clone (); |
2315 | |
2312 | |
2316 | if (!asrc) |
|
|
2317 | return 0; |
|
|
2318 | |
|
|
2319 | object *src = asrc->head_ (); |
|
|
2320 | |
|
|
2321 | object *prev = 0; |
2313 | object *prev = dst; |
2322 | for (object *part = src; part; part = part->more) |
2314 | for (object *part = this->more; part; part = part->more) |
2323 | { |
2315 | { |
2324 | object *tmp = part->clone (); |
2316 | object *tmp = part->clone (); |
2325 | |
|
|
2326 | tmp->x -= src->x; |
|
|
2327 | tmp->y -= src->y; |
|
|
2328 | |
|
|
2329 | if (!part->head) |
|
|
2330 | { |
|
|
2331 | dst = tmp; |
|
|
2332 | tmp->head = 0; |
|
|
2333 | } |
|
|
2334 | else |
|
|
2335 | tmp->head = dst; |
2317 | tmp->head = dst; |
2336 | |
|
|
2337 | tmp->more = 0; |
|
|
2338 | |
|
|
2339 | if (prev) |
|
|
2340 | prev->more = tmp; |
2318 | prev->more = tmp; |
2341 | |
|
|
2342 | prev = tmp; |
2319 | prev = tmp; |
2343 | } |
2320 | } |
2344 | |
2321 | |
2345 | for (object *item = src->inv; item; item = item->below) |
2322 | for (object *item = inv; item; item = item->below) |
2346 | insert_ob_in_ob (object_create_clone (item), dst); |
2323 | insert_ob_in_ob (item->deep_clone (), dst); |
2347 | |
2324 | |
2348 | return dst; |
2325 | return dst; |
2349 | } |
2326 | } |
2350 | |
2327 | |
2351 | /* This returns the first object in who's inventory that |
2328 | /* This returns the first object in who's inventory that |
… | |
… | |
2459 | { |
2436 | { |
2460 | char flagdesc[512]; |
2437 | char flagdesc[512]; |
2461 | char info2[256 * 4]; |
2438 | char info2[256 * 4]; |
2462 | char *p = info; |
2439 | char *p = info; |
2463 | |
2440 | |
2464 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2441 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2465 | count, |
2442 | count, |
2466 | uuid.c_str (), |
2443 | uuid.c_str (), |
2467 | &name, |
2444 | &name, |
2468 | title ? "\",title:\"" : "", |
2445 | title ? ",title:\"" : "", |
2469 | title ? (const char *)title : "", |
2446 | title ? (const char *)title : "", |
|
|
2447 | title ? "\"" : "", |
2470 | flag_desc (flagdesc, 512), type); |
2448 | flag_desc (flagdesc, 512), type); |
2471 | |
2449 | |
2472 | if (!flag[FLAG_REMOVED] && env) |
2450 | if (!flag[FLAG_REMOVED] && env) |
2473 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2451 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2474 | |
2452 | |