ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.117 by elmex, Sun Jun 15 20:29:56 2008 UTC vs.
Revision 1.119 by elmex, Mon Sep 1 22:29:17 2008 UTC

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 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines