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.17 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

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