| … | |
… | |
| 28 | #include <global.h> |
28 | #include <global.h> |
| 29 | #include <loader.h> |
29 | #include <loader.h> |
| 30 | #include <sproto.h> |
30 | #include <sproto.h> |
| 31 | |
31 | |
| 32 | ///////////////////////////////////////////////////////////////////////////// |
32 | ///////////////////////////////////////////////////////////////////////////// |
|
|
33 | |
|
|
34 | extern archetype *loading_arch; |
| 33 | |
35 | |
| 34 | /* This table is only necessary to convert objects that existed before the |
36 | /* This table is only necessary to convert objects that existed before the |
| 35 | * spell object conversion to the new object. It was not practical |
37 | * spell object conversion to the new object. It was not practical |
| 36 | * to go through every mapping looking for every potion, rod, wand, etc |
38 | * to go through every mapping looking for every potion, rod, wand, etc |
| 37 | * that had a sp set and update to the new value. So this maps the |
39 | * that had a sp set and update to the new value. So this maps the |
| … | |
… | |
| 249 | "spell_cause_rabies", /* 204 */ |
251 | "spell_cause_rabies", /* 204 */ |
| 250 | "spell_glyph", /* 205 */ |
252 | "spell_glyph", /* 205 */ |
| 251 | NULL |
253 | NULL |
| 252 | }; |
254 | }; |
| 253 | |
255 | |
| 254 | extern bool loading_arch; |
|
|
| 255 | |
|
|
| 256 | /* This function checks the object after it has been loaded (when we |
256 | /* This function checks the object after it has been loaded (when we |
| 257 | * get the 'end' in the input stream). This function can be used to |
257 | * get the 'end' in the input stream). This function can be used to |
| 258 | * deal with legacy objects where fields may have changed. It can also be used |
258 | * deal with legacy objects where fields may have changed. It can also be used |
| 259 | * to check for objects to make sure there are no common errors. |
259 | * to check for objects to make sure there are no common errors. |
| 260 | */ |
260 | */ |
| … | |
… | |
| 394 | /* Old spellcasting object - need to load in the appropiate object */ |
394 | /* Old spellcasting object - need to load in the appropiate object */ |
| 395 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
395 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
| 396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
| 397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
| 398 | { |
398 | { |
| 399 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
399 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
| 400 | * in that spell was stored in sp. |
400 | * in that spell was stored in sp. |
| 401 | */ |
401 | */ |
| 402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
| 403 | insert_ob_in_ob (tmp, this); |
403 | insert_ob_in_ob (tmp, this); |
| 404 | randomitems = NULL; /* So another spell isn't created for this object */ |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
| … | |
… | |
| 556 | |
556 | |
| 557 | case KW_attach: f.get_ornull (attach); break; |
557 | case KW_attach: f.get_ornull (attach); break; |
| 558 | case KW_skill: f.get_ornull (skill); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
| 559 | case KW_race: f.get_ornull (race); break; |
559 | case KW_race: f.get_ornull (race); break; |
| 560 | case KW_slaying: f.get_ornull (slaying); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
561 | case KW_tag: f.get_ornull (tag); break; |
| 561 | |
562 | |
| 562 | case KW_arch: |
563 | case KW_arch: |
| 563 | { |
564 | { |
| 564 | object *tmp = object::read (f); |
565 | object *tmp = object::read (f); |
| 565 | tmp->deactivate (); |
566 | tmp->deactivate (); |
| … | |
… | |
| 1284 | CMP_OUT (name_pl); |
1285 | CMP_OUT (name_pl); |
| 1285 | CMP_OUT (custom_name); |
1286 | CMP_OUT (custom_name); |
| 1286 | CMP_OUT (title); |
1287 | CMP_OUT (title); |
| 1287 | CMP_OUT (race); |
1288 | CMP_OUT (race); |
| 1288 | CMP_OUT (slaying); |
1289 | CMP_OUT (slaying); |
|
|
1290 | CMP_OUT (tag); |
| 1289 | CMP_OUT (other_arch); |
1291 | CMP_OUT (other_arch); |
| 1290 | |
1292 | |
| 1291 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1293 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
| 1292 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1294 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
| 1293 | |
1295 | |
