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