… | |
… | |
24 | #include <global.h> |
24 | #include <global.h> |
25 | #include <stdio.h> |
25 | #include <stdio.h> |
26 | #include <sys/types.h> |
26 | #include <sys/types.h> |
27 | #include <sys/uio.h> |
27 | #include <sys/uio.h> |
28 | #include <object.h> |
28 | #include <object.h> |
29 | #include <funcpoint.h> |
|
|
30 | #include <sproto.h> |
29 | #include <sproto.h> |
31 | #include <loader.h> |
30 | #include <loader.h> |
32 | |
31 | |
33 | #include <bitset> |
32 | #include <bitset> |
34 | |
33 | |
… | |
… | |
331 | |
330 | |
332 | /* Everything passes, must be OK. */ |
331 | /* Everything passes, must be OK. */ |
333 | return 1; |
332 | return 1; |
334 | } |
333 | } |
335 | |
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 | |
336 | // adjust weight per container type ("of holding") |
370 | // adjust weight per container type ("of holding") |
337 | static sint32 |
371 | static sint32 |
338 | weight_adjust (object *op, sint32 weight) |
372 | weight_adjust (object *op, sint32 weight) |
339 | { |
373 | { |
340 | return op->type == CONTAINER |
374 | return op->type == CONTAINER |
… | |
… | |
351 | { |
385 | { |
352 | while (op) |
386 | while (op) |
353 | { |
387 | { |
354 | weight = weight_adjust (op, weight); |
388 | weight = weight_adjust (op, weight); |
355 | |
389 | |
|
|
390 | if (!weight) |
|
|
391 | return; |
|
|
392 | |
356 | op->carrying += weight; |
393 | op->carrying += weight; |
|
|
394 | |
|
|
395 | if (object *pl = op->visible_to ()) |
|
|
396 | if (pl != op) // player is handled lazily |
|
|
397 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
398 | |
357 | op = op->env; |
399 | op = op->env; |
358 | } |
400 | } |
359 | } |
401 | } |
360 | |
402 | |
361 | /* |
403 | /* |
… | |
… | |
374 | op->update_weight (); |
416 | op->update_weight (); |
375 | |
417 | |
376 | sum += op->total_weight (); |
418 | sum += op->total_weight (); |
377 | } |
419 | } |
378 | |
420 | |
379 | carrying = weight_adjust (this, sum); |
421 | sum = weight_adjust (this, sum); |
|
|
422 | |
|
|
423 | if (sum != carrying) |
|
|
424 | { |
|
|
425 | carrying = sum; |
|
|
426 | |
|
|
427 | if (object *pl = visible_to ()) |
|
|
428 | if (pl != this) // player is handled lazily |
|
|
429 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
430 | } |
380 | } |
431 | } |
381 | |
432 | |
382 | /* |
433 | /* |
383 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
434 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
384 | */ |
435 | */ |
… | |
… | |
866 | object::destroy_inv (bool drop_to_ground) |
917 | object::destroy_inv (bool drop_to_ground) |
867 | { |
918 | { |
868 | // need to check first, because the checks below might segfault |
919 | // need to check first, because the checks below might segfault |
869 | // as we might be on an invalid mapspace and crossfire code |
920 | // as we might be on an invalid mapspace and crossfire code |
870 | // is too buggy to ensure that the inventory is empty. |
921 | // is too buggy to ensure that the inventory is empty. |
871 | // corollary: if you create arrows etc. with stuff in tis inventory, |
922 | // corollary: if you create arrows etc. with stuff in its inventory, |
872 | // cf will crash below with off-map x and y |
923 | // cf will crash below with off-map x and y |
873 | if (!inv) |
924 | if (!inv) |
874 | return; |
925 | return; |
875 | |
926 | |
876 | /* Only if the space blocks everything do we not process - |
927 | /* Only if the space blocks everything do we not process - |
… | |
… | |
883 | || map->nodrop |
934 | || map->nodrop |
884 | || ms ().move_block == MOVE_ALL) |
935 | || ms ().move_block == MOVE_ALL) |
885 | { |
936 | { |
886 | while (inv) |
937 | while (inv) |
887 | { |
938 | { |
888 | inv->destroy_inv (drop_to_ground); |
939 | inv->destroy_inv (false); |
889 | inv->destroy (); |
940 | inv->destroy (); |
890 | } |
941 | } |
891 | } |
942 | } |
892 | else |
943 | else |
893 | { /* Put objects in inventory onto this space */ |
944 | { /* Put objects in inventory onto this space */ |
… | |
… | |
899 | || op->flag [FLAG_NO_DROP] |
950 | || op->flag [FLAG_NO_DROP] |
900 | || op->type == RUNE |
951 | || op->type == RUNE |
901 | || op->type == TRAP |
952 | || op->type == TRAP |
902 | || op->flag [FLAG_IS_A_TEMPLATE] |
953 | || op->flag [FLAG_IS_A_TEMPLATE] |
903 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
954 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
904 | op->destroy (); |
955 | op->destroy (true); |
905 | else |
956 | else |
906 | map->insert (op, x, y); |
957 | map->insert (op, x, y); |
907 | } |
958 | } |
908 | } |
959 | } |
909 | } |
960 | } |
… | |
… | |
916 | } |
967 | } |
917 | |
968 | |
918 | void |
969 | void |
919 | object::do_destroy () |
970 | object::do_destroy () |
920 | { |
971 | { |
921 | attachable::do_destroy (); |
|
|
922 | |
|
|
923 | if (flag [FLAG_IS_LINKED]) |
972 | if (flag [FLAG_IS_LINKED]) |
924 | remove_button_link (this); |
973 | remove_button_link (this); |
925 | |
974 | |
926 | if (flag [FLAG_FRIENDLY]) |
975 | if (flag [FLAG_FRIENDLY]) |
927 | remove_friendly_object (this); |
976 | remove_friendly_object (this); |
928 | |
977 | |
929 | if (!flag [FLAG_REMOVED]) |
|
|
930 | remove (); |
978 | remove (); |
931 | |
979 | |
932 | destroy_inv (true); |
980 | attachable::do_destroy (); |
933 | |
981 | |
934 | deactivate (); |
982 | deactivate (); |
935 | unlink (); |
983 | unlink (); |
936 | |
984 | |
937 | flag [FLAG_FREED] = 1; |
985 | flag [FLAG_FREED] = 1; |
… | |
… | |
978 | object::destroy (bool destroy_inventory) |
1026 | object::destroy (bool destroy_inventory) |
979 | { |
1027 | { |
980 | if (destroyed ()) |
1028 | if (destroyed ()) |
981 | return; |
1029 | return; |
982 | |
1030 | |
983 | if (destroy_inventory) |
1031 | destroy_inv (!destroy_inventory); |
984 | destroy_inv (false); |
|
|
985 | |
1032 | |
986 | if (is_head ()) |
1033 | if (is_head ()) |
987 | if (sound_destroy) |
1034 | if (sound_destroy) |
988 | play_sound (sound_destroy); |
1035 | play_sound (sound_destroy); |
989 | else if (flag [FLAG_MONSTER]) |
1036 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1003 | object::do_remove () |
1050 | object::do_remove () |
1004 | { |
1051 | { |
1005 | object *tmp, *last = 0; |
1052 | object *tmp, *last = 0; |
1006 | object *otmp; |
1053 | object *otmp; |
1007 | |
1054 | |
1008 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1055 | if (flag [FLAG_REMOVED]) |
1009 | return; |
1056 | return; |
1010 | |
1057 | |
1011 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1012 | INVOKE_OBJECT (REMOVE, this); |
1058 | INVOKE_OBJECT (REMOVE, this); |
|
|
1059 | |
|
|
1060 | if (object *pl = visible_to ()) |
|
|
1061 | esrv_del_item (pl->contr, count); |
|
|
1062 | |
|
|
1063 | flag [FLAG_REMOVED] = true; |
1013 | |
1064 | |
1014 | if (more) |
1065 | if (more) |
1015 | more->remove (); |
1066 | more->remove (); |
1016 | |
1067 | |
1017 | /* |
1068 | /* |
… | |
… | |
1098 | * removed (most likely destroyed), update the player view |
1149 | * removed (most likely destroyed), update the player view |
1099 | * appropriately. |
1150 | * appropriately. |
1100 | */ |
1151 | */ |
1101 | pl->close_container (); |
1152 | pl->close_container (); |
1102 | |
1153 | |
1103 | pl->contr->ns->floorbox_update (); |
1154 | //TODO: the floorbox prev/next might need updating |
|
|
1155 | esrv_del_item (pl->contr, count); |
1104 | } |
1156 | } |
1105 | |
1157 | |
1106 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1158 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1107 | { |
1159 | { |
1108 | /* No point updating the players look faces if he is the object |
1160 | /* No point updating the players look faces if he is the object |
… | |
… | |
1152 | if (!top) |
1204 | if (!top) |
1153 | for (top = op; top && top->above; top = top->above) |
1205 | for (top = op; top && top->above; top = top->above) |
1154 | ; |
1206 | ; |
1155 | |
1207 | |
1156 | for (; top; top = top->below) |
1208 | for (; top; top = top->below) |
1157 | { |
|
|
1158 | if (top == op) |
|
|
1159 | continue; |
|
|
1160 | |
|
|
1161 | if (object::can_merge (op, top)) |
1209 | if (object::can_merge (op, top)) |
1162 | { |
1210 | { |
1163 | top->nrof += op->nrof; |
1211 | top->nrof += op->nrof; |
1164 | |
1212 | |
1165 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1213 | if (object *pl = top->visible_to ()) |
1166 | op->weight = 0; /* Don't want any adjustements now */ |
1214 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1215 | |
|
|
1216 | op->weight = 0; // cancel the addition above |
|
|
1217 | op->carrying = 0; // must be 0 already |
|
|
1218 | |
1167 | op->destroy (); |
1219 | op->destroy (1); |
|
|
1220 | |
1168 | return top; |
1221 | return top; |
1169 | } |
1222 | } |
1170 | } |
|
|
1171 | |
1223 | |
1172 | return 0; |
1224 | return 0; |
1173 | } |
1225 | } |
1174 | |
1226 | |
1175 | void |
1227 | void |
… | |
… | |
1234 | object * |
1286 | object * |
1235 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1287 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1236 | { |
1288 | { |
1237 | assert (!op->flag [FLAG_FREED]); |
1289 | assert (!op->flag [FLAG_FREED]); |
1238 | |
1290 | |
1239 | object *top, *floor = NULL; |
|
|
1240 | |
|
|
1241 | op->remove (); |
1291 | op->remove (); |
1242 | |
1292 | |
1243 | /* Ideally, the caller figures this out. However, it complicates a lot |
1293 | /* Ideally, the caller figures this out. However, it complicates a lot |
1244 | * of areas of callers (eg, anything that uses find_free_spot would now |
1294 | * of areas of callers (eg, anything that uses find_free_spot would now |
1245 | * need extra work |
1295 | * need extra work |
1246 | */ |
1296 | */ |
1247 | if (!xy_normalise (m, op->x, op->y)) |
1297 | if (!xy_normalise (m, op->x, op->y)) |
1248 | { |
1298 | { |
1249 | op->destroy (); |
1299 | op->destroy (1); |
1250 | return 0; |
1300 | return 0; |
1251 | } |
1301 | } |
1252 | |
1302 | |
1253 | if (object *more = op->more) |
1303 | if (object *more = op->more) |
1254 | if (!insert_ob_in_map (more, m, originator, flag)) |
1304 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1263 | */ |
1313 | */ |
1264 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1314 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1265 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1315 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1266 | if (object::can_merge (op, tmp)) |
1316 | if (object::can_merge (op, tmp)) |
1267 | { |
1317 | { |
|
|
1318 | // TODO: we atcually want to update tmp, not op, |
|
|
1319 | // but some caller surely breaks when we return tmp |
|
|
1320 | // from here :/ |
1268 | op->nrof += tmp->nrof; |
1321 | op->nrof += tmp->nrof; |
1269 | tmp->destroy (1); |
1322 | tmp->destroy (1); |
1270 | } |
1323 | } |
1271 | |
1324 | |
1272 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1325 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1294 | /* since *below* originator, no need to update top */ |
1347 | /* since *below* originator, no need to update top */ |
1295 | originator->below = op; |
1348 | originator->below = op; |
1296 | } |
1349 | } |
1297 | else |
1350 | else |
1298 | { |
1351 | { |
|
|
1352 | object *top, *floor = NULL; |
|
|
1353 | |
1299 | top = ms.bot; |
1354 | top = ms.bot; |
1300 | |
1355 | |
1301 | /* If there are other objects, then */ |
1356 | /* If there are other objects, then */ |
1302 | if (top) |
1357 | if (top) |
1303 | { |
1358 | { |
… | |
… | |
1402 | } |
1457 | } |
1403 | |
1458 | |
1404 | op->map->dirty = true; |
1459 | op->map->dirty = true; |
1405 | |
1460 | |
1406 | if (object *pl = ms.player ()) |
1461 | if (object *pl = ms.player ()) |
1407 | pl->contr->ns->floorbox_update (); |
1462 | //TODO: the floorbox prev/next might need updating |
|
|
1463 | esrv_send_item (pl, op); |
1408 | |
1464 | |
1409 | /* If this object glows, it may affect lighting conditions that are |
1465 | /* If this object glows, it may affect lighting conditions that are |
1410 | * visible to others on this map. But update_all_los is really |
1466 | * visible to others on this map. But update_all_los is really |
1411 | * an inefficient way to do this, as it means los for all players |
1467 | * an inefficient way to do this, as it means los for all players |
1412 | * on the map will get recalculated. The players could very well |
1468 | * on the map will get recalculated. The players could very well |
… | |
… | |
1477 | return where->env->insert (this); |
1533 | return where->env->insert (this); |
1478 | else |
1534 | else |
1479 | return where->map->insert (this, where->x, where->y, originator, flags); |
1535 | return where->map->insert (this, where->x, where->y, originator, flags); |
1480 | } |
1536 | } |
1481 | |
1537 | |
1482 | // find player who can see this object |
|
|
1483 | static object * |
|
|
1484 | visible_to (object *op) |
|
|
1485 | { |
|
|
1486 | if (!op->flag [FLAG_REMOVED]) |
|
|
1487 | { |
|
|
1488 | // see if we are in a container of sorts |
|
|
1489 | if (object *env = op->env) |
|
|
1490 | { |
|
|
1491 | // the player inventory itself is always visible |
|
|
1492 | if (env->type == PLAYER) |
|
|
1493 | return env; |
|
|
1494 | |
|
|
1495 | // else a player could have our env open |
|
|
1496 | env = env->outer_env (); |
|
|
1497 | |
|
|
1498 | // the player itself is always on a map, so we will find him here |
|
|
1499 | // even if our inv is in a player. |
|
|
1500 | if (env->is_on_map ()) |
|
|
1501 | if (object *pl = env->ms ().player ()) |
|
|
1502 | if (pl->container == op->env) |
|
|
1503 | return pl; |
|
|
1504 | } |
|
|
1505 | else |
|
|
1506 | { |
|
|
1507 | // maybe there is a player standing on the same mapspace |
|
|
1508 | if (object *pl = env->ms ().player ()) |
|
|
1509 | return pl; |
|
|
1510 | } |
|
|
1511 | } |
|
|
1512 | |
|
|
1513 | return 0; |
|
|
1514 | } |
|
|
1515 | |
|
|
1516 | /* |
1538 | /* |
1517 | * decrease(object, number) decreases a specified number from |
1539 | * decrease(object, number) decreases a specified number from |
1518 | * the amount of an object. If the amount reaches 0, the object |
1540 | * the amount of an object. If the amount reaches 0, the object |
1519 | * is subsequently removed and freed. |
1541 | * is subsequently removed and freed. |
1520 | * |
1542 | * |
1521 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1543 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1522 | */ |
1544 | */ |
1523 | bool |
1545 | bool |
1524 | object::decrease (sint32 nr) |
1546 | object::decrease (sint32 nr) |
1525 | { |
1547 | { |
|
|
1548 | if (!nr) |
|
|
1549 | return true; |
|
|
1550 | |
1526 | nr = min (nr, nrof); |
1551 | nr = min (nr, nrof); |
1527 | |
1552 | |
1528 | if (!nr) |
|
|
1529 | return 1; |
|
|
1530 | |
|
|
1531 | nrof -= nr; |
1553 | nrof -= nr; |
1532 | |
1554 | |
1533 | object *visible = visible_to (this); |
|
|
1534 | |
|
|
1535 | if (nrof) |
1555 | if (nrof) |
1536 | { |
1556 | { |
1537 | adjust_weight (env, -weight * nr); // carrying == 0 |
1557 | adjust_weight (env, -weight * nr); // carrying == 0 |
1538 | |
1558 | |
1539 | if (visible) |
1559 | if (object *pl = visible_to ()) |
1540 | esrv_send_item (visible, this); |
1560 | esrv_update_item (UPD_NROF, pl, this); |
1541 | |
1561 | |
1542 | return 1; |
1562 | return true; |
1543 | } |
1563 | } |
1544 | else |
1564 | else |
1545 | { |
1565 | { |
1546 | if (visible) |
|
|
1547 | esrv_del_item (visible->contr, count); |
|
|
1548 | |
|
|
1549 | this->destroy (1); |
1566 | destroy (1); |
1550 | return 0; |
1567 | return false; |
1551 | } |
1568 | } |
1552 | } |
1569 | } |
1553 | |
1570 | |
1554 | /* |
1571 | /* |
1555 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1572 | * split(ob,nr) splits up ob into two parts. The part which |
1556 | * is returned contains nr objects, and the remaining parts contains |
1573 | * is returned contains nr objects, and the remaining parts contains |
1557 | * the rest (or is removed and freed if that number is 0). |
1574 | * the rest (or is removed and returned if that number is 0). |
1558 | * On failure, NULL is returned, and the reason put into the |
1575 | * On failure, NULL is returned. |
1559 | * global static errmsg array. |
|
|
1560 | */ |
1576 | */ |
1561 | object * |
1577 | object * |
1562 | object::split (sint32 nr) |
1578 | object::split (sint32 nr) |
1563 | { |
1579 | { |
|
|
1580 | int have = number_of (); |
|
|
1581 | |
1564 | if (nrof < nr) |
1582 | if (have < nr) |
1565 | return 0; |
1583 | return 0; |
1566 | else if (nrof == nr) |
1584 | else if (have == nr) |
1567 | { |
1585 | { |
1568 | remove (); |
1586 | remove (); |
1569 | return this; |
1587 | return this; |
1570 | } |
1588 | } |
1571 | else |
1589 | else |
… | |
… | |
1574 | |
1592 | |
1575 | object *op = object_create_clone (this); |
1593 | object *op = object_create_clone (this); |
1576 | op->nrof = nr; |
1594 | op->nrof = nr; |
1577 | return op; |
1595 | return op; |
1578 | } |
1596 | } |
1579 | } |
|
|
1580 | |
|
|
1581 | //TODO: remove, but semantics differs from split_nr |
|
|
1582 | object * |
|
|
1583 | get_split_ob (object *orig_ob, uint32 nr) |
|
|
1584 | { |
|
|
1585 | if (orig_ob->nrof < nr) |
|
|
1586 | { |
|
|
1587 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1588 | return 0; |
|
|
1589 | } |
|
|
1590 | |
|
|
1591 | return orig_ob->split (nr); |
|
|
1592 | } |
1597 | } |
1593 | |
1598 | |
1594 | object * |
1599 | object * |
1595 | insert_ob_in_ob (object *op, object *where) |
1600 | insert_ob_in_ob (object *op, object *where) |
1596 | { |
1601 | { |
… | |
… | |
1637 | if (object::can_merge (tmp, op)) |
1642 | if (object::can_merge (tmp, op)) |
1638 | { |
1643 | { |
1639 | /* return the original object and remove inserted object |
1644 | /* return the original object and remove inserted object |
1640 | (client needs the original object) */ |
1645 | (client needs the original object) */ |
1641 | tmp->nrof += op->nrof; |
1646 | tmp->nrof += op->nrof; |
|
|
1647 | |
|
|
1648 | if (object *pl = tmp->visible_to ()) |
|
|
1649 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1650 | |
|
|
1651 | adjust_weight (this, op->total_weight ()); |
|
|
1652 | |
1642 | op->destroy (1); |
1653 | op->destroy (1); |
1643 | op = tmp; |
1654 | op = tmp; |
1644 | goto inserted; |
1655 | goto inserted; |
1645 | } |
1656 | } |
1646 | |
1657 | |
… | |
… | |
1658 | |
1669 | |
1659 | inv = op; |
1670 | inv = op; |
1660 | |
1671 | |
1661 | op->flag [FLAG_REMOVED] = 0; |
1672 | op->flag [FLAG_REMOVED] = 0; |
1662 | |
1673 | |
|
|
1674 | if (object *pl = op->visible_to ()) |
|
|
1675 | esrv_send_item (pl, op); |
|
|
1676 | |
1663 | adjust_weight (this, op->total_weight ()); |
1677 | adjust_weight (this, op->total_weight ()); |
1664 | |
1678 | |
1665 | inserted: |
1679 | inserted: |
1666 | /* reset the light list and los of the players on the map */ |
1680 | /* reset the light list and los of the players on the map */ |
1667 | if (op->glow_radius && map && map->darkness) |
1681 | if (op->glow_radius && map && map->darkness) |
1668 | update_all_los (map, x, y); |
1682 | update_all_los (map, x, y); |
1669 | |
1683 | |
1670 | if (object *otmp = in_player ()) |
1684 | // if this is a player's inventory, update stats |
1671 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1685 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1672 | otmp->update_stats (); |
1686 | update_stats (); |
1673 | |
1687 | |
1674 | INVOKE_OBJECT (INSERT, this); |
1688 | INVOKE_OBJECT (INSERT, this); |
1675 | |
1689 | |
1676 | return op; |
1690 | return op; |
1677 | } |
1691 | } |
… | |
… | |
2555 | &name, |
2569 | &name, |
2556 | title ? "\",title:\"" : "", |
2570 | title ? "\",title:\"" : "", |
2557 | title ? (const char *)title : "", |
2571 | title ? (const char *)title : "", |
2558 | flag_desc (flagdesc, 512), type); |
2572 | flag_desc (flagdesc, 512), type); |
2559 | |
2573 | |
2560 | if (!this->flag[FLAG_REMOVED] && env) |
2574 | if (!flag[FLAG_REMOVED] && env) |
2561 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2575 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2562 | |
2576 | |
2563 | if (map) |
2577 | if (map) |
2564 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2578 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2565 | |
2579 | |
… | |
… | |
2607 | if (object *closer = old_container->inv) |
2621 | if (object *closer = old_container->inv) |
2608 | if (closer->type == CLOSE_CON) |
2622 | if (closer->type == CLOSE_CON) |
2609 | closer->destroy (); |
2623 | closer->destroy (); |
2610 | #endif |
2624 | #endif |
2611 | |
2625 | |
2612 | old_container->flag [FLAG_APPLIED] = 0; |
2626 | old_container->flag [FLAG_APPLIED] = false; |
2613 | container = 0; |
2627 | container = 0; |
2614 | |
2628 | |
2615 | esrv_update_item (UPD_FLAGS, this, old_container); |
2629 | esrv_update_item (UPD_FLAGS, this, old_container); |
2616 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2630 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2617 | play_sound (sound_find ("chest_close")); |
2631 | play_sound (sound_find ("chest_close")); |
… | |
… | |
2633 | } |
2647 | } |
2634 | #endif |
2648 | #endif |
2635 | |
2649 | |
2636 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2650 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2637 | |
2651 | |
2638 | new_container->flag [FLAG_APPLIED] = 1; |
2652 | new_container->flag [FLAG_APPLIED] = true; |
2639 | container = new_container; |
2653 | container = new_container; |
2640 | |
2654 | |
2641 | esrv_update_item (UPD_FLAGS, this, new_container); |
2655 | esrv_update_item (UPD_FLAGS, this, new_container); |
2642 | esrv_send_inventory (this, new_container); |
2656 | esrv_send_inventory (this, new_container); |
2643 | play_sound (sound_find ("chest_open")); |
2657 | play_sound (sound_find ("chest_open")); |