| … | |
… | |
| 260 | * to check for objects to make sure there are no common errors. |
260 | * to check for objects to make sure there are no common errors. |
| 261 | */ |
261 | */ |
| 262 | void |
262 | void |
| 263 | object::post_load_check () |
263 | object::post_load_check () |
| 264 | { |
264 | { |
|
|
265 | if (type >= NUM_TYPES) |
|
|
266 | { |
|
|
267 | LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); |
|
|
268 | type = 0; |
|
|
269 | } |
|
|
270 | |
| 265 | switch (type) |
271 | switch (type) |
| 266 | { |
272 | { |
| 267 | case BOW: |
273 | case BOW: |
| 268 | case WAND: |
274 | case WAND: |
| 269 | case ROD: |
275 | case ROD: |
| … | |
… | |
| 378 | * something that has item_power 1 is probably just fine if our calculated |
384 | * something that has item_power 1 is probably just fine if our calculated |
| 379 | * value is 1 or 2 - these values are small enough that hard to be precise. |
385 | * value is 1 or 2 - these values are small enough that hard to be precise. |
| 380 | * similarly, it item_power is 0, the first check will always pass, |
386 | * similarly, it item_power is 0, the first check will always pass, |
| 381 | * but not the second one. |
387 | * but not the second one. |
| 382 | */ |
388 | */ |
|
|
389 | #if 0 //TODO |
| 383 | if (ip > 2 * item_power && ip > (item_power + 3)) |
390 | if (ip > 2 * item_power && ip > (item_power + 3)) |
| 384 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
391 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
|
|
392 | #endif |
| 385 | } |
393 | } |
| 386 | |
394 | |
| 387 | /* Old spellcasting object - need to load in the appropiate object */ |
395 | /* Old spellcasting object - need to load in the appropiate object */ |
| 388 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
396 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
| 389 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
| … | |
… | |
| 509 | |
517 | |
| 510 | next: ; |
518 | next: ; |
| 511 | } |
519 | } |
| 512 | } |
520 | } |
| 513 | |
521 | |
| 514 | #define GET_FLAG(op,flag) \ |
522 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
| 515 | if (f.get_sint32 ()) \ |
|
|
| 516 | SET_FLAG (op, flag); \ |
|
|
| 517 | else \ |
|
|
| 518 | CLEAR_FLAG (op, flag) \ |
|
|
| 519 | |
523 | |
| 520 | bool |
524 | bool |
| 521 | object::parse_kv (object_thawer &f) |
525 | object::parse_kv (object_thawer &f) |
| 522 | { |
526 | { |
| 523 | object *op_inv = inv; |
527 | object *op_inv = inv; |
| … | |
… | |
| 769 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
773 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
| 770 | |
774 | |
| 771 | break; |
775 | break; |
| 772 | |
776 | |
| 773 | case KW_friendly: |
777 | case KW_friendly: |
| 774 | if (f.get_sint32 ()) |
778 | if (f.get_bool ()) |
| 775 | if (type != PLAYER) |
779 | if (type != PLAYER) |
| 776 | add_friendly_object (this); |
780 | add_friendly_object (this); |
| 777 | |
781 | |
| 778 | break; |
782 | break; |
| 779 | |
783 | |
