| … | |
… | |
| 1270 | op->set_speed (0); |
1270 | op->set_speed (0); |
| 1271 | return; |
1271 | return; |
| 1272 | } |
1272 | } |
| 1273 | else |
1273 | else |
| 1274 | { |
1274 | { |
| 1275 | // check whether the face might needs to be updated |
1275 | // check whether the face might need to be updated |
| 1276 | // (currently this is needed to have already switched on torches |
1276 | // (currently this is needed to have already switched on torches |
| 1277 | // on maps, as they just set the glow_radius in the archetype) |
1277 | // on maps, as they just set the glow_radius in the archetype) |
| 1278 | if (op->other_arch |
1278 | if (op->other_arch |
| 1279 | && ( |
1279 | && ( |
| 1280 | (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE]) |
1280 | (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE]) |
| 1281 | || (op->flag [FLAG_ANIMATE] |
1281 | || (op->flag [FLAG_ANIMATE] |
| 1282 | ? (op->animation_id != op->other_arch->animation_id) |
1282 | ? (op->animation_id != op->other_arch->animation_id) |
| 1283 | : (op->face != op->other_arch->face)) |
1283 | : (op->face != op->other_arch->face)) |
| 1284 | )) |
1284 | )) |
| 1285 | get_animation_from_arch (op, op->other_arch); |
1285 | get_animation_from_arch (op, op->other_arch); |
| 1286 | } |
1286 | } |
| 1287 | |
1287 | |
| 1288 | // lamps and torches auf maps don't use up their fuel |
1288 | // lamps and torches on maps don't use up their fuel |
| 1289 | if (op->is_on_map ()) |
1289 | if (op->is_on_map ()) |
| 1290 | return; |
1290 | return; |
| 1291 | |
1291 | |
| 1292 | if (op->stats.food > 0) |
1292 | if (op->stats.food > 0) |
| 1293 | { |
1293 | { |
