… | |
… | |
330 | |
330 | |
331 | /* Everything passes, must be OK. */ |
331 | /* Everything passes, must be OK. */ |
332 | return 1; |
332 | return 1; |
333 | } |
333 | } |
334 | |
334 | |
|
|
335 | // find player who can see this object |
|
|
336 | object * |
|
|
337 | object::visible_to () const |
|
|
338 | { |
|
|
339 | if (!flag [FLAG_REMOVED]) |
|
|
340 | { |
|
|
341 | // see if we are in a container of sorts |
|
|
342 | if (env) |
|
|
343 | { |
|
|
344 | // the player inventory itself is always visible |
|
|
345 | if (env->type == PLAYER) |
|
|
346 | return env; |
|
|
347 | |
|
|
348 | // else a player could have our env open |
|
|
349 | object *envest = env->outer_env (); |
|
|
350 | |
|
|
351 | // the player itself is always on a map, so we will find him here |
|
|
352 | // even if our inv is in a player. |
|
|
353 | if (envest->is_on_map ()) |
|
|
354 | if (object *pl = envest->ms ().player ()) |
|
|
355 | if (pl->container == env) |
|
|
356 | return pl; |
|
|
357 | } |
|
|
358 | else |
|
|
359 | { |
|
|
360 | // maybe there is a player standing on the same mapspace |
|
|
361 | // this will catch the case where "this" is a player |
|
|
362 | if (object *pl = ms ().player ()) |
|
|
363 | return pl; |
|
|
364 | } |
|
|
365 | } |
|
|
366 | |
|
|
367 | return 0; |
|
|
368 | } |
|
|
369 | |
335 | // adjust weight per container type ("of holding") |
370 | // adjust weight per container type ("of holding") |
336 | static sint32 |
371 | static sint32 |
337 | weight_adjust (object *op, sint32 weight) |
372 | weight_adjust (object *op, sint32 weight) |
338 | { |
373 | { |
339 | return op->type == CONTAINER |
374 | return op->type == CONTAINER |
… | |
… | |
356 | return; |
391 | return; |
357 | |
392 | |
358 | op->carrying += weight; |
393 | op->carrying += weight; |
359 | |
394 | |
360 | if (object *pl = op->visible_to ()) |
395 | if (object *pl = op->visible_to ()) |
|
|
396 | if (pl != op) // player is handled lazily |
361 | esrv_update_item (UPD_WEIGHT, pl, op); |
397 | esrv_update_item (UPD_WEIGHT, pl, op); |
362 | |
398 | |
363 | op = op->env; |
399 | op = op->env; |
364 | } |
400 | } |
365 | } |
401 | } |
366 | |
402 | |
… | |
… | |
387 | if (sum != carrying) |
423 | if (sum != carrying) |
388 | { |
424 | { |
389 | carrying = sum; |
425 | carrying = sum; |
390 | |
426 | |
391 | if (object *pl = visible_to ()) |
427 | if (object *pl = visible_to ()) |
|
|
428 | if (pl != this) // player is handled lazily |
392 | esrv_update_item (UPD_WEIGHT, pl, this); |
429 | esrv_update_item (UPD_WEIGHT, pl, this); |
393 | } |
430 | } |
394 | } |
431 | } |
395 | |
432 | |
396 | /* |
433 | /* |
397 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
434 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
… | |
… | |
880 | object::destroy_inv (bool drop_to_ground) |
917 | object::destroy_inv (bool drop_to_ground) |
881 | { |
918 | { |
882 | // need to check first, because the checks below might segfault |
919 | // need to check first, because the checks below might segfault |
883 | // as we might be on an invalid mapspace and crossfire code |
920 | // as we might be on an invalid mapspace and crossfire code |
884 | // is too buggy to ensure that the inventory is empty. |
921 | // is too buggy to ensure that the inventory is empty. |
885 | // corollary: if you create arrows etc. with stuff in tis inventory, |
922 | // corollary: if you create arrows etc. with stuff in its inventory, |
886 | // cf will crash below with off-map x and y |
923 | // cf will crash below with off-map x and y |
887 | if (!inv) |
924 | if (!inv) |
888 | return; |
925 | return; |
889 | |
926 | |
890 | /* Only if the space blocks everything do we not process - |
927 | /* Only if the space blocks everything do we not process - |
… | |
… | |
897 | || map->nodrop |
934 | || map->nodrop |
898 | || ms ().move_block == MOVE_ALL) |
935 | || ms ().move_block == MOVE_ALL) |
899 | { |
936 | { |
900 | while (inv) |
937 | while (inv) |
901 | { |
938 | { |
902 | inv->destroy_inv (drop_to_ground); |
939 | inv->destroy_inv (false); |
903 | inv->destroy (); |
940 | inv->destroy (); |
904 | } |
941 | } |
905 | } |
942 | } |
906 | else |
943 | else |
907 | { /* Put objects in inventory onto this space */ |
944 | { /* Put objects in inventory onto this space */ |
… | |
… | |
913 | || op->flag [FLAG_NO_DROP] |
950 | || op->flag [FLAG_NO_DROP] |
914 | || op->type == RUNE |
951 | || op->type == RUNE |
915 | || op->type == TRAP |
952 | || op->type == TRAP |
916 | || op->flag [FLAG_IS_A_TEMPLATE] |
953 | || op->flag [FLAG_IS_A_TEMPLATE] |
917 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
954 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
918 | op->destroy (); |
955 | op->destroy (true); |
919 | else |
956 | else |
920 | map->insert (op, x, y); |
957 | map->insert (op, x, y); |
921 | } |
958 | } |
922 | } |
959 | } |
923 | } |
960 | } |
… | |
… | |
939 | remove_friendly_object (this); |
976 | remove_friendly_object (this); |
940 | |
977 | |
941 | remove (); |
978 | remove (); |
942 | |
979 | |
943 | attachable::do_destroy (); |
980 | attachable::do_destroy (); |
944 | |
|
|
945 | destroy_inv (true); |
|
|
946 | |
981 | |
947 | deactivate (); |
982 | deactivate (); |
948 | unlink (); |
983 | unlink (); |
949 | |
984 | |
950 | flag [FLAG_FREED] = 1; |
985 | flag [FLAG_FREED] = 1; |
… | |
… | |
991 | object::destroy (bool destroy_inventory) |
1026 | object::destroy (bool destroy_inventory) |
992 | { |
1027 | { |
993 | if (destroyed ()) |
1028 | if (destroyed ()) |
994 | return; |
1029 | return; |
995 | |
1030 | |
|
|
1031 | if (!is_head () && !head->destroyed ()) |
|
|
1032 | { |
|
|
1033 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1034 | head->destroy (destroy_inventory); |
|
|
1035 | } |
|
|
1036 | |
996 | if (destroy_inventory) |
1037 | destroy_inv (!destroy_inventory); |
997 | destroy_inv (false); |
|
|
998 | |
1038 | |
999 | if (is_head ()) |
1039 | if (is_head ()) |
1000 | if (sound_destroy) |
1040 | if (sound_destroy) |
1001 | play_sound (sound_destroy); |
1041 | play_sound (sound_destroy); |
1002 | else if (flag [FLAG_MONSTER]) |
1042 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1115 | * removed (most likely destroyed), update the player view |
1155 | * removed (most likely destroyed), update the player view |
1116 | * appropriately. |
1156 | * appropriately. |
1117 | */ |
1157 | */ |
1118 | pl->close_container (); |
1158 | pl->close_container (); |
1119 | |
1159 | |
1120 | pl->contr->ns->floorbox_update (); |
1160 | //TODO: the floorbox prev/next might need updating |
|
|
1161 | esrv_del_item (pl->contr, count); |
1121 | } |
1162 | } |
1122 | |
1163 | |
1123 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1164 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1124 | { |
1165 | { |
1125 | /* No point updating the players look faces if he is the object |
1166 | /* No point updating the players look faces if he is the object |
… | |
… | |
1169 | if (!top) |
1210 | if (!top) |
1170 | for (top = op; top && top->above; top = top->above) |
1211 | for (top = op; top && top->above; top = top->above) |
1171 | ; |
1212 | ; |
1172 | |
1213 | |
1173 | for (; top; top = top->below) |
1214 | for (; top; top = top->below) |
1174 | { |
|
|
1175 | if (top == op) |
|
|
1176 | continue; |
|
|
1177 | |
|
|
1178 | if (object::can_merge (op, top)) |
1215 | if (object::can_merge (op, top)) |
1179 | { |
1216 | { |
1180 | top->nrof += op->nrof; |
1217 | top->nrof += op->nrof; |
1181 | |
1218 | |
1182 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1219 | if (object *pl = top->visible_to ()) |
1183 | op->weight = 0; /* Don't want any adjustements now */ |
1220 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1221 | |
|
|
1222 | op->weight = 0; // cancel the addition above |
|
|
1223 | op->carrying = 0; // must be 0 already |
|
|
1224 | |
1184 | op->destroy (); |
1225 | op->destroy (1); |
|
|
1226 | |
1185 | return top; |
1227 | return top; |
1186 | } |
1228 | } |
1187 | } |
|
|
1188 | |
1229 | |
1189 | return 0; |
1230 | return 0; |
1190 | } |
1231 | } |
1191 | |
1232 | |
1192 | void |
1233 | void |
… | |
… | |
1251 | object * |
1292 | object * |
1252 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1293 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1253 | { |
1294 | { |
1254 | assert (!op->flag [FLAG_FREED]); |
1295 | assert (!op->flag [FLAG_FREED]); |
1255 | |
1296 | |
1256 | object *top, *floor = NULL; |
|
|
1257 | |
|
|
1258 | op->remove (); |
1297 | op->remove (); |
1259 | |
1298 | |
1260 | /* Ideally, the caller figures this out. However, it complicates a lot |
1299 | /* Ideally, the caller figures this out. However, it complicates a lot |
1261 | * of areas of callers (eg, anything that uses find_free_spot would now |
1300 | * of areas of callers (eg, anything that uses find_free_spot would now |
1262 | * need extra work |
1301 | * need extra work |
1263 | */ |
1302 | */ |
1264 | if (!xy_normalise (m, op->x, op->y)) |
1303 | if (!xy_normalise (m, op->x, op->y)) |
1265 | { |
1304 | { |
1266 | op->destroy (); |
1305 | op->destroy (1); |
1267 | return 0; |
1306 | return 0; |
1268 | } |
1307 | } |
1269 | |
1308 | |
1270 | if (object *more = op->more) |
1309 | if (object *more = op->more) |
1271 | if (!insert_ob_in_map (more, m, originator, flag)) |
1310 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1280 | */ |
1319 | */ |
1281 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1320 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1282 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1321 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1283 | if (object::can_merge (op, tmp)) |
1322 | if (object::can_merge (op, tmp)) |
1284 | { |
1323 | { |
|
|
1324 | // TODO: we atcually want to update tmp, not op, |
|
|
1325 | // but some caller surely breaks when we return tmp |
|
|
1326 | // from here :/ |
1285 | op->nrof += tmp->nrof; |
1327 | op->nrof += tmp->nrof; |
1286 | tmp->destroy (1); |
1328 | tmp->destroy (1); |
1287 | } |
1329 | } |
1288 | |
1330 | |
1289 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1331 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1311 | /* since *below* originator, no need to update top */ |
1353 | /* since *below* originator, no need to update top */ |
1312 | originator->below = op; |
1354 | originator->below = op; |
1313 | } |
1355 | } |
1314 | else |
1356 | else |
1315 | { |
1357 | { |
|
|
1358 | object *top, *floor = NULL; |
|
|
1359 | |
1316 | top = ms.bot; |
1360 | top = ms.bot; |
1317 | |
1361 | |
1318 | /* If there are other objects, then */ |
1362 | /* If there are other objects, then */ |
1319 | if (top) |
1363 | if (top) |
1320 | { |
1364 | { |
… | |
… | |
1419 | } |
1463 | } |
1420 | |
1464 | |
1421 | op->map->dirty = true; |
1465 | op->map->dirty = true; |
1422 | |
1466 | |
1423 | if (object *pl = ms.player ()) |
1467 | if (object *pl = ms.player ()) |
1424 | pl->contr->ns->floorbox_update (); |
1468 | //TODO: the floorbox prev/next might need updating |
|
|
1469 | esrv_send_item (pl, op); |
1425 | |
1470 | |
1426 | /* If this object glows, it may affect lighting conditions that are |
1471 | /* If this object glows, it may affect lighting conditions that are |
1427 | * visible to others on this map. But update_all_los is really |
1472 | * visible to others on this map. But update_all_los is really |
1428 | * an inefficient way to do this, as it means los for all players |
1473 | * an inefficient way to do this, as it means los for all players |
1429 | * on the map will get recalculated. The players could very well |
1474 | * on the map will get recalculated. The players could very well |
… | |
… | |
1494 | return where->env->insert (this); |
1539 | return where->env->insert (this); |
1495 | else |
1540 | else |
1496 | return where->map->insert (this, where->x, where->y, originator, flags); |
1541 | return where->map->insert (this, where->x, where->y, originator, flags); |
1497 | } |
1542 | } |
1498 | |
1543 | |
1499 | // find player who can see this object |
|
|
1500 | object * |
|
|
1501 | object::visible_to () const |
|
|
1502 | { |
|
|
1503 | if (!flag [FLAG_REMOVED]) |
|
|
1504 | { |
|
|
1505 | // see if we are in a container of sorts |
|
|
1506 | if (env) |
|
|
1507 | { |
|
|
1508 | // the player inventory itself is always visible |
|
|
1509 | if (env->type == PLAYER) |
|
|
1510 | return env; |
|
|
1511 | |
|
|
1512 | // else a player could have our env open |
|
|
1513 | object *envest = env->outer_env (); |
|
|
1514 | |
|
|
1515 | // the player itself is always on a map, so we will find him here |
|
|
1516 | // even if our inv is in a player. |
|
|
1517 | if (envest->is_on_map ()) |
|
|
1518 | if (object *pl = envest->ms ().player ()) |
|
|
1519 | if (pl->container == env) |
|
|
1520 | return pl; |
|
|
1521 | } |
|
|
1522 | else |
|
|
1523 | { |
|
|
1524 | // maybe there is a player standing on the same mapspace |
|
|
1525 | // this will catch the case where "this" is a player |
|
|
1526 | if (object *pl = ms ().player ()) |
|
|
1527 | return pl; |
|
|
1528 | } |
|
|
1529 | } |
|
|
1530 | |
|
|
1531 | return 0; |
|
|
1532 | } |
|
|
1533 | |
|
|
1534 | /* |
1544 | /* |
1535 | * decrease(object, number) decreases a specified number from |
1545 | * decrease(object, number) decreases a specified number from |
1536 | * the amount of an object. If the amount reaches 0, the object |
1546 | * the amount of an object. If the amount reaches 0, the object |
1537 | * is subsequently removed and freed. |
1547 | * is subsequently removed and freed. |
1538 | * |
1548 | * |
… | |
… | |
1638 | if (object::can_merge (tmp, op)) |
1648 | if (object::can_merge (tmp, op)) |
1639 | { |
1649 | { |
1640 | /* return the original object and remove inserted object |
1650 | /* return the original object and remove inserted object |
1641 | (client needs the original object) */ |
1651 | (client needs the original object) */ |
1642 | tmp->nrof += op->nrof; |
1652 | tmp->nrof += op->nrof; |
|
|
1653 | |
|
|
1654 | if (object *pl = tmp->visible_to ()) |
|
|
1655 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1656 | |
1643 | adjust_weight (this, op->total_weight ()); |
1657 | adjust_weight (this, op->total_weight ()); |
1644 | |
1658 | |
1645 | op->destroy (1); |
1659 | op->destroy (1); |
1646 | op = tmp; |
1660 | op = tmp; |
1647 | goto inserted; |
1661 | goto inserted; |
… | |
… | |
1661 | |
1675 | |
1662 | inv = op; |
1676 | inv = op; |
1663 | |
1677 | |
1664 | op->flag [FLAG_REMOVED] = 0; |
1678 | op->flag [FLAG_REMOVED] = 0; |
1665 | |
1679 | |
|
|
1680 | if (object *pl = op->visible_to ()) |
|
|
1681 | esrv_send_item (pl, op); |
|
|
1682 | |
1666 | adjust_weight (this, op->total_weight ()); |
1683 | adjust_weight (this, op->total_weight ()); |
1667 | |
1684 | |
1668 | inserted: |
1685 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1686 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1687 | if (op->glow_radius && map && map->darkness) |
1671 | update_all_los (map, x, y); |
1688 | update_all_los (map, x, y); |
1672 | |
1689 | |
1673 | if (object *otmp = in_player ()) |
1690 | // if this is a player's inventory, update stats |
1674 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1691 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1675 | otmp->update_stats (); |
1692 | update_stats (); |
1676 | |
1693 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1694 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1695 | |
1679 | return op; |
1696 | return op; |
1680 | } |
1697 | } |
… | |
… | |
2558 | &name, |
2575 | &name, |
2559 | title ? "\",title:\"" : "", |
2576 | title ? "\",title:\"" : "", |
2560 | title ? (const char *)title : "", |
2577 | title ? (const char *)title : "", |
2561 | flag_desc (flagdesc, 512), type); |
2578 | flag_desc (flagdesc, 512), type); |
2562 | |
2579 | |
2563 | if (!this->flag[FLAG_REMOVED] && env) |
2580 | if (!flag[FLAG_REMOVED] && env) |
2564 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2581 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2565 | |
2582 | |
2566 | if (map) |
2583 | if (map) |
2567 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2584 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2568 | |
2585 | |
… | |
… | |
2610 | if (object *closer = old_container->inv) |
2627 | if (object *closer = old_container->inv) |
2611 | if (closer->type == CLOSE_CON) |
2628 | if (closer->type == CLOSE_CON) |
2612 | closer->destroy (); |
2629 | closer->destroy (); |
2613 | #endif |
2630 | #endif |
2614 | |
2631 | |
2615 | old_container->flag [FLAG_APPLIED] = 0; |
2632 | old_container->flag [FLAG_APPLIED] = false; |
2616 | container = 0; |
2633 | container = 0; |
2617 | |
2634 | |
2618 | esrv_update_item (UPD_FLAGS, this, old_container); |
2635 | esrv_update_item (UPD_FLAGS, this, old_container); |
2619 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2636 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2620 | play_sound (sound_find ("chest_close")); |
2637 | play_sound (sound_find ("chest_close")); |
… | |
… | |
2636 | } |
2653 | } |
2637 | #endif |
2654 | #endif |
2638 | |
2655 | |
2639 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2656 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2640 | |
2657 | |
2641 | new_container->flag [FLAG_APPLIED] = 1; |
2658 | new_container->flag [FLAG_APPLIED] = true; |
2642 | container = new_container; |
2659 | container = new_container; |
2643 | |
2660 | |
2644 | esrv_update_item (UPD_FLAGS, this, new_container); |
2661 | esrv_update_item (UPD_FLAGS, this, new_container); |
2645 | esrv_send_inventory (this, new_container); |
2662 | esrv_send_inventory (this, new_container); |
2646 | play_sound (sound_find ("chest_open")); |
2663 | play_sound (sound_find ("chest_open")); |