| … | |
… | |
| 386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
| 387 | #endif |
387 | #endif |
| 388 | } |
388 | } |
| 389 | |
389 | |
| 390 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
| 391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | if ((type == ROD |
|
|
392 | || type == WAND |
|
|
393 | || type == SCROLL |
|
|
394 | || type == HORN |
|
|
395 | || type == FIREWALL |
| 392 | /* 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 */ |
| 393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
397 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
398 | && !inv |
|
|
399 | && !loading_arch |
|
|
400 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
| 394 | { |
401 | { |
| 395 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
402 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
| 396 | * in that spell was stored in sp. |
403 | * in that spell was stored in sp. |
| 397 | */ |
404 | */ |
| 398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
405 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
| 399 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
406 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
| 400 | insert_ob_in_ob (tmp, this); |
407 | insert_ob_in_ob (tmp, this); |
| 401 | randomitems = NULL; /* So another spell isn't created for this object */ |
408 | randomitems = 0; |
| 402 | } |
409 | } |
| 403 | |
410 | |
| 404 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
411 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
| 405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
412 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
| 406 | { |
413 | { |
| … | |
… | |
| 921 | case KW_expmul: f.get (expmul); break; |
928 | case KW_expmul: f.get (expmul); break; |
| 922 | case KW_glow_radius: f.get (glow_radius); break; |
929 | case KW_glow_radius: f.get (glow_radius); break; |
| 923 | case KW_weapontype: f.get (weapontype); break; |
930 | case KW_weapontype: f.get (weapontype); break; |
| 924 | case KW_tooltype: f.get (tooltype); break; |
931 | case KW_tooltype: f.get (tooltype); break; |
| 925 | case KW_casting_time: f.get (casting_time); break; |
932 | case KW_casting_time: f.get (casting_time); break; |
|
|
933 | |
|
|
934 | // elevation is deprecated |
| 926 | case KW_elevation: f.get (elevation); break; |
935 | case KW_elevation: break; |
|
|
936 | |
| 927 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
937 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
| 928 | case KW_client_type: f.get (client_type); break; |
938 | case KW_client_type: f.get (client_type); break; |
| 929 | case KW_duration: f.get (duration); break; |
939 | case KW_duration: f.get (duration); break; |
| 930 | case KW_range: f.get (range); break; |
940 | case KW_range: f.get (range); break; |
| 931 | case KW_range_modifier: f.get (range_modifier); break; |
941 | case KW_range_modifier: f.get (range_modifier); break; |
| … | |
… | |
| 1377 | CMP_OUT (pick_up); |
1387 | CMP_OUT (pick_up); |
| 1378 | CMP_OUT (will_apply); |
1388 | CMP_OUT (will_apply); |
| 1379 | CMP_OUT (smoothlevel); |
1389 | CMP_OUT (smoothlevel); |
| 1380 | CMP_OUT (weapontype); |
1390 | CMP_OUT (weapontype); |
| 1381 | CMP_OUT (tooltype); |
1391 | CMP_OUT (tooltype); |
| 1382 | CMP_OUT (elevation); |
|
|
| 1383 | CMP_OUT (client_type); |
1392 | CMP_OUT (client_type); |
| 1384 | CMP_OUT (item_power); |
1393 | CMP_OUT (item_power); |
| 1385 | CMP_OUT (duration); |
1394 | CMP_OUT (duration); |
| 1386 | CMP_OUT (range); |
1395 | CMP_OUT (range); |
| 1387 | CMP_OUT (range_modifier); |
1396 | CMP_OUT (range_modifier); |
