… | |
… | |
334 | |
334 | |
335 | // find player who can see this object |
335 | // find player who can see this object |
336 | object * |
336 | object * |
337 | object::visible_to () const |
337 | object::visible_to () const |
338 | { |
338 | { |
339 | if (!flag [FLAG_REMOVED]) |
339 | if (client_visible () && !flag [FLAG_REMOVED]) |
340 | { |
340 | { |
341 | // see if we are in a container of sorts |
341 | // see if we are in a container of sorts |
342 | if (env) |
342 | if (env) |
343 | { |
343 | { |
344 | // the player inventory itself is always visible |
344 | // the player inventory itself is always visible |
… | |
… | |
358 | else |
358 | else |
359 | { |
359 | { |
360 | // maybe there is a player standing on the same mapspace |
360 | // maybe there is a player standing on the same mapspace |
361 | // this will catch the case where "this" is a player |
361 | // this will catch the case where "this" is a player |
362 | if (object *pl = ms ().player ()) |
362 | if (object *pl = ms ().player ()) |
|
|
363 | if (!pl->container || this == pl->container) |
363 | return pl; |
364 | return pl; |
364 | } |
365 | } |
365 | } |
366 | } |
366 | |
367 | |
367 | return 0; |
368 | return 0; |
368 | } |
369 | } |
… | |
… | |
745 | * UP_OBJ_FACE: only the objects face has changed. |
746 | * UP_OBJ_FACE: only the objects face has changed. |
746 | */ |
747 | */ |
747 | void |
748 | void |
748 | update_object (object *op, int action) |
749 | update_object (object *op, int action) |
749 | { |
750 | { |
750 | if (op == NULL) |
751 | if (!op) |
751 | { |
752 | { |
752 | /* this should never happen */ |
753 | /* this should never happen */ |
753 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
754 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
754 | return; |
755 | return; |
755 | } |
756 | } |
756 | |
757 | |
757 | if (op->env) |
758 | if (!op->is_on_map ()) |
758 | { |
759 | { |
759 | /* Animation is currently handled by client, so nothing |
760 | /* Animation is currently handled by client, so nothing |
760 | * to do in this case. |
761 | * to do in this case. |
761 | */ |
762 | */ |
762 | return; |
763 | return; |
763 | } |
764 | } |
764 | |
|
|
765 | /* If the map is saving, don't do anything as everything is |
|
|
766 | * going to get freed anyways. |
|
|
767 | */ |
|
|
768 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
769 | return; |
|
|
770 | |
765 | |
771 | /* make sure the object is within map boundaries */ |
766 | /* make sure the object is within map boundaries */ |
772 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
767 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
773 | { |
768 | { |
774 | LOG (llevError, "update_object() called for object out of map!\n"); |
769 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
1026 | object::destroy (bool destroy_inventory) |
1021 | object::destroy (bool destroy_inventory) |
1027 | { |
1022 | { |
1028 | if (destroyed ()) |
1023 | if (destroyed ()) |
1029 | return; |
1024 | return; |
1030 | |
1025 | |
|
|
1026 | if (!is_head () && !head->destroyed ()) |
|
|
1027 | { |
|
|
1028 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1029 | head->destroy (destroy_inventory); |
|
|
1030 | } |
|
|
1031 | |
1031 | destroy_inv (!destroy_inventory); |
1032 | destroy_inv (!destroy_inventory); |
1032 | |
1033 | |
1033 | if (is_head ()) |
1034 | if (is_head ()) |
1034 | if (sound_destroy) |
1035 | if (sound_destroy) |
1035 | play_sound (sound_destroy); |
1036 | play_sound (sound_destroy); |
… | |
… | |
1055 | if (flag [FLAG_REMOVED]) |
1056 | if (flag [FLAG_REMOVED]) |
1056 | return; |
1057 | return; |
1057 | |
1058 | |
1058 | INVOKE_OBJECT (REMOVE, this); |
1059 | INVOKE_OBJECT (REMOVE, this); |
1059 | |
1060 | |
1060 | if (object *pl = visible_to ()) |
|
|
1061 | esrv_del_item (pl->contr, count); |
|
|
1062 | |
|
|
1063 | flag [FLAG_REMOVED] = true; |
1061 | flag [FLAG_REMOVED] = true; |
1064 | |
1062 | |
1065 | if (more) |
1063 | if (more) |
1066 | more->remove (); |
1064 | more->remove (); |
1067 | |
1065 | |
… | |
… | |
1069 | * In this case, the object to be removed is in someones |
1067 | * In this case, the object to be removed is in someones |
1070 | * inventory. |
1068 | * inventory. |
1071 | */ |
1069 | */ |
1072 | if (env) |
1070 | if (env) |
1073 | { |
1071 | { |
|
|
1072 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1073 | if (object *pl = visible_to ()) |
|
|
1074 | esrv_del_item (pl->contr, count); |
|
|
1075 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1076 | |
1074 | adjust_weight (env, -total_weight ()); |
1077 | adjust_weight (env, -total_weight ()); |
1075 | |
1078 | |
1076 | *(above ? &above->below : &env->inv) = below; |
1079 | *(above ? &above->below : &env->inv) = below; |
1077 | |
1080 | |
1078 | if (below) |
1081 | if (below) |
… | |
… | |
1096 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1099 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1097 | otmp->update_stats (); |
1100 | otmp->update_stats (); |
1098 | } |
1101 | } |
1099 | else if (map) |
1102 | else if (map) |
1100 | { |
1103 | { |
1101 | if (type == PLAYER) |
|
|
1102 | { |
|
|
1103 | // leaving a spot always closes any open container on the ground |
|
|
1104 | if (container && !container->env) |
|
|
1105 | // this causes spurious floorbox updates, but it ensures |
|
|
1106 | // that the CLOSE event is being sent. |
|
|
1107 | close_container (); |
|
|
1108 | |
|
|
1109 | --map->players; |
|
|
1110 | map->touch (); |
|
|
1111 | } |
|
|
1112 | |
|
|
1113 | map->dirty = true; |
1104 | map->dirty = true; |
1114 | mapspace &ms = this->ms (); |
1105 | mapspace &ms = this->ms (); |
|
|
1106 | |
|
|
1107 | if (object *pl = ms.player ()) |
|
|
1108 | { |
|
|
1109 | if (type == PLAYER) // this == pl(!) |
|
|
1110 | { |
|
|
1111 | // leaving a spot always closes any open container on the ground |
|
|
1112 | if (container && !container->env) |
|
|
1113 | // this causes spurious floorbox updates, but it ensures |
|
|
1114 | // that the CLOSE event is being sent. |
|
|
1115 | close_container (); |
|
|
1116 | |
|
|
1117 | --map->players; |
|
|
1118 | map->touch (); |
|
|
1119 | } |
|
|
1120 | else if (pl->container == this) |
|
|
1121 | { |
|
|
1122 | // removing a container should close it |
|
|
1123 | close_container (); |
|
|
1124 | } |
|
|
1125 | |
|
|
1126 | esrv_del_item (pl->contr, count); |
|
|
1127 | } |
1115 | |
1128 | |
1116 | /* link the object above us */ |
1129 | /* link the object above us */ |
1117 | if (above) |
1130 | if (above) |
1118 | above->below = below; |
1131 | above->below = below; |
1119 | else |
1132 | else |
… | |
… | |
1149 | * removed (most likely destroyed), update the player view |
1162 | * removed (most likely destroyed), update the player view |
1150 | * appropriately. |
1163 | * appropriately. |
1151 | */ |
1164 | */ |
1152 | pl->close_container (); |
1165 | pl->close_container (); |
1153 | |
1166 | |
|
|
1167 | //TODO: the floorbox prev/next might need updating |
1154 | esrv_del_item (pl, count); |
1168 | esrv_del_item (pl->contr, count); |
1155 | } |
1169 | } |
1156 | |
1170 | |
1157 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1171 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1158 | { |
1172 | { |
1159 | /* No point updating the players look faces if he is the object |
1173 | /* No point updating the players look faces if he is the object |
… | |
… | |
1285 | object * |
1299 | object * |
1286 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1300 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1287 | { |
1301 | { |
1288 | assert (!op->flag [FLAG_FREED]); |
1302 | assert (!op->flag [FLAG_FREED]); |
1289 | |
1303 | |
1290 | object *top, *floor = NULL; |
|
|
1291 | |
|
|
1292 | op->remove (); |
1304 | op->remove (); |
1293 | |
1305 | |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1306 | /* Ideally, the caller figures this out. However, it complicates a lot |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1307 | * of areas of callers (eg, anything that uses find_free_spot would now |
1296 | * need extra work |
1308 | * need extra work |
… | |
… | |
1314 | */ |
1326 | */ |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1327 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1316 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1328 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1317 | if (object::can_merge (op, tmp)) |
1329 | if (object::can_merge (op, tmp)) |
1318 | { |
1330 | { |
|
|
1331 | // TODO: we atcually want to update tmp, not op, |
|
|
1332 | // but some caller surely breaks when we return tmp |
|
|
1333 | // from here :/ |
1319 | op->nrof += tmp->nrof; |
1334 | op->nrof += tmp->nrof; |
1320 | tmp->destroy (1); |
1335 | tmp->destroy (1); |
1321 | } |
1336 | } |
1322 | |
1337 | |
1323 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1338 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1345 | /* since *below* originator, no need to update top */ |
1360 | /* since *below* originator, no need to update top */ |
1346 | originator->below = op; |
1361 | originator->below = op; |
1347 | } |
1362 | } |
1348 | else |
1363 | else |
1349 | { |
1364 | { |
|
|
1365 | object *top, *floor = NULL; |
|
|
1366 | |
1350 | top = ms.bot; |
1367 | top = ms.bot; |
1351 | |
1368 | |
1352 | /* If there are other objects, then */ |
1369 | /* If there are other objects, then */ |
1353 | if (top) |
1370 | if (top) |
1354 | { |
1371 | { |
… | |
… | |
1453 | } |
1470 | } |
1454 | |
1471 | |
1455 | op->map->dirty = true; |
1472 | op->map->dirty = true; |
1456 | |
1473 | |
1457 | if (object *pl = ms.player ()) |
1474 | if (object *pl = ms.player ()) |
|
|
1475 | //TODO: the floorbox prev/next might need updating |
1458 | esrv_send_item (pl, op); |
1476 | esrv_send_item (pl, op); |
1459 | |
1477 | |
1460 | /* If this object glows, it may affect lighting conditions that are |
1478 | /* If this object glows, it may affect lighting conditions that are |
1461 | * visible to others on this map. But update_all_los is really |
1479 | * visible to others on this map. But update_all_los is really |
1462 | * an inefficient way to do this, as it means los for all players |
1480 | * an inefficient way to do this, as it means los for all players |
… | |
… | |
2604 | object::open_container (object *new_container) |
2622 | object::open_container (object *new_container) |
2605 | { |
2623 | { |
2606 | if (container == new_container) |
2624 | if (container == new_container) |
2607 | return; |
2625 | return; |
2608 | |
2626 | |
2609 | if (object *old_container = container) |
2627 | object *old_container = container; |
|
|
2628 | |
|
|
2629 | if (old_container) |
2610 | { |
2630 | { |
2611 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2631 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2612 | return; |
2632 | return; |
2613 | |
2633 | |
2614 | #if 0 |
2634 | #if 0 |
… | |
… | |
2616 | if (object *closer = old_container->inv) |
2636 | if (object *closer = old_container->inv) |
2617 | if (closer->type == CLOSE_CON) |
2637 | if (closer->type == CLOSE_CON) |
2618 | closer->destroy (); |
2638 | closer->destroy (); |
2619 | #endif |
2639 | #endif |
2620 | |
2640 | |
|
|
2641 | // make sure the container is available |
|
|
2642 | esrv_send_item (this, old_container); |
|
|
2643 | |
2621 | old_container->flag [FLAG_APPLIED] = false; |
2644 | old_container->flag [FLAG_APPLIED] = false; |
2622 | container = 0; |
2645 | container = 0; |
2623 | |
2646 | |
|
|
2647 | // client needs item update to make it work, client bug requires this to be separate |
2624 | esrv_update_item (UPD_FLAGS, this, old_container); |
2648 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2649 | |
2625 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2650 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2626 | play_sound (sound_find ("chest_close")); |
2651 | play_sound (sound_find ("chest_close")); |
2627 | } |
2652 | } |
2628 | |
2653 | |
2629 | if (new_container) |
2654 | if (new_container) |
… | |
… | |
2642 | } |
2667 | } |
2643 | #endif |
2668 | #endif |
2644 | |
2669 | |
2645 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2670 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2646 | |
2671 | |
|
|
2672 | // make sure the container is available, client bug requires this to be separate |
|
|
2673 | esrv_send_item (this, new_container); |
|
|
2674 | |
2647 | new_container->flag [FLAG_APPLIED] = true; |
2675 | new_container->flag [FLAG_APPLIED] = true; |
2648 | container = new_container; |
2676 | container = new_container; |
2649 | |
2677 | |
|
|
2678 | // client needs flag change |
2650 | esrv_update_item (UPD_FLAGS, this, new_container); |
2679 | esrv_update_item (UPD_FLAGS, this, new_container); |
2651 | esrv_send_inventory (this, new_container); |
2680 | esrv_send_inventory (this, new_container); |
2652 | play_sound (sound_find ("chest_open")); |
2681 | play_sound (sound_find ("chest_open")); |
2653 | } |
2682 | } |
|
|
2683 | // else if (!old_container->env && contr && contr->ns) |
|
|
2684 | // contr->ns->floorbox_reset (); |
2654 | } |
2685 | } |
2655 | |
2686 | |
2656 | object * |
2687 | object * |
2657 | object::force_find (const shstr name) |
2688 | object::force_find (const shstr name) |
2658 | { |
2689 | { |