… | … | ||
---|---|---|---|
1274 | 1274 | ||
1275 | if (op->has_dialogue ()) | 1275 | if (op->has_dialogue ()) |
1276 | flags |= 1; | 1276 | flags |= 1; |
1277 | 1277 | ||
1278 | if (op->type == PLAYER) | 1278 | if (op->type == PLAYER) |
1279 | player = ob == op ? pl->ob->count : op->count; | 1279 | player = op == ob ? pl->ob->count |
1280 | : op == pl->ob ? ob->count | ||
1281 | : op->count; | ||
1280 | } | 1282 | } |
1281 | 1283 | ||
1282 | if (lastcell.stat_hp != stat_hp) | 1284 | if (lastcell.stat_hp != stat_hp) |
1283 | { | 1285 | { |
1284 | lastcell.stat_hp = stat_hp; | 1286 | lastcell.stat_hp = stat_hp; |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |