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.13 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.16 by root, Thu Sep 14 21:16:11 2006 UTC

… …
255 NULL 255 NULL
256}; 256};
257 257
258extern int arch_init; 258extern int arch_init;
259 259
260// return a suitable strign describign an objetc in enough detail to find it
261// used only in check_loaded_object: TODO remove static, move it elsewhere and
262// use it in more log messages.
263static char *
264op_debug_info_ (object *op, char *info)
265{
266 char info2[256 * 3];
267 char *p = info;
268
269 p += snprintf (p, 256, "%d=\"%s%s%s\"",
270 op->count, op->name ? (const char *) op->name : "(anon)", op->title ? " " : "", op->title ? (const char *) op->title : "");
271
272 if (op->env)
273 p += snprintf (p, 256, "(in %s)", op_debug_info_ (op->env, info2));
274
275 if (op->map)
276 p += snprintf (p, 256, "(on %s@%d+%d)", op->map->path, op->x, op->y);
277
278 return info;
279}
280
281static char *
282op_debug_info (object *op)
283{
284 static char info[256 * 3];
285
286 return op_debug_info_ (op, info);
287}
288
289/* This function checks the object after it has been loaded (when we 260/* This function checks the object after it has been loaded (when we
290 * get the 'end' in the input stream). This function can be used to 261 * get the 'end' in the input stream). This function can be used to
291 * deal with legacy objects where fields may have changed. It can also be used 262 * deal with legacy objects where fields may have changed. It can also be used
292 * to check for objects to make sure there are no common errors. 263 * to check for objects to make sure there are no common errors.
293 */ 264 */
… …
326 */ 297 */
327 if ((op->type == WEAPON || op->type == BOW) && arch_init) 298 if ((op->type == WEAPON || op->type == BOW) && arch_init)
328 { 299 {
329 if (!op->skill) 300 if (!op->skill)
330 { 301 {
331 LOG (llevError, "Weapon %s lacks a skill.\n", op_debug_info (op)); 302 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
332 } 303 }
333 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 304 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
334 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 305 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
335 { 306 {
336 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op_debug_info (op), op->body_info[1], &op->skill); 307 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
337 } 308 }
338 } 309 }
339 310
340 /* We changed last_heal to gen_sp_armour, which is what it 311 /* We changed last_heal to gen_sp_armour, which is what it
341 * really does for many objects. Need to catch any in maps 312 * really does for many objects. Need to catch any in maps
… …
347 (op->type == BOOTS) || (op->type == GLOVES) || 318 (op->type == BOOTS) || (op->type == GLOVES) ||
348 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 319 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
349 { 320 {
350 if (op->last_heal) 321 if (op->last_heal)
351 { 322 {
352 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op_debug_info (op)); 323 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
353 op->gen_sp_armour = op->last_heal; 324 op->gen_sp_armour = op->last_heal;
354 op->last_heal = 0; 325 op->last_heal = 0;
355 } 326 }
356 if (editor) 327 if (editor)
357 ip = 0; 328 ip = 0;
… …
360 /* Legacy objects from before item power was in the game */ 331 /* Legacy objects from before item power was in the game */
361 if (!op->item_power && ip) 332 if (!op->item_power && ip)
362 { 333 {
363 if (ip > 3) 334 if (ip > 3)
364 { 335 {
365 LOG (llevDebug, "Object %s had no item power, using %d\n", op_debug_info (op), ip); 336 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
366 } 337 }
367 op->item_power = ip; 338 op->item_power = ip;
368 } 339 }
369 /* Check for possibly bogus values. Has to meet both these criteria - 340 /* Check for possibly bogus values. Has to meet both these criteria -
370 * something that has item_power 1 is probably just fine if our calculated 341 * something that has item_power 1 is probably just fine if our calculated
… …
372 * similarly, it item_power is 0, the first check will always pass, 343 * similarly, it item_power is 0, the first check will always pass,
373 * but not the second one. 344 * but not the second one.
374 */ 345 */
375 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 346 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
376 { 347 {
377 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op_debug_info (op), ip, op->item_power); 348 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
378 } 349 }
379 350
380 } 351 }
381 /* Old spellcasting object - need to load in the appropiate object */ 352 /* Old spellcasting object - need to load in the appropiate object */
382 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 353 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
… …
406 } 377 }
407 378
408 if (QUERY_FLAG (op, FLAG_MONSTER)) 379 if (QUERY_FLAG (op, FLAG_MONSTER))
409 { 380 {
410 if (op->stats.hp > op->stats.maxhp) 381 if (op->stats.hp > op->stats.maxhp)
411 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op_debug_info (op), op->stats.hp, op->stats.maxhp); 382 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
412 383
413 /* The archs just need to be updated for this */ 384 /* The archs just need to be updated for this */
414 if (op->move_type == 0) 385 if (op->move_type == 0)
415 op->move_type = MOVE_WALK; 386 op->move_type = MOVE_WALK;
416 } 387 }
388
417 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 389 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
418 { 390 {
419 /* Object will duplicate it's content as part of the 391 /* Object will duplicate it's content as part of the
420 * generation process. To do this, we must flag inventory 392 * generation process. To do this, we must flag inventory
421 * so it remains unevaluated concerning the randomitems and 393 * so it remains unevaluated concerning the randomitems and
… …
528 { 500 {
529 keyword kw = thawer.get_kv (); 501 keyword kw = thawer.get_kv ();
530 502
531 switch (kw) 503 switch (kw)
532 { 504 {
533 case KW_Object: // uppercase alias 505 case KW_Object: // uppercase alias
534 case KW_object: 506 case KW_object:
535 thawer.get (op->name); 507 thawer.get (op->name);
536 508
537 if (op->arch != NULL) 509 if (op->arch != NULL)
538 op->arch->name = op->name; 510 op->arch->name = op->name;
539 511
540 break; 512 break;
541 513
542 case KW_oid: 514 case KW_uuid:
543 thawer.get (op, thawer.get_sint32 ()); 515 if (const char *s = thawer.get_str ())
544 break;
545
546 case KW_name:
547 thawer.get (op->name);
548 break;
549 case KW_name_pl:
550 thawer.get (op->name_pl);
551 break;
552 case KW_title:
553 thawer.get (op->title);
554 break;
555 case KW_custom_name:
556 thawer.get (op->custom_name);
557 break;
558 case KW_attach:
559 thawer.get_ornull (op->attach);
560 break;
561 case KW_skill:
562 thawer.get_ornull (op->skill);
563 break;
564 case KW_race:
565 thawer.get_ornull (op->race);
566 break;
567 case KW_slaying:
568 thawer.get_ornull (op->slaying);
569 break;
570
571 case KW_arch:
572 { 516 {
573 const char *str = thawer.get_str (); 517 unsigned int version;
518 unsigned long long seq;
574 519
575 if (op->arch) 520 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
576 { 521 {
577 /* If op->arch has been set, then this new object 522 op->uuid.seq = seq;
578 * must be part of the inventory. So process
579 * appropriately.
580 */
581 archetype *arch = find_archetype (str);
582
583 object *tmp;
584
585 if (arch != NULL)
586 tmp = arch_to_object (arch);
587 else 523 break;
588 {
589 tmp = get_object ();
590 /* record the name of the broken object */
591 tmp->name = str;
592 }
593
594 parse_object (tmp, thawer, map_flags);
595
596 if (tmp->arch)
597 {
598 // was: insert_ob_in_ob (tmp, op);
599 // but manually adding it can improve map loading times a lot
600 // also, appending instead of prepending keeps the
601 // save ordering the same between repeated load/saves.
602 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
603 CLEAR_FLAG (tmp, FLAG_REMOVED);
604
605 if (!op_inv)
606 {
607 op->inv = tmp;
608 tmp->above = 0;
609 }
610 else
611 {
612 while (op_inv->below)
613 op_inv = op_inv->below;
614
615 op_inv->below = tmp;
616 tmp->above = op_inv;
617 }
618
619 tmp->below = 0;
620 tmp->env = op;
621 op_inv = tmp;
622 }
623 else
624 {
625 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
626 free_object (tmp);
627 }
628 }
629 else
630 {
631 /* This is the actual archetype definition then */
632 op->arch = find_archetype (str);
633
634 if (op->arch != NULL)
635 copy_object (&op->arch->clone, op);
636 else if (!arch_init)
637 /* record the name of the broken object */
638 op->name = str;
639 } 524 }
640 } 525 }
526
527 op->uuid = gen_uuid ();
641 break; 528 break;
642 529
643 case KW_other_arch: 530 case KW_oid:
644 op->other_arch = find_archetype (thawer.get_str ()); 531 thawer.get (op, thawer.get_sint32 ());
645 break; 532 break;
646 533
647 case KW_animation: 534 case KW_name:
535 thawer.get (op->name);
536 break;
537 case KW_name_pl:
538 thawer.get (op->name_pl);
539 break;
540 case KW_title:
541 thawer.get (op->title);
542 break;
543 case KW_custom_name:
544 thawer.get (op->custom_name);
545 break;
546 case KW_attach:
547 thawer.get_ornull (op->attach);
548 break;
549 case KW_skill:
550 thawer.get_ornull (op->skill);
551 break;
552 case KW_race:
553 thawer.get_ornull (op->race);
554 break;
555 case KW_slaying:
556 thawer.get_ornull (op->slaying);
557 break;
558
559 case KW_arch:
648 { 560 {
649 const char *str = thawer.get_str (); 561 const char *str = thawer.get_str ();
650 562
651 if (!str) 563 if (op->arch)
652 {
653 op->animation_id = 0;
654 CLEAR_FLAG (op, FLAG_ANIMATE);
655 }
656 else
657 {
658 op->animation_id = find_animation (str);
659 SET_FLAG (op, FLAG_ANIMATE);
660 }
661 }
662
663 break;
664
665 case KW_last_heal:
666 thawer.get (op->last_heal);
667 break;
668 case KW_last_sp:
669 thawer.get (op->last_sp);
670 break;
671 case KW_last_grace:
672 thawer.get (op->last_grace);
673 break;
674 case KW_last_eat:
675 thawer.get (op->last_eat);
676 break;
677 case KW_speed_left:
678 thawer.get (op->speed_left);
679 break;
680
681 case KW_speed:
682 thawer.get (op->speed);
683
684 //TODO: maybe do in check_object
685 if (!(map_flags & MAP_STYLE))
686 { 564 {
687 if (op->speed < 0) 565 /* If op->arch has been set, then this new object
688 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 566 * must be part of the inventory. So process
689 567 * appropriately.
690 update_ob_speed (op);
691 } 568 */
569 archetype *arch = archetype::find (str);
692 570
693 break; 571 object *tmp;
694 572
695 case KW_slow_move: 573 if (arch != NULL)
696 op->move_slow |= MOVE_WALK; 574 tmp = arch_to_object (arch);
697 thawer.get (op->move_slow_penalty);
698 break;
699
700 case KW_face:
701 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
702 break;
703
704 case KW_x:
705 thawer.get (op->x);
706 break;
707 case KW_y:
708 thawer.get (op->y);
709 break;
710 case KW_Str: // uppercase alias
711 case KW_str:
712 thawer.get (op->stats.Str);
713 break;
714 case KW_Dex: // uppercase alias
715 case KW_dex:
716 thawer.get (op->stats.Dex);
717 break;
718 case KW_Con: // uppercase alias
719 case KW_con:
720 thawer.get (op->stats.Con);
721 break;
722 case KW_Wis: // uppercase alias
723 case KW_wis:
724 thawer.get (op->stats.Wis);
725 break;
726 case KW_Cha: // uppercase alias
727 case KW_cha:
728 thawer.get (op->stats.Cha);
729 break;
730 case KW_Int: // uppercase alias
731 case KW_int:
732 thawer.get (op->stats.Int);
733 break;
734 case KW_Pow: // uppercase alias
735 case KW_pow:
736 thawer.get (op->stats.Pow);
737 break;
738 case KW_hp:
739 thawer.get (op->stats.hp);
740 break;
741 case KW_maxhp:
742 thawer.get (op->stats.maxhp);
743 break;
744 case KW_sp:
745 thawer.get (op->stats.sp);
746 break;
747 case KW_maxsp:
748 thawer.get (op->stats.maxsp);
749 break;
750 case KW_grace:
751 thawer.get (op->stats.grace);
752 break;
753 case KW_maxgrace:
754 thawer.get (op->stats.maxgrace);
755 break;
756
757 case KW_exp:
758 thawer.get (op->stats.exp);
759 break;
760 case KW_perm_exp:
761 thawer.get (op->perm_exp);
762 break;
763 case KW_food:
764 thawer.get (op->stats.food);
765 break;
766 case KW_dam:
767 thawer.get (op->stats.dam);
768 break;
769 case KW_wc:
770 thawer.get (op->stats.wc);
771 break;
772 case KW_ac:
773 thawer.get (op->stats.ac);
774 break;
775 case KW_nrof:
776 thawer.get (op->nrof);
777 break;
778 case KW_level:
779 thawer.get (op->level);
780 break;
781 case KW_direction:
782 thawer.get (op->direction);
783 break;
784 case KW_type:
785 thawer.get (op->type);
786 break;
787 case KW_subtype:
788 thawer.get (op->subtype);
789 break;
790 case KW_value:
791 thawer.get (op->value);
792 break;
793 case KW_weight:
794 thawer.get (op->weight);
795 break;
796 case KW_carrying:
797 thawer.get (op->carrying);
798 break;
799 case KW_attacktype:
800 thawer.get (op->attacktype);
801 break;
802 case KW_path_attuned:
803 thawer.get (op->path_attuned);
804 break;
805 case KW_path_repelled:
806 thawer.get (op->path_repelled);
807 break;
808 case KW_path_denied:
809 thawer.get (op->path_denied);
810 break;
811 case KW_invisible:
812 thawer.get (op->invisible);
813 break;
814 case KW_magic:
815 thawer.get (op->magic);
816 break;
817 case KW_state:
818 thawer.get (op->state);
819 break;
820 case KW_move_slow_penalty:
821 thawer.get (op->move_slow_penalty);
822 break;
823 case KW_material:
824 thawer.get (op->material);
825 break;
826 case KW_materialname:
827 thawer.get (op->materialname);
828 break;
829
830 /* These are the new values */
831 case KW_move_block:
832 set_move (op->move_block, thawer.get_str ());
833 break;
834 case KW_move_allow:
835 set_move (op->move_allow, thawer.get_str ());
836 break;
837 case KW_move_type:
838 set_move (op->move_type, thawer.get_str ());
839 break;
840 case KW_move_on:
841 set_move (op->move_on, thawer.get_str ());
842 break;
843 case KW_move_off:
844 set_move (op->move_off, thawer.get_str ());
845 break;
846 case KW_move_slow:
847 set_move (op->move_slow, thawer.get_str ());
848 break;
849
850 /* These are all legacy - any new objects should use the move_ .. values */
851 case KW_no_pass:
852 {
853 if (thawer.get_sint32 ())
854 op->move_block = MOVE_ALL;
855 else 575 else
856 op->move_block = 0;
857 }
858
859 break;
860
861 /* These are all legacy - any new objects should use the move_ .. values */
862 case KW_walk_on:
863 { 576 {
864 if (thawer.get_sint32 ()) 577 tmp = get_object ();
865 op->move_on |= MOVE_WALK; 578 /* record the name of the broken object */
579 tmp->name = str;
580 }
581
582 parse_object (tmp, thawer, map_flags);
583
584 if (tmp->arch)
585 {
586 // was: insert_ob_in_ob (tmp, op);
587 // but manually adding it can improve map loading times a lot
588 // also, appending instead of prepending keeps the
589 // save ordering the same between repeated load/saves.
590 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
591 CLEAR_FLAG (tmp, FLAG_REMOVED);
592
593 if (!op_inv)
594 {
595 op->inv = tmp;
596 tmp->above = 0;
597 }
598 else
599 {
600 while (op_inv->below)
601 op_inv = op_inv->below;
602
603 op_inv->below = tmp;
604 tmp->above = op_inv;
605 }
606
607 tmp->below = 0;
608 tmp->env = op;
609 op_inv = tmp;
610 }
866 else 611 else
867 op->move_on &= ~MOVE_WALK;
868 }
869
870 break;
871
872 /* These are all legacy - any new objects should use the move_ .. values */
873 case KW_walk_off:
874 {
875 if (thawer.get_sint32 ())
876 op->move_off |= MOVE_WALK;
877 else
878 op->move_off &= ~MOVE_WALK;
879 }
880 break;
881
882 /* These are all legacy - any new objects should use the move_ .. values */
883 case KW_fly_on:
884 {
885 if (thawer.get_sint32 ())
886 op->move_on |= MOVE_FLY_LOW;
887 else
888 op->move_on &= ~MOVE_FLY_LOW;
889 }
890 break;
891
892 /* These are all legacy - any new objects should use the move_ .. values */
893 case KW_fly_off:
894 {
895 if (thawer.get_sint32 ())
896 op->move_off |= MOVE_FLY_LOW;
897 else
898 op->move_off &= ~MOVE_FLY_LOW;
899 }
900 break;
901
902 //TODO: remove these after convertign archetypes
903 case KW_can_use_wand:
904 GET_FLAG (op, FLAG_USE_RANGE);
905 break;
906
907 /* These are all legacy - any new objects should use the move_ .. values */
908 case KW_flying:
909 {
910 if (thawer.get_sint32 ())
911 op->move_type |= MOVE_FLY_LOW;
912 else
913 op->move_type &= ~MOVE_FLY_LOW;
914 }
915 break;
916
917
918 case KW_identified:
919 GET_FLAG (op, FLAG_IDENTIFIED);
920 //TODO: move to check_object or so
921 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
922 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
923
924 break;
925
926 case KW_wiz:
927 GET_FLAG (op, FLAG_WIZ);
928 //TODO: move to check_object
929 if (QUERY_FLAG (op, FLAG_WIZ))
930 { 612 {
931 SET_FLAG (op, FLAG_WAS_WIZ); 613 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
932 SET_FLAG (op, FLAG_WIZPASS); 614 free_object (tmp);
933 SET_FLAG (op, FLAG_WIZCAST); 615 }
934 } 616 }
935 else 617 else
936 { 618 {
937 CLEAR_FLAG (op, FLAG_WIZPASS); 619 /* This is the actual archetype definition then */
938 CLEAR_FLAG (op, FLAG_WIZCAST); 620 op->arch = archetype::find (str);
621
622 if (op->arch != NULL)
623 copy_object (&op->arch->clone, op);
624 else if (!arch_init)
625 /* record the name of the broken object */
626 op->name = str;
939 } 627 }
628 }
940 break; 629 break;
941 630
942 case KW_friendly: 631 case KW_other_arch:
943 GET_FLAG (op, FLAG_FRIENDLY); 632 op->other_arch = archetype::find (thawer.get_str ());
944 //TODO: move to check_object or so
945 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
946 add_friendly_object (op);
947 break; 633 break;
948 634
949 case KW_monster: 635 case KW_animation:
636 {
637 const char *str = thawer.get_str ();
638
639 if (!str)
640 {
641 op->animation_id = 0;
642 CLEAR_FLAG (op, FLAG_ANIMATE);
643 }
644 else
645 {
646 op->animation_id = find_animation (str);
950 GET_FLAG (op, FLAG_MONSTER); 647 SET_FLAG (op, FLAG_ANIMATE);
648 }
649 }
650
951 break; 651 break;
652
952 case KW_neutral: 653 case KW_last_heal:
953 GET_FLAG (op, FLAG_NEUTRAL); 654 thawer.get (op->last_heal);
954 break; 655 break;
955 case KW_no_attack: 656 case KW_last_sp:
956 GET_FLAG (op, FLAG_NO_ATTACK); 657 thawer.get (op->last_sp);
957 break; 658 break;
958 case KW_no_damage: 659 case KW_last_grace:
959 GET_FLAG (op, FLAG_NO_DAMAGE); 660 thawer.get (op->last_grace);
960 break; 661 break;
961 case KW_generator: 662 case KW_last_eat:
962 GET_FLAG (op, FLAG_GENERATOR); 663 thawer.get (op->last_eat);
963 break; 664 break;
964 case KW_use_content_on_gen: 665 case KW_speed_left:
965 GET_FLAG (op, FLAG_CONTENT_ON_GEN); 666 thawer.get (op->speed_left);
966 break; 667 break;
967 case KW_is_thrown: 668
968 GET_FLAG (op, FLAG_IS_THROWN);
969 break;
970 case KW_auto_apply:
971 GET_FLAG (op, FLAG_AUTO_APPLY);
972 break;
973 case KW_treasure:
974 GET_FLAG (op, FLAG_TREASURE);
975 break;
976 case KW_see_invisible:
977 GET_FLAG (op, FLAG_SEE_INVISIBLE);
978 break;
979 case KW_can_roll:
980 GET_FLAG (op, FLAG_CAN_ROLL);
981 break;
982 case KW_overlay_floor:
983 GET_FLAG (op, FLAG_OVERLAY_FLOOR);
984 break;
985 case KW_is_turnable:
986 GET_FLAG (op, FLAG_IS_TURNABLE);
987 break;
988 case KW_is_used_up:
989 GET_FLAG (op, FLAG_IS_USED_UP);
990 break;
991 case KW_alive:
992 GET_FLAG (op, FLAG_ALIVE);
993 break;
994 case KW_applied:
995 GET_FLAG (op, FLAG_APPLIED);
996 break;
997 case KW_unpaid:
998 GET_FLAG (op, FLAG_UNPAID);
999 break;
1000 case KW_is_animated:
1001 GET_FLAG (op, FLAG_ANIMATE);
1002 break;
1003 case KW_no_pick:
1004 GET_FLAG (op, FLAG_NO_PICK);
1005 break;
1006 case KW_reflecting:
1007 GET_FLAG (op, FLAG_REFLECTING);
1008 break;
1009 case KW_changing:
1010 GET_FLAG (op, FLAG_CHANGING);
1011 break;
1012 case KW_splitting:
1013 GET_FLAG (op, FLAG_SPLITTING);
1014 break;
1015 case KW_hitback:
1016 GET_FLAG (op, FLAG_HITBACK);
1017 break;
1018 case KW_startequip:
1019 GET_FLAG (op, FLAG_STARTEQUIP);
1020 break;
1021 case KW_blocksview:
1022 GET_FLAG (op, FLAG_BLOCKSVIEW);
1023 break;
1024 case KW_undead:
1025 GET_FLAG (op, FLAG_UNDEAD);
1026 break;
1027 case KW_scared:
1028 GET_FLAG (op, FLAG_SCARED);
1029 break;
1030 case KW_unaggressive:
1031 GET_FLAG (op, FLAG_UNAGGRESSIVE);
1032 break;
1033 case KW_reflect_missile:
1034 GET_FLAG (op, FLAG_REFL_MISSILE);
1035 break;
1036 case KW_reflect_spell:
1037 GET_FLAG (op, FLAG_REFL_SPELL);
1038 break;
1039 case KW_no_magic:
1040 GET_FLAG (op, FLAG_NO_MAGIC);
1041 break;
1042 case KW_no_drop:
1043 GET_FLAG (op, FLAG_NO_DROP);
1044 break;
1045 case KW_random_movement:
1046 GET_FLAG (op, FLAG_RANDOM_MOVE);
1047 break;
1048 case KW_was_wiz:
1049 GET_FLAG (op, FLAG_WAS_WIZ);
1050 break;
1051 case KW_no_fix_player:
1052 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1053 break;
1054 case KW_is_lightable:
1055 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1056 break;
1057 case KW_tear_down:
1058 GET_FLAG (op, FLAG_TEAR_DOWN);
1059 break;
1060 case KW_can_use_shield:
1061 GET_FLAG (op, FLAG_USE_SHIELD);
1062 break;
1063 case KW_can_cast_spell:
1064 GET_FLAG (op, FLAG_CAST_SPELL);
1065 break;
1066 case KW_can_use_scroll:
1067 GET_FLAG (op, FLAG_USE_SCROLL);
1068 break;
1069 case KW_can_use_range:
1070 GET_FLAG (op, FLAG_USE_RANGE);
1071 break;
1072 case KW_can_use_bow:
1073 GET_FLAG (op, FLAG_USE_BOW);
1074 break;
1075 case KW_can_use_armour:
1076 GET_FLAG (op, FLAG_USE_ARMOUR);
1077 break;
1078 case KW_can_use_weapon:
1079 GET_FLAG (op, FLAG_USE_WEAPON);
1080 break;
1081 case KW_can_use_ring:
1082 GET_FLAG (op, FLAG_USE_RING);
1083 break;
1084 case KW_has_ready_bow:
1085 GET_FLAG (op, FLAG_READY_BOW);
1086 break;
1087 case KW_xrays:
1088 GET_FLAG (op, FLAG_XRAYS);
1089 break;
1090 case KW_is_floor:
1091 GET_FLAG (op, FLAG_IS_FLOOR);
1092 break;
1093 case KW_lifesave:
1094 GET_FLAG (op, FLAG_LIFESAVE);
1095 break;
1096 case KW_no_strength:
1097 GET_FLAG (op, FLAG_NO_STRENGTH);
1098 break;
1099 case KW_sleep: 669 case KW_speed:
1100 GET_FLAG (op, FLAG_SLEEP);
1101 break;
1102 case KW_stand_still:
1103 GET_FLAG (op, FLAG_STAND_STILL);
1104 break;
1105 case KW_random_move:
1106 GET_FLAG (op, FLAG_RANDOM_MOVE);
1107 break;
1108 case KW_only_attack:
1109 GET_FLAG (op, FLAG_ONLY_ATTACK);
1110 break;
1111 case KW_activate_on_push:
1112 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1113 break;
1114 case KW_activate_on_release:
1115 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1116 break;
1117 case KW_confused:
1118 GET_FLAG (op, FLAG_CONFUSED);
1119 break;
1120 case KW_stealth:
1121 GET_FLAG (op, FLAG_STEALTH);
1122 break;
1123 case KW_cursed:
1124 GET_FLAG (op, FLAG_CURSED);
1125 break;
1126 case KW_damned:
1127 GET_FLAG (op, FLAG_DAMNED);
1128 break;
1129 case KW_see_anywhere:
1130 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1131 break;
1132 case KW_known_magical:
1133 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1134 break;
1135 case KW_known_cursed:
1136 GET_FLAG (op, FLAG_KNOWN_CURSED);
1137 break;
1138 case KW_can_use_skill:
1139 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1140 break;
1141 case KW_been_applied:
1142 GET_FLAG (op, FLAG_BEEN_APPLIED);
1143 break;
1144 case KW_has_ready_scroll:
1145 GET_FLAG (op, FLAG_READY_SCROLL);
1146 break;
1147 case KW_can_use_rod:
1148 GET_FLAG (op, FLAG_USE_ROD);
1149 break;
1150 case KW_can_use_horn:
1151 GET_FLAG (op, FLAG_USE_HORN);
1152 break;
1153 case KW_unique:
1154 GET_FLAG (op, FLAG_UNIQUE);
1155 break;
1156 case KW_make_invisible:
1157 GET_FLAG (op, FLAG_MAKE_INVIS);
1158 break;
1159 case KW_inv_locked:
1160 GET_FLAG (op, FLAG_INV_LOCKED);
1161 break;
1162 case KW_is_wooded:
1163 GET_FLAG (op, FLAG_IS_WOODED);
1164 break;
1165 case KW_is_hilly:
1166 GET_FLAG (op, FLAG_IS_HILLY);
1167 break;
1168 case KW_is_water:
1169 GET_FLAG (op, FLAG_IS_WATER);
1170 break;
1171 case KW_has_ready_skill:
1172 GET_FLAG (op, FLAG_READY_SKILL);
1173 break;
1174 case KW_has_ready_weapon:
1175 GET_FLAG (op, FLAG_READY_WEAPON);
1176 break;
1177 case KW_no_skill_ident:
1178 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1179 break;
1180 case KW_is_blind:
1181 GET_FLAG (op, FLAG_BLIND);
1182 break;
1183 case KW_can_see_in_dark:
1184 GET_FLAG (op, FLAG_SEE_IN_DARK);
1185 break;
1186 case KW_is_cauldron:
1187 GET_FLAG (op, FLAG_IS_CAULDRON);
1188 break;
1189 case KW_no_steal:
1190 GET_FLAG (op, FLAG_NO_STEAL);
1191 break;
1192 case KW_one_hit:
1193 GET_FLAG (op, FLAG_ONE_HIT);
1194 break;
1195 case KW_berserk:
1196 GET_FLAG (op, FLAG_BERSERK);
1197 break;
1198 case KW_is_buildable:
1199 GET_FLAG (op, FLAG_IS_BUILDABLE);
1200 break;
1201
1202 case KW_armour:
1203 thawer.get (op->resist[ATNR_PHYSICAL]);
1204 break;
1205 case KW_resist_physical:
1206 thawer.get (op->resist[ATNR_PHYSICAL]);
1207 break;
1208 case KW_resist_magic:
1209 thawer.get (op->resist[ATNR_MAGIC]);
1210 break;
1211 case KW_resist_fire:
1212 thawer.get (op->resist[ATNR_FIRE]);
1213 break;
1214 case KW_resist_electricity:
1215 thawer.get (op->resist[ATNR_ELECTRICITY]);
1216 break;
1217 case KW_resist_cold:
1218 thawer.get (op->resist[ATNR_COLD]);
1219 break;
1220 case KW_resist_confusion:
1221 thawer.get (op->resist[ATNR_CONFUSION]);
1222 break;
1223 case KW_resist_acid:
1224 thawer.get (op->resist[ATNR_ACID]);
1225 break;
1226 case KW_resist_drain:
1227 thawer.get (op->resist[ATNR_DRAIN]);
1228 break;
1229 case KW_resist_weaponmagic:
1230 thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1231 break;
1232 case KW_resist_ghosthit:
1233 thawer.get (op->resist[ATNR_GHOSTHIT]);
1234 break;
1235 case KW_resist_poison:
1236 thawer.get (op->resist[ATNR_POISON]);
1237 break;
1238 case KW_resist_slow:
1239 thawer.get (op->resist[ATNR_SLOW]);
1240 break;
1241 case KW_resist_paralyze:
1242 thawer.get (op->resist[ATNR_PARALYZE]);
1243 break;
1244 case KW_resist_turn_undead:
1245 thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1246 break;
1247 case KW_resist_fear:
1248 thawer.get (op->resist[ATNR_FEAR]);
1249 break;
1250 case KW_resist_cancellation:
1251 thawer.get (op->resist[ATNR_CANCELLATION]);
1252 break;
1253 case KW_resist_deplete:
1254 thawer.get (op->resist[ATNR_DEPLETE]);
1255 break;
1256 case KW_resist_death:
1257 thawer.get (op->resist[ATNR_DEATH]);
1258 break;
1259 case KW_resist_chaos:
1260 thawer.get (op->resist[ATNR_CHAOS]);
1261 break;
1262 case KW_resist_counterspell:
1263 thawer.get (op->resist[ATNR_COUNTERSPELL]);
1264 break;
1265 case KW_resist_godpower:
1266 thawer.get (op->resist[ATNR_GODPOWER]);
1267 break;
1268 case KW_resist_holyword:
1269 thawer.get (op->resist[ATNR_HOLYWORD]);
1270 break;
1271 case KW_resist_blind:
1272 thawer.get (op->resist[ATNR_BLIND]);
1273 break;
1274 case KW_resist_internal:
1275 thawer.get (op->resist[ATNR_INTERNAL]);
1276 break;
1277 case KW_resist_life_stealing:
1278 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1279 break;
1280 case KW_resist_disease:
1281 thawer.get (op->resist[ATNR_DISEASE]);
1282 break;
1283
1284 case KW_luck:
1285 thawer.get (op->stats.luck);
1286 break;
1287 case KW_run_away:
1288 thawer.get (op->run_away);
1289 break;
1290 case KW_pick_up:
1291 thawer.get (op->pick_up);
1292 break;
1293 case KW_item_power:
1294 thawer.get (op->item_power);
1295 break;
1296 case KW_gen_sp_armour:
1297 thawer.get (op->gen_sp_armour);
1298 break;
1299 case KW_anim_speed:
1300 thawer.get (op->anim_speed); 670 thawer.get (op->speed);
1301 break;
1302 case KW_container:
1303 thawer.get (op->weight_limit);
1304 break;
1305 case KW_will_apply:
1306 thawer.get (op->will_apply);
1307 break;
1308 case KW_attack_movement:
1309 thawer.get (op->attack_movement);
1310 break;
1311 case KW_move_state:
1312 thawer.get (op->move_status);
1313 break;
1314 case KW_expmul:
1315 thawer.get (op->expmul);
1316 break;
1317 case KW_glow_radius:
1318 thawer.get (op->glow_radius);
1319 break;
1320 case KW_weapontype:
1321 thawer.get (op->weapontype);
1322 break;
1323 case KW_tooltype:
1324 thawer.get (op->tooltype);
1325 break;
1326 case KW_casting_time:
1327 thawer.get (op->casting_time);
1328 break;
1329 case KW_elevation:
1330 thawer.get (op->elevation);
1331 break;
1332 case KW_smoothlevel:
1333 thawer.get (op->smoothlevel);
1334 break;
1335 case KW_client_type:
1336 thawer.get (op->client_type);
1337 break;
1338 case KW_duration:
1339 thawer.get (op->duration);
1340 break;
1341 case KW_range:
1342 thawer.get (op->range);
1343 break;
1344 case KW_range_modifier:
1345 thawer.get (op->range_modifier);
1346 break;
1347 case KW_dam_modifier:
1348 thawer.get (op->dam_modifier);
1349 break;
1350 case KW_duration_modifier:
1351 thawer.get (op->duration_modifier);
1352 break;
1353 671
1354 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 672 //TODO: maybe do in check_object
1355 //TODO: parse from other include files 673 if (!(map_flags & MAP_STYLE))
1356 case KW_body_range:
1357 thawer.get (op->body_info[0]);
1358 break;
1359 case KW_body_arm:
1360 thawer.get (op->body_info[1]);
1361 break;
1362 case KW_body_torso:
1363 thawer.get (op->body_info[2]);
1364 break;
1365 case KW_body_head:
1366 thawer.get (op->body_info[3]);
1367 break;
1368 case KW_body_neck:
1369 thawer.get (op->body_info[4]);
1370 break;
1371 case KW_body_skill:
1372 thawer.get (op->body_info[5]);
1373 break;
1374 case KW_body_finger:
1375 thawer.get (op->body_info[6]);
1376 break;
1377 case KW_body_shoulder:
1378 thawer.get (op->body_info[7]);
1379 break;
1380 case KW_body_foot:
1381 thawer.get (op->body_info[8]);
1382 break;
1383 case KW_body_hand:
1384 thawer.get (op->body_info[9]);
1385 break;
1386 case KW_body_wrist:
1387 thawer.get (op->body_info[10]);
1388 break;
1389 case KW_body_waist:
1390 thawer.get (op->body_info[11]);
1391 break;
1392 case KW_can_apply:
1393 break;
1394
1395 case KW_connected:
1396 add_button_link (op, op->map, thawer.get_sint32 ());
1397 break;
1398
1399 case KW_randomitems:
1400 op->randomitems = find_treasurelist (thawer.get_str ());
1401 break;
1402
1403 case KW_msg:
1404 { 674 {
1405 thawer.get_ml (KW_endmsg, op->msg); 675 if (op->speed < 0)
1406 //TODO: allow longer messages 676 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
1407 if (strlen (op->msg) >= HUGE_BUF) 677
1408 { 678 update_ob_speed (op);
1409 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1410 op->msg = "ERROR, please report: string too long, winged.\n";
1411 }
1412 } 679 }
680
1413 break; 681 break;
1414 682
683 case KW_slow_move:
684 op->move_slow |= MOVE_WALK;
685 thawer.get (op->move_slow_penalty);
686 break;
687
688 case KW_face:
689 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
690 break;
691
692 case KW_x:
693 thawer.get (op->x);
694 break;
695 case KW_y:
696 thawer.get (op->y);
697 break;
698 case KW_Str: // uppercase alias
699 case KW_str:
700 thawer.get (op->stats.Str);
701 break;
702 case KW_Dex: // uppercase alias
703 case KW_dex:
704 thawer.get (op->stats.Dex);
705 break;
706 case KW_Con: // uppercase alias
707 case KW_con:
708 thawer.get (op->stats.Con);
709 break;
710 case KW_Wis: // uppercase alias
711 case KW_wis:
712 thawer.get (op->stats.Wis);
713 break;
714 case KW_Cha: // uppercase alias
715 case KW_cha:
716 thawer.get (op->stats.Cha);
717 break;
718 case KW_Int: // uppercase alias
719 case KW_int:
720 thawer.get (op->stats.Int);
721 break;
722 case KW_Pow: // uppercase alias
723 case KW_pow:
724 thawer.get (op->stats.Pow);
725 break;
726 case KW_hp:
727 thawer.get (op->stats.hp);
728 break;
729 case KW_maxhp:
730 thawer.get (op->stats.maxhp);
731 break;
732 case KW_sp:
733 thawer.get (op->stats.sp);
734 break;
735 case KW_maxsp:
736 thawer.get (op->stats.maxsp);
737 break;
1415 case KW_lore: 738 case KW_grace:
739 thawer.get (op->stats.grace);
740 break;
741 case KW_maxgrace:
742 thawer.get (op->stats.maxgrace);
743 break;
744
745 case KW_exp:
746 thawer.get (op->stats.exp);
747 break;
748 case KW_perm_exp:
749 thawer.get (op->perm_exp);
750 break;
751 case KW_food:
752 thawer.get (op->stats.food);
753 break;
754 case KW_dam:
755 thawer.get (op->stats.dam);
756 break;
757 case KW_wc:
758 thawer.get (op->stats.wc);
759 break;
760 case KW_ac:
761 thawer.get (op->stats.ac);
762 break;
763 case KW_nrof:
764 thawer.get (op->nrof);
765 break;
766 case KW_level:
767 thawer.get (op->level);
768 break;
769 case KW_direction:
770 thawer.get (op->direction);
771 break;
772 case KW_type:
773 thawer.get (op->type);
774 break;
775 case KW_subtype:
776 thawer.get (op->subtype);
777 break;
778 case KW_value:
779 thawer.get (op->value);
780 break;
781 case KW_weight:
782 thawer.get (op->weight);
783 break;
784 case KW_carrying:
785 thawer.get (op->carrying);
786 break;
787 case KW_attacktype:
788 thawer.get (op->attacktype);
789 break;
790 case KW_path_attuned:
791 thawer.get (op->path_attuned);
792 break;
793 case KW_path_repelled:
794 thawer.get (op->path_repelled);
795 break;
796 case KW_path_denied:
797 thawer.get (op->path_denied);
798 break;
799 case KW_invisible:
800 thawer.get (op->invisible);
801 break;
802 case KW_magic:
803 thawer.get (op->magic);
804 break;
805 case KW_state:
806 thawer.get (op->state);
807 break;
808 case KW_move_slow_penalty:
809 thawer.get (op->move_slow_penalty);
810 break;
811 case KW_material:
812 thawer.get (op->material);
813 break;
814 case KW_materialname:
815 thawer.get (op->materialname);
816 break;
817
818 /* These are the new values */
819 case KW_move_block:
820 set_move (op->move_block, thawer.get_str ());
821 break;
822 case KW_move_allow:
823 set_move (op->move_allow, thawer.get_str ());
824 break;
825 case KW_move_type:
826 set_move (op->move_type, thawer.get_str ());
827 break;
828 case KW_move_on:
829 set_move (op->move_on, thawer.get_str ());
830 break;
831 case KW_move_off:
832 set_move (op->move_off, thawer.get_str ());
833 break;
834 case KW_move_slow:
835 set_move (op->move_slow, thawer.get_str ());
836 break;
837
838 /* These are all legacy - any new objects should use the move_ .. values */
839 case KW_no_pass:
840 {
841 if (thawer.get_sint32 ())
842 op->move_block = MOVE_ALL;
843 else
844 op->move_block = 0;
845 }
846
847 break;
848
849 /* These are all legacy - any new objects should use the move_ .. values */
850 case KW_walk_on:
851 {
852 if (thawer.get_sint32 ())
853 op->move_on |= MOVE_WALK;
854 else
855 op->move_on &= ~MOVE_WALK;
856 }
857
858 break;
859
860 /* These are all legacy - any new objects should use the move_ .. values */
861 case KW_walk_off:
862 {
863 if (thawer.get_sint32 ())
864 op->move_off |= MOVE_WALK;
865 else
866 op->move_off &= ~MOVE_WALK;
867 }
868 break;
869
870 /* These are all legacy - any new objects should use the move_ .. values */
871 case KW_fly_on:
872 {
873 if (thawer.get_sint32 ())
874 op->move_on |= MOVE_FLY_LOW;
875 else
876 op->move_on &= ~MOVE_FLY_LOW;
877 }
878 break;
879
880 /* These are all legacy - any new objects should use the move_ .. values */
881 case KW_fly_off:
882 {
883 if (thawer.get_sint32 ())
884 op->move_off |= MOVE_FLY_LOW;
885 else
886 op->move_off &= ~MOVE_FLY_LOW;
887 }
888 break;
889
890 //TODO: remove these after convertign archetypes
891 case KW_can_use_wand:
892 GET_FLAG (op, FLAG_USE_RANGE);
893 break;
894
895 /* These are all legacy - any new objects should use the move_ .. values */
896 case KW_flying:
897 {
898 if (thawer.get_sint32 ())
899 op->move_type |= MOVE_FLY_LOW;
900 else
901 op->move_type &= ~MOVE_FLY_LOW;
902 }
903 break;
904
905
906 case KW_identified:
907 GET_FLAG (op, FLAG_IDENTIFIED);
908 //TODO: move to check_object or so
909 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
910 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
911
912 break;
913
914 case KW_wiz:
915 GET_FLAG (op, FLAG_WIZ);
916 //TODO: move to check_object
917 if (QUERY_FLAG (op, FLAG_WIZ))
1416 { 918 {
1417 shstr msgbuf; 919 SET_FLAG (op, FLAG_WAS_WIZ);
1418 920 SET_FLAG (op, FLAG_WIZPASS);
1419 thawer.get_ml (KW_endlore, op->lore); 921 SET_FLAG (op, FLAG_WIZCAST);
1420 //TODO: allow longer messages
1421 /* Just print a warning so we can be reasonably safe
1422 * about not overflowing the buffer.
1423 */
1424 if (strlen (op->lore) > (HUGE_BUF / 2))
1425 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1426 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1427 } 922 }
923 else
924 {
925 CLEAR_FLAG (op, FLAG_WIZPASS);
926 CLEAR_FLAG (op, FLAG_WIZCAST);
927 }
1428 break; 928 break;
1429 929
1430 case KW_editable: 930 case KW_friendly:
1431 case KW_editor_folder: 931 GET_FLAG (op, FLAG_FRIENDLY);
932 //TODO: move to check_object or so
933 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
934 add_friendly_object (op);
1432 break; 935 break;
1433 936
1434 case KW_More: // uppercase alias 937 case KW_monster:
938 GET_FLAG (op, FLAG_MONSTER);
939 break;
940 case KW_neutral:
941 GET_FLAG (op, FLAG_NEUTRAL);
942 break;
943 case KW_no_attack:
944 GET_FLAG (op, FLAG_NO_ATTACK);
945 break;
946 case KW_no_damage:
947 GET_FLAG (op, FLAG_NO_DAMAGE);
948 break;
949 case KW_generator:
950 GET_FLAG (op, FLAG_GENERATOR);
951 break;
952 case KW_use_content_on_gen:
953 GET_FLAG (op, FLAG_CONTENT_ON_GEN);
954 break;
955 case KW_is_thrown:
956 GET_FLAG (op, FLAG_IS_THROWN);
957 break;
958 case KW_auto_apply:
959 GET_FLAG (op, FLAG_AUTO_APPLY);
960 break;
961 case KW_treasure:
962 GET_FLAG (op, FLAG_TREASURE);
963 break;
964 case KW_see_invisible:
965 GET_FLAG (op, FLAG_SEE_INVISIBLE);
966 break;
967 case KW_can_roll:
968 GET_FLAG (op, FLAG_CAN_ROLL);
969 break;
970 case KW_overlay_floor:
971 GET_FLAG (op, FLAG_OVERLAY_FLOOR);
972 break;
973 case KW_is_turnable:
974 GET_FLAG (op, FLAG_IS_TURNABLE);
975 break;
976 case KW_is_used_up:
977 GET_FLAG (op, FLAG_IS_USED_UP);
978 break;
979 case KW_alive:
980 GET_FLAG (op, FLAG_ALIVE);
981 break;
982 case KW_applied:
983 GET_FLAG (op, FLAG_APPLIED);
984 break;
985 case KW_unpaid:
986 GET_FLAG (op, FLAG_UNPAID);
987 break;
988 case KW_is_animated:
989 GET_FLAG (op, FLAG_ANIMATE);
990 break;
991 case KW_no_pick:
992 GET_FLAG (op, FLAG_NO_PICK);
993 break;
994 case KW_reflecting:
995 GET_FLAG (op, FLAG_REFLECTING);
996 break;
997 case KW_changing:
998 GET_FLAG (op, FLAG_CHANGING);
999 break;
1000 case KW_splitting:
1001 GET_FLAG (op, FLAG_SPLITTING);
1002 break;
1003 case KW_hitback:
1004 GET_FLAG (op, FLAG_HITBACK);
1005 break;
1006 case KW_startequip:
1007 GET_FLAG (op, FLAG_STARTEQUIP);
1008 break;
1009 case KW_blocksview:
1010 GET_FLAG (op, FLAG_BLOCKSVIEW);
1011 break;
1012 case KW_undead:
1013 GET_FLAG (op, FLAG_UNDEAD);
1014 break;
1015 case KW_scared:
1016 GET_FLAG (op, FLAG_SCARED);
1017 break;
1018 case KW_unaggressive:
1019 GET_FLAG (op, FLAG_UNAGGRESSIVE);
1020 break;
1021 case KW_reflect_missile:
1022 GET_FLAG (op, FLAG_REFL_MISSILE);
1023 break;
1024 case KW_reflect_spell:
1025 GET_FLAG (op, FLAG_REFL_SPELL);
1026 break;
1027 case KW_no_magic:
1028 GET_FLAG (op, FLAG_NO_MAGIC);
1029 break;
1030 case KW_no_drop:
1031 GET_FLAG (op, FLAG_NO_DROP);
1032 break;
1033 case KW_random_movement:
1034 GET_FLAG (op, FLAG_RANDOM_MOVE);
1035 break;
1036 case KW_was_wiz:
1037 GET_FLAG (op, FLAG_WAS_WIZ);
1038 break;
1039 case KW_no_fix_player:
1040 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1041 break;
1042 case KW_is_lightable:
1043 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1044 break;
1045 case KW_tear_down:
1046 GET_FLAG (op, FLAG_TEAR_DOWN);
1047 break;
1048 case KW_can_use_shield:
1049 GET_FLAG (op, FLAG_USE_SHIELD);
1050 break;
1051 case KW_can_cast_spell:
1052 GET_FLAG (op, FLAG_CAST_SPELL);
1053 break;
1054 case KW_can_use_scroll:
1055 GET_FLAG (op, FLAG_USE_SCROLL);
1056 break;
1057 case KW_can_use_range:
1058 GET_FLAG (op, FLAG_USE_RANGE);
1059 break;
1060 case KW_can_use_bow:
1061 GET_FLAG (op, FLAG_USE_BOW);
1062 break;
1063 case KW_can_use_armour:
1064 GET_FLAG (op, FLAG_USE_ARMOUR);
1065 break;
1066 case KW_can_use_weapon:
1067 GET_FLAG (op, FLAG_USE_WEAPON);
1068 break;
1069 case KW_can_use_ring:
1070 GET_FLAG (op, FLAG_USE_RING);
1071 break;
1072 case KW_has_ready_bow:
1073 GET_FLAG (op, FLAG_READY_BOW);
1074 break;
1075 case KW_xrays:
1076 GET_FLAG (op, FLAG_XRAYS);
1077 break;
1078 case KW_is_floor:
1079 GET_FLAG (op, FLAG_IS_FLOOR);
1080 break;
1081 case KW_lifesave:
1082 GET_FLAG (op, FLAG_LIFESAVE);
1083 break;
1084 case KW_no_strength:
1085 GET_FLAG (op, FLAG_NO_STRENGTH);
1086 break;
1087 case KW_sleep:
1088 GET_FLAG (op, FLAG_SLEEP);
1089 break;
1090 case KW_stand_still:
1091 GET_FLAG (op, FLAG_STAND_STILL);
1092 break;
1093 case KW_random_move:
1094 GET_FLAG (op, FLAG_RANDOM_MOVE);
1095 break;
1096 case KW_only_attack:
1097 GET_FLAG (op, FLAG_ONLY_ATTACK);
1098 break;
1099 case KW_activate_on_push:
1100 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1101 break;
1102 case KW_activate_on_release:
1103 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1104 break;
1105 case KW_confused:
1106 GET_FLAG (op, FLAG_CONFUSED);
1107 break;
1108 case KW_stealth:
1109 GET_FLAG (op, FLAG_STEALTH);
1110 break;
1111 case KW_cursed:
1112 GET_FLAG (op, FLAG_CURSED);
1113 break;
1114 case KW_damned:
1115 GET_FLAG (op, FLAG_DAMNED);
1116 break;
1117 case KW_see_anywhere:
1118 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1119 break;
1120 case KW_known_magical:
1121 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1122 break;
1123 case KW_known_cursed:
1124 GET_FLAG (op, FLAG_KNOWN_CURSED);
1125 break;
1126 case KW_can_use_skill:
1127 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1128 break;
1129 case KW_been_applied:
1130 GET_FLAG (op, FLAG_BEEN_APPLIED);
1131 break;
1132 case KW_has_ready_scroll:
1133 GET_FLAG (op, FLAG_READY_SCROLL);
1134 break;
1135 case KW_can_use_rod:
1136 GET_FLAG (op, FLAG_USE_ROD);
1137 break;
1138 case KW_can_use_horn:
1139 GET_FLAG (op, FLAG_USE_HORN);
1140 break;
1141 case KW_unique:
1142 GET_FLAG (op, FLAG_UNIQUE);
1143 break;
1144 case KW_make_invisible:
1145 GET_FLAG (op, FLAG_MAKE_INVIS);
1146 break;
1147 case KW_inv_locked:
1148 GET_FLAG (op, FLAG_INV_LOCKED);
1149 break;
1150 case KW_is_wooded:
1151 GET_FLAG (op, FLAG_IS_WOODED);
1152 break;
1153 case KW_is_hilly:
1154 GET_FLAG (op, FLAG_IS_HILLY);
1155 break;
1156 case KW_is_water:
1157 GET_FLAG (op, FLAG_IS_WATER);
1158 break;
1159 case KW_has_ready_skill:
1160 GET_FLAG (op, FLAG_READY_SKILL);
1161 break;
1162 case KW_has_ready_weapon:
1163 GET_FLAG (op, FLAG_READY_WEAPON);
1164 break;
1165 case KW_no_skill_ident:
1166 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1167 break;
1168 case KW_is_blind:
1169 GET_FLAG (op, FLAG_BLIND);
1170 break;
1171 case KW_can_see_in_dark:
1172 GET_FLAG (op, FLAG_SEE_IN_DARK);
1173 break;
1174 case KW_is_cauldron:
1175 GET_FLAG (op, FLAG_IS_CAULDRON);
1176 break;
1177 case KW_no_steal:
1178 GET_FLAG (op, FLAG_NO_STEAL);
1179 break;
1180 case KW_one_hit:
1181 GET_FLAG (op, FLAG_ONE_HIT);
1182 break;
1183 case KW_berserk:
1184 GET_FLAG (op, FLAG_BERSERK);
1185 break;
1186 case KW_is_buildable:
1187 GET_FLAG (op, FLAG_IS_BUILDABLE);
1188 break;
1189
1190 case KW_armour:
1191 thawer.get (op->resist[ATNR_PHYSICAL]);
1192 break;
1193 case KW_resist_physical:
1194 thawer.get (op->resist[ATNR_PHYSICAL]);
1195 break;
1196 case KW_resist_magic:
1197 thawer.get (op->resist[ATNR_MAGIC]);
1198 break;
1199 case KW_resist_fire:
1200 thawer.get (op->resist[ATNR_FIRE]);
1201 break;
1202 case KW_resist_electricity:
1203 thawer.get (op->resist[ATNR_ELECTRICITY]);
1204 break;
1205 case KW_resist_cold:
1206 thawer.get (op->resist[ATNR_COLD]);
1207 break;
1208 case KW_resist_confusion:
1209 thawer.get (op->resist[ATNR_CONFUSION]);
1210 break;
1211 case KW_resist_acid:
1212 thawer.get (op->resist[ATNR_ACID]);
1213 break;
1214 case KW_resist_drain:
1215 thawer.get (op->resist[ATNR_DRAIN]);
1216 break;
1217 case KW_resist_weaponmagic:
1218 thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1219 break;
1220 case KW_resist_ghosthit:
1221 thawer.get (op->resist[ATNR_GHOSTHIT]);
1222 break;
1223 case KW_resist_poison:
1224 thawer.get (op->resist[ATNR_POISON]);
1225 break;
1226 case KW_resist_slow:
1227 thawer.get (op->resist[ATNR_SLOW]);
1228 break;
1229 case KW_resist_paralyze:
1230 thawer.get (op->resist[ATNR_PARALYZE]);
1231 break;
1232 case KW_resist_turn_undead:
1233 thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1234 break;
1235 case KW_resist_fear:
1236 thawer.get (op->resist[ATNR_FEAR]);
1237 break;
1238 case KW_resist_cancellation:
1239 thawer.get (op->resist[ATNR_CANCELLATION]);
1240 break;
1241 case KW_resist_deplete:
1242 thawer.get (op->resist[ATNR_DEPLETE]);
1243 break;
1244 case KW_resist_death:
1245 thawer.get (op->resist[ATNR_DEATH]);
1246 break;
1247 case KW_resist_chaos:
1248 thawer.get (op->resist[ATNR_CHAOS]);
1249 break;
1250 case KW_resist_counterspell:
1251 thawer.get (op->resist[ATNR_COUNTERSPELL]);
1252 break;
1253 case KW_resist_godpower:
1254 thawer.get (op->resist[ATNR_GODPOWER]);
1255 break;
1256 case KW_resist_holyword:
1257 thawer.get (op->resist[ATNR_HOLYWORD]);
1258 break;
1259 case KW_resist_blind:
1260 thawer.get (op->resist[ATNR_BLIND]);
1261 break;
1262 case KW_resist_internal:
1263 thawer.get (op->resist[ATNR_INTERNAL]);
1264 break;
1265 case KW_resist_life_stealing:
1266 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1267 break;
1268 case KW_resist_disease:
1269 thawer.get (op->resist[ATNR_DISEASE]);
1270 break;
1271
1272 case KW_luck:
1273 thawer.get (op->stats.luck);
1274 break;
1275 case KW_run_away:
1276 thawer.get (op->run_away);
1277 break;
1278 case KW_pick_up:
1279 thawer.get (op->pick_up);
1280 break;
1281 case KW_item_power:
1282 thawer.get (op->item_power);
1283 break;
1284 case KW_gen_sp_armour:
1285 thawer.get (op->gen_sp_armour);
1286 break;
1287 case KW_anim_speed:
1288 thawer.get (op->anim_speed);
1289 break;
1290 case KW_container:
1291 thawer.get (op->weight_limit);
1292 break;
1293 case KW_will_apply:
1294 thawer.get (op->will_apply);
1295 break;
1296 case KW_attack_movement:
1297 thawer.get (op->attack_movement);
1298 break;
1299 case KW_move_state:
1300 thawer.get (op->move_status);
1301 break;
1302 case KW_expmul:
1303 thawer.get (op->expmul);
1304 break;
1305 case KW_glow_radius:
1306 thawer.get (op->glow_radius);
1307 break;
1308 case KW_weapontype:
1309 thawer.get (op->weapontype);
1310 break;
1311 case KW_tooltype:
1312 thawer.get (op->tooltype);
1313 break;
1314 case KW_casting_time:
1315 thawer.get (op->casting_time);
1316 break;
1317 case KW_elevation:
1318 thawer.get (op->elevation);
1319 break;
1320 case KW_smoothlevel:
1321 thawer.get (op->smoothlevel);
1322 break;
1323 case KW_client_type:
1324 thawer.get (op->client_type);
1325 break;
1326 case KW_duration:
1327 thawer.get (op->duration);
1328 break;
1329 case KW_range:
1330 thawer.get (op->range);
1331 break;
1332 case KW_range_modifier:
1333 thawer.get (op->range_modifier);
1334 break;
1335 case KW_dam_modifier:
1336 thawer.get (op->dam_modifier);
1337 break;
1338 case KW_duration_modifier:
1339 thawer.get (op->duration_modifier);
1340 break;
1341
1342 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1343 //TODO: parse from other include files
1344 case KW_body_range:
1345 thawer.get (op->body_info[0]);
1346 break;
1347 case KW_body_arm:
1348 thawer.get (op->body_info[1]);
1349 break;
1350 case KW_body_torso:
1351 thawer.get (op->body_info[2]);
1352 break;
1353 case KW_body_head:
1354 thawer.get (op->body_info[3]);
1355 break;
1356 case KW_body_neck:
1357 thawer.get (op->body_info[4]);
1358 break;
1359 case KW_body_skill:
1360 thawer.get (op->body_info[5]);
1361 break;
1362 case KW_body_finger:
1363 thawer.get (op->body_info[6]);
1364 break;
1365 case KW_body_shoulder:
1366 thawer.get (op->body_info[7]);
1367 break;
1368 case KW_body_foot:
1369 thawer.get (op->body_info[8]);
1370 break;
1371 case KW_body_hand:
1372 thawer.get (op->body_info[9]);
1373 break;
1374 case KW_body_wrist:
1375 thawer.get (op->body_info[10]);
1376 break;
1377 case KW_body_waist:
1378 thawer.get (op->body_info[11]);
1379 break;
1380 case KW_can_apply:
1381 break;
1382
1383 case KW_connected:
1384 add_button_link (op, op->map, thawer.get_sint32 ());
1385 break;
1386
1387 case KW_randomitems:
1388 op->randomitems = find_treasurelist (thawer.get_str ());
1389 break;
1390
1391 case KW_msg:
1392 {
1393 thawer.get_ml (KW_endmsg, op->msg);
1394 //TODO: allow longer messages
1395 if (strlen (op->msg) >= HUGE_BUF)
1396 {
1397 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1398 op->msg = "ERROR, please report: string too long, winged.\n";
1399 }
1400 }
1401 break;
1402
1435 case KW_more: 1403 case KW_lore:
1436 /* We need to record that this is a multipart object, 1404 {
1437 * so the calling function can glue things back together 1405 shstr msgbuf;
1406
1407 thawer.get_ml (KW_endlore, op->lore);
1408 //TODO: allow longer messages
1409 /* Just print a warning so we can be reasonably safe
1410 * about not overflowing the buffer.
1438 */ 1411 */
1412 if (strlen (op->lore) > (HUGE_BUF / 2))
1413 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1414 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1415 }
1416 break;
1417
1418 case KW_editable:
1419 case KW_editor_folder:
1420 break;
1421
1422 case KW_More: // uppercase alias
1423 case KW_more:
1424 /* We need to record that this is a multipart object,
1425 * so the calling function can glue things back together
1426 */
1439 ismore = 1; 1427 ismore = 1;
1440 break; 1428 break;
1441 1429
1442 case KW_end: 1430 case KW_end:
1443 check_loaded_object (op); 1431 check_loaded_object (op);
1444 1432
1445 if (!arch_init) 1433 if (!arch_init)
1446 op->instantiate (); 1434 op->instantiate ();
1447 1435
1448 return ismore ? LL_MORE : LL_NORMAL; 1436 return ismore ? LL_MORE : LL_NORMAL;
1449 1437
1450 case KW_EOF: 1438 case KW_EOF:
1451 return LL_EOF; 1439 return LL_EOF;
1452 1440
1453 case KW_ERROR: 1441 case KW_ERROR:
1454 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1442 set_ob_key_value (op, thawer.line, thawer.last_value, true);
1455 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1443 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
1456 1444
1457 //TODO: skip line, ugly, factor parsing better 1445 //TODO: skip line, ugly, factor parsing better
1458 if (thawer.last_value) 1446 if (thawer.last_value)
1459 thawer.line = thawer.last_value; 1447 thawer.line = thawer.last_value;
1460 1448
1461 thawer.line += strlen (thawer.line) + 1; 1449 thawer.line += strlen (thawer.line) + 1;
1462 1450
1463 break; 1451 break;
1464 1452
1465 default: 1453 default:
1466 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1454 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1467 break; 1455 break;
1468 } 1456 }
1469 } 1457 }
1470} 1458}
1471 1459
1472/* 1460/*
… …
1620} 1608}
1621#endif 1609#endif
1622 1610
1623// compare *op against *tmp and output differences 1611// compare *op against *tmp and output differences
1624void 1612void
1625put (object_freezer & f, object *op, object *tmp) 1613put (object_freezer &f, object *op, object *tmp)
1626{ 1614{
1627 int i; 1615 int i;
1628 1616
1629 /* This saves the key/value lists. We do it first so that any 1617 /* This saves the key/value lists. We do it first so that any
1630 * keys that match field names will be overwritten by the loader. 1618 * keys that match field names will be overwritten by the loader.
… …
1640 } 1628 }
1641 1629
1642 /* We don't need to worry about the arch's extra fields - they 1630 /* We don't need to worry about the arch's extra fields - they
1643 * will get taken care of the copy_object function. 1631 * will get taken care of the copy_object function.
1644 */ 1632 */
1633
1634 {
1635 char uids[64];
1636 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1637 f.put (KW_uuid, (const char *)uids);
1638 }
1645 1639
1646#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1640#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v)
1647#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1641#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
1648 1642
1649 CMP_OUT (name); 1643 CMP_OUT (name);
… …
1838 } 1832 }
1839 1833
1840 fp.put (op); 1834 fp.put (op);
1841 fprintf (fp, "end\n"); 1835 fprintf (fp, "end\n");
1842} 1836}
1837

Diff Legend

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