| … | |
… | |
| 263 | static void |
263 | static void |
| 264 | check_loaded_object (object *op) |
264 | check_loaded_object (object *op) |
| 265 | { |
265 | { |
| 266 | int ip; |
266 | int ip; |
| 267 | |
267 | |
| 268 | /* We do some specialized handling to handle legacy cases of name_pl. |
268 | /* We do some specialised handling to handle legacy cases of name_pl. |
| 269 | * If the object doesn't have a name_pl, we just use the object name - |
269 | * If the object doesn't have a name_pl, we just use the object name - |
| 270 | * this isn't perfect (things won't be properly pluralized), but works to |
270 | * this isn't perfect (things won't be properly pluralised), but works to |
| 271 | * that degree (5 heart is still quite understandable). But the case we |
271 | * that degree (5 heart is still quite understandable). But the case we |
| 272 | * also have to catch is if this object is not using the normal name for |
272 | * also have to catch is if this object is not using the normal name for |
| 273 | * the object. In that case, we also want to use the loaded name. |
273 | * the object. In that case, we also want to use the loaded name. |
| 274 | * Otherwise, what happens is that the the plural name will lose |
274 | * Otherwise, what happens is that the the plural name will lose |
| 275 | * information (appear as just 'hearts' and not 'goblins heart') |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
| … | |
… | |
| 320 | { |
320 | { |
| 321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
| 322 | op->gen_sp_armour = op->last_heal; |
322 | op->gen_sp_armour = op->last_heal; |
| 323 | op->last_heal = 0; |
323 | op->last_heal = 0; |
| 324 | } |
324 | } |
| 325 | if (editor) |
325 | |
| 326 | ip = 0; |
|
|
| 327 | else |
|
|
| 328 | ip = calc_item_power (op, 0); |
326 | ip = calc_item_power (op, 0); |
| 329 | /* Legacy objects from before item power was in the game */ |
327 | /* Legacy objects from before item power was in the game */ |
| 330 | if (!op->item_power && ip) |
328 | if (!op->item_power && ip) |
| 331 | { |
329 | { |
| 332 | if (ip > 3) |
330 | if (ip > 3) |
| 333 | { |
331 | { |
