| … | |
… | |
| 149 | { |
149 | { |
| 150 | UUID uid; |
150 | UUID uid; |
| 151 | |
151 | |
| 152 | uid.seq = ++cur.seq; |
152 | uid.seq = ++cur.seq; |
| 153 | |
153 | |
| 154 | if (expect_false (cur.seq >= seq_next_save)) |
154 | if (ecb_expect_false (cur.seq >= seq_next_save)) |
| 155 | { |
155 | { |
| 156 | seq_next_save = UUID::cur.seq + (UUID_GAP >> 1); |
156 | seq_next_save = UUID::cur.seq + (UUID_GAP >> 1); |
| 157 | write_uuid (UUID_GAP, false); |
157 | write_uuid (UUID_GAP, false); |
| 158 | } |
158 | } |
| 159 | |
159 | |
| … | |
… | |
| 1132 | below = 0; |
1132 | below = 0; |
| 1133 | env = 0; |
1133 | env = 0; |
| 1134 | |
1134 | |
| 1135 | if (pl && pl->is_player ()) |
1135 | if (pl && pl->is_player ()) |
| 1136 | { |
1136 | { |
| 1137 | if (expect_false (pl->contr->combat_ob == this)) |
1137 | if (ecb_expect_false (pl->contr->combat_ob == this)) |
| 1138 | { |
1138 | { |
| 1139 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1139 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
| 1140 | pl->contr->combat_ob = 0; |
1140 | pl->contr->combat_ob = 0; |
| 1141 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
1141 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
| 1142 | } |
1142 | } |
| 1143 | |
1143 | |
| 1144 | if (expect_false (pl->contr->ranged_ob == this)) |
1144 | if (ecb_expect_false (pl->contr->ranged_ob == this)) |
| 1145 | { |
1145 | { |
| 1146 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1146 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
| 1147 | pl->contr->ranged_ob = 0; |
1147 | pl->contr->ranged_ob = 0; |
| 1148 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
1148 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
| 1149 | } |
1149 | } |
| 1150 | |
1150 | |
| 1151 | pl->contr->queue_stats_update (); |
1151 | pl->contr->queue_stats_update (); |
| 1152 | |
1152 | |
| 1153 | if (expect_false (glow_radius) && pl->is_on_map ()) |
1153 | if (ecb_expect_false (glow_radius) && pl->is_on_map ()) |
| 1154 | update_all_los (pl->map, pl->x, pl->y); |
1154 | update_all_los (pl->map, pl->x, pl->y); |
| 1155 | } |
1155 | } |
| 1156 | } |
1156 | } |
| 1157 | else if (map) |
1157 | else if (map) |
| 1158 | { |
1158 | { |
| … | |
… | |
| 2534 | |
2534 | |
| 2535 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
2535 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
| 2536 | add (kvp->key, kvp->value); |
2536 | add (kvp->key, kvp->value); |
| 2537 | |
2537 | |
| 2538 | reverse (); |
2538 | reverse (); |
|
|
2539 | |
|
|
2540 | return *this; |
| 2539 | } |
2541 | } |
| 2540 | |
2542 | |
| 2541 | object::depth_iterator::depth_iterator (object *container) |
2543 | object::depth_iterator::depth_iterator (object *container) |
| 2542 | : iterator_base (container) |
2544 | : iterator_base (container) |
| 2543 | { |
2545 | { |
