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.52 by root, Thu Feb 1 19:15:38 2007 UTC vs.
Revision 1.57 by root, Sat Feb 10 01:52:25 2007 UTC

… …
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
34
35loader_base::~loader_base ()
36{
37}
34 38
35// the base class warns about and skips everything 39// the base class warns about and skips everything
36archetype * 40archetype *
37loader_base::get_arch (const char *name) 41loader_base::get_arch (const char *name)
38{ 42{
… …
417 * to check for objects to make sure there are no common errors. 421 * to check for objects to make sure there are no common errors.
418 */ 422 */
419static void 423static void
420check_loaded_object (object *op) 424check_loaded_object (object *op)
421{ 425{
422 int ip;
423
424 /* We do some specialised handling to handle legacy cases of name_pl. 426 /* We do some specialised handling to handle legacy cases of name_pl.
425 * If the object doesn't have a name_pl, we just use the object name - 427 * If the object doesn't have a name_pl, we just use the object name -
426 * this isn't perfect (things won't be properly pluralised), but works to 428 * this isn't perfect (things won't be properly pluralised), but works to
427 * that degree (5 heart is still quite understandable). But the case we 429 * that degree (5 heart is still quite understandable). But the case we
428 * also have to catch is if this object is not using the normal name for 430 * also have to catch is if this object is not using the normal name for
429 * the object. In that case, we also want to use the loaded name. 431 * the object. In that case, we also want to use the loaded name.
430 * Otherwise, what happens is that the the plural name will lose 432 * Otherwise, what happens is that the the plural name will lose
431 * information (appear as just 'hearts' and not 'goblins heart') 433 * information (appear as just 'hearts' and not 'goblins heart')
432 */ 434 */
433 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 435 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
434 op->name_pl = NULL; 436 op->name_pl = 0;
435 437
436 if (!op->name_pl) 438 if (!op->name_pl)
437 op->name_pl = op->name; 439 op->name_pl = op->name;
438 440
439 /* objects now have a materialname. try to patch it in */ 441 /* objects now have a materialname. try to patch it in */
… …
442 if (op->map != NULL) 444 if (op->map != NULL)
443 set_materialname (op, op->map->difficulty, NULL); 445 set_materialname (op, op->map->difficulty, NULL);
444 else 446 else
445 set_materialname (op, 5, NULL); 447 set_materialname (op, 5, NULL);
446 } 448 }
449
447 /* only do these when program is first run - a bit 450 /* only do these when program is first run - a bit
448 * excessive to do this at every run - most of this is 451 * excessive to do this at every run - most of this is
449 * really just to catch any errors - program will still run, but 452 * really just to catch any errors - program will still run, but
450 * not in the ideal fashion. 453 * not in the ideal fashion.
451 */ 454 */
452 if ((op->type == WEAPON || op->type == BOW) && arch_init) 455 if ((op->type == WEAPON || op->type == BOW) && arch_init)
453 { 456 {
454 if (!op->skill) 457 if (!op->skill)
455 {
456 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 458 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
457 }
458 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 459 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
459 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 460 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
460 {
461 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 461 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
462 }
463 } 462 }
464 463
465 /* We changed last_heal to gen_sp_armour, which is what it 464 /* We changed last_heal to gen_sp_armour, which is what it
466 * really does for many objects. Need to catch any in maps 465 * really does for many objects. Need to catch any in maps
467 * that may have an old value. 466 * that may have an old value.
468 */ 467 */
469 if ((op->type == WEAPON) || 468 if (op->type == WEAPON
470 (op->type == ARMOUR) || (op->type == HELMET) || 469 || op->type == ARMOUR || op->type == HELMET
471 (op->type == SHIELD) || (op->type == RING) || 470 || op->type == SHIELD || op->type == RING
472 (op->type == BOOTS) || (op->type == GLOVES) || 471 || op->type == BOOTS || op->type == GLOVES
473 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 472 || op->type == AMULET || op->type == GIRDLE
473 || op->type == BRACERS || op->type == CLOAK)
474 { 474 {
475 if (op->last_heal) 475 if (op->last_heal)
476 { 476 {
477 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 477 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
478 op->gen_sp_armour = op->last_heal; 478 op->gen_sp_armour = op->last_heal;
479 op->last_heal = 0; 479 op->last_heal = 0;
480 } 480 }
481 481
482 ip = calc_item_power (op, 0); 482 int ip = calc_item_power (op, 0);
483
483 /* Legacy objects from before item power was in the game */ 484 /* Legacy objects from before item power was in the game */
484 if (!op->item_power && ip) 485 if (!op->item_power && ip)
485 { 486 {
486 if (ip > 3) 487 if (ip > 3)
487 {
488 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 488 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
489 } 489
490 op->item_power = ip; 490 op->item_power = ip;
491 } 491 }
492
492 /* Check for possibly bogus values. Has to meet both these criteria - 493 /* Check for possibly bogus values. Has to meet both these criteria -
493 * something that has item_power 1 is probably just fine if our calculated 494 * something that has item_power 1 is probably just fine if our calculated
494 * value is 1 or 2 - these values are small enough that hard to be precise. 495 * value is 1 or 2 - these values are small enough that hard to be precise.
495 * similarly, it item_power is 0, the first check will always pass, 496 * similarly, it item_power is 0, the first check will always pass,
496 * but not the second one. 497 * but not the second one.
497 */ 498 */
498 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 499 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
499 {
500 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 500 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
501 }
502
503 } 501 }
502
504 /* Old spellcasting object - need to load in the appropiate object */ 503 /* Old spellcasting object - need to load in the appropiate object */
505 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 504 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
506 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 505 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
507 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 506 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
508 { 507 {
509 object *tmp;
510
511 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 508 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
512 * in that spell was stored in sp. 509 * in that spell was stored in sp.
513 */ 510 */
514 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 511 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
515 insert_ob_in_ob (tmp, op); 512 insert_ob_in_ob (tmp, op);
516 op->randomitems = NULL; /* So another spell isn't created for this object */ 513 op->randomitems = NULL; /* So another spell isn't created for this object */
517 } 514 }
515
518 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 516 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
519
520 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 517 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
521 { 518 {
522 object *tmp;
523
524 tmp = get_archetype_by_object_name (op->slaying); 519 object *tmp = get_archetype_by_object_name (op->slaying);
525 insert_ob_in_ob (tmp, op); 520 insert_ob_in_ob (tmp, op);
526 op->randomitems = NULL; /* So another spell isn't created for this object */ 521 op->randomitems = NULL; /* So another spell isn't created for this object */
527 /* without this, value is all screwed up */ 522 /* without this, value is all screwed up */
528 op->value = op->arch->clone.value * op->inv->value; 523 op->value = op->arch->clone.value * op->inv->value;
529 } 524 }
… …
565 { 560 {
566 op->move_type = MOVE_ALL; 561 op->move_type = MOVE_ALL;
567 op->stats.maxhp = 0; 562 op->stats.maxhp = 0;
568 } 563 }
569 else 564 else
570 {
571 op->move_type = MOVE_WALK; 565 op->move_type = MOVE_WALK;
572 }
573 } 566 }
574 } 567 }
575 568
576} 569}
577 570
… …
714 tmp = arch_to_object (arch); 707 tmp = arch_to_object (arch);
715 else 708 else
716 { 709 {
717 tmp = object::create (); 710 tmp = object::create ();
718 /* record the name of the broken object */ 711 /* record the name of the broken object */
712 //TODO: but do not log???
719 tmp->name = str; 713 tmp->name = str;
720 } 714 }
721 715
722 // decativate the object we, as we are still going 716 // decativate the object we, as we are still going
723 // to read the speed value. Objects should be activated 717 // to read the speed value. Objects should be activated
… …
781 op->other_arch = archetype::find (thawer.get_str ()); 775 op->other_arch = archetype::find (thawer.get_str ());
782 break; 776 break;
783 777
784 case KW_animation: 778 case KW_animation:
785 { 779 {
780 CLEAR_FLAG (op, FLAG_ANIMATE);
781 op->animation_id = 0;
782
786 const char *str = thawer.get_str (); 783 const char *str = thawer.get_str ();
787
788 if (!str)
789 {
790 op->animation_id = 0;
791 CLEAR_FLAG (op, FLAG_ANIMATE);
792 }
793 else if ((op->animation_id = find_animation (str))) 784 if (str && (op->animation_id = find_animation (str)))
794 SET_FLAG (op, FLAG_ANIMATE); 785 SET_FLAG (op, FLAG_ANIMATE);
795 } 786 }
796
797 break; 787 break;
798 788
799 case KW_last_heal: thawer.get (op->last_heal); break; 789 case KW_last_heal: thawer.get (op->last_heal); break;
800 case KW_last_sp: thawer.get (op->last_sp); break; 790 case KW_last_sp: thawer.get (op->last_sp); break;
801 case KW_last_grace: thawer.get (op->last_grace); break; 791 case KW_last_grace: thawer.get (op->last_grace); break;
… …
866 case KW_path_denied: thawer.get (op->path_denied); break; 856 case KW_path_denied: thawer.get (op->path_denied); break;
867 case KW_invisible: thawer.get (op->invisible); break; 857 case KW_invisible: thawer.get (op->invisible); break;
868 case KW_magic: thawer.get (op->magic); break; 858 case KW_magic: thawer.get (op->magic); break;
869 case KW_state: thawer.get (op->state); break; 859 case KW_state: thawer.get (op->state); break;
870 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 860 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
871 case KW_material: thawer.get (op->material); break; 861 case KW_material: thawer.get (op->materials); break; //TODO: nuke
872 case KW_materialname: thawer.get (op->materialname); break; 862 case KW_materialname: thawer.get (op->materialname); break;
873 863
874 /* These are the new values */ 864 /* These are the new values */
875 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 865 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
876 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 866 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
1138 add_button_link (op, op->map, thawer.get_sint32 ()); 1128 add_button_link (op, op->map, thawer.get_sint32 ());
1139 break; 1129 break;
1140 1130
1141 case KW_randomitems: 1131 case KW_randomitems:
1142 op->randomitems = find_treasurelist (thawer.get_str ()); 1132 op->randomitems = find_treasurelist (thawer.get_str ());
1133 //if (!op->randomitems)
1134 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
1143 break; 1135 break;
1144 1136
1145 case KW_msg: 1137 case KW_msg:
1146 thawer.get_ml (KW_endmsg, op->msg); 1138 thawer.get_ml (KW_endmsg, op->msg);
1147 //TODO: allow longer messages 1139 //TODO: allow longer messages
… …
1535 f.put (resist_save[i], op->resist[i]); 1527 f.put (resist_save[i], op->resist[i]);
1536 1528
1537 CMP_OUT (path_attuned); 1529 CMP_OUT (path_attuned);
1538 CMP_OUT (path_repelled); 1530 CMP_OUT (path_repelled);
1539 CMP_OUT (path_denied); 1531 CMP_OUT (path_denied);
1540 CMP_OUT (material); 1532 CMP_OUT2 (material, materials);//TODO: nuke
1541 CMP_OUT (materialname); 1533 CMP_OUT (materialname);
1542 CMP_OUT (value); 1534 CMP_OUT (value);
1543 CMP_OUT (carrying); 1535 CMP_OUT (carrying);
1544 CMP_OUT (weight); 1536 CMP_OUT (weight);
1545 CMP_OUT (invisible); 1537 CMP_OUT (invisible);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines