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.18 by root, Fri Sep 15 00:31:36 2006 UTC vs.
Revision 1.48 by root, Fri Jan 19 17:50:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27 28
28 29
29#include <global.h> 30#include <global.h>
30#include <loader.h> 31#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 32#include <sproto.h>
33
34// future resource loader base class
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39
40 virtual object *get_object (const char *name);
41 virtual void put_object (object *op);
42
43 virtual player *get_player ();
44 virtual void put_player (player *pl);
45
46 virtual region *get_region ();
47 virtual void put_region (region *region);
48
49 virtual facetile *get_face (const char *name);
50 virtual void put_face (facetile *face);
51
52 virtual treasurelist *get_treasure (const char *name, bool one = false);
53 virtual void put_treasure (treasurelist *treasure);
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{
64 virtual region *get_region ();
65 virtual void put_region (region *region);
66
67 virtual facetile *get_face (const char *name);
68 virtual void put_face (facetile *face);
69
70 virtual treasurelist *get_treasure (const char *name, bool one = false);
71 virtual void put_treasure (treasurelist *treasure);
72
73 virtual animation *get_animation (const char *name);
74 virtual void put_animation (animation *anim);
75};
33 76
34/* Maps the MOVE_* values to names */ 77/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 78static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 79
37/* This table is only necessary to convert objects that existed before the 80/* This table is only necessary to convert objects that existed before the
… …
264static void 307static void
265check_loaded_object (object *op) 308check_loaded_object (object *op)
266{ 309{
267 int ip; 310 int ip;
268 311
269 /* We do some specialized handling to handle legacy cases of name_pl. 312 /* We do some specialised handling to handle legacy cases of name_pl.
270 * If the object doesn't have a name_pl, we just use the object name - 313 * If the object doesn't have a name_pl, we just use the object name -
271 * this isn't perfect (things won't be properly pluralized), but works to 314 * this isn't perfect (things won't be properly pluralised), but works to
272 * that degree (5 heart is still quite understandable). But the case we 315 * that degree (5 heart is still quite understandable). But the case we
273 * also have to catch is if this object is not using the normal name for 316 * also have to catch is if this object is not using the normal name for
274 * the object. In that case, we also want to use the loaded name. 317 * the object. In that case, we also want to use the loaded name.
275 * Otherwise, what happens is that the the plural name will lose 318 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 319 * information (appear as just 'hearts' and not 'goblins heart')
… …
280 323
281 if (!op->name_pl) 324 if (!op->name_pl)
282 op->name_pl = op->name; 325 op->name_pl = op->name;
283 326
284 /* objects now have a materialname. try to patch it in */ 327 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 328 if (!(op->is_weapon () && op->level > 0))
286 { 329 {
287 if (op->map != NULL) 330 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 331 set_materialname (op, op->map->difficulty, NULL);
289 else 332 else
290 set_materialname (op, 5, NULL); 333 set_materialname (op, 5, NULL);
… …
321 { 364 {
322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 365 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
323 op->gen_sp_armour = op->last_heal; 366 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 367 op->last_heal = 0;
325 } 368 }
326 if (editor) 369
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 370 ip = calc_item_power (op, 0);
330 /* Legacy objects from before item power was in the game */ 371 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 372 if (!op->item_power && ip)
332 { 373 {
333 if (ip > 3) 374 if (ip > 3)
334 { 375 {
… …
488 SET_FLAG (op, flag); \ 529 SET_FLAG (op, flag); \
489 else \ 530 else \
490 CLEAR_FLAG (op, flag) \ 531 CLEAR_FLAG (op, flag) \
491 532
492int 533int
493parse_object (object *op, object_thawer & thawer, int map_flags) 534parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 535{
495 bool ismore = 0; 536 bool ismore = 0;
496 object *op_inv = op->inv; 537 object *op_inv = op->inv;
497 538
498 for (;;) 539 for (;;)
… …
503 { 544 {
504 case KW_Object: // uppercase alias 545 case KW_Object: // uppercase alias
505 case KW_object: 546 case KW_object:
506 thawer.get (op->name); 547 thawer.get (op->name);
507 548
508 if (op->arch != NULL) 549 if (op->arch)
509 op->arch->name = op->name; 550 op->arch->name = op->name;
510 551
511 break; 552 break;
512 553
513 case KW_uuid: 554 case KW_uuid:
… …
552 */ 593 */
553 archetype *arch = archetype::find (str); 594 archetype *arch = archetype::find (str);
554 595
555 object *tmp; 596 object *tmp;
556 597
557 if (arch != NULL) 598 if (arch)
558 tmp = arch_to_object (arch); 599 tmp = arch_to_object (arch);
559 else 600 else
560 { 601 {
561 tmp = get_object (); 602 tmp = object::create ();
562 /* record the name of the broken object */ 603 /* record the name of the broken object */
563 tmp->name = str; 604 tmp->name = str;
564 } 605 }
606
607 // decativate the object we, as we are still going
608 // to read the speed value. Objects should be activated
609 // when the map, object or player is completly loaded.
610 tmp->deactivate ();
565 611
566 parse_object (tmp, thawer, map_flags); 612 parse_object (tmp, thawer, map_flags);
567 613
568 if (tmp->arch) 614 if (tmp->arch)
569 { 615 {
… …
593 op_inv = tmp; 639 op_inv = tmp;
594 } 640 }
595 else 641 else
596 { 642 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 643 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 644 tmp->destroy ();
599 } 645 }
600 } 646 }
601 else 647 else
602 { 648 {
603 /* This is the actual archetype definition then */ 649 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 650 op->arch = archetype::find (str);
605 651
606 if (op->arch != NULL) 652 if (op->arch)
607 copy_object (&op->arch->clone, op); 653 {
654 op->arch->clone.copy_to (op);
655 // copy_to activates, this should be fixed properly
656 op->deactivate ();
657 }
608 else if (!arch_init) 658 else if (!arch_init)
609 /* record the name of the broken object */ 659 /* record the name of the broken object */
610 op->name = str; 660 op->name = str;
611 } 661 }
612 } 662 }
… …
623 if (!str) 673 if (!str)
624 { 674 {
625 op->animation_id = 0; 675 op->animation_id = 0;
626 CLEAR_FLAG (op, FLAG_ANIMATE); 676 CLEAR_FLAG (op, FLAG_ANIMATE);
627 } 677 }
628 else
629 {
630 op->animation_id = find_animation (str); 678 else if ((op->animation_id = find_animation (str)))
631 SET_FLAG (op, FLAG_ANIMATE); 679 SET_FLAG (op, FLAG_ANIMATE);
632 }
633 } 680 }
634 681
635 break; 682 break;
636 683
637 case KW_last_heal: thawer.get (op->last_heal); break; 684 case KW_last_heal: thawer.get (op->last_heal); break;
… …
642 689
643 case KW_speed: 690 case KW_speed:
644 thawer.get (op->speed); 691 thawer.get (op->speed);
645 692
646 //TODO: maybe do in check_object 693 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 694 // removed check for style maps
648 {
649 if (op->speed < 0) 695 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 696 op->speed_left = op->speed_left - rndm ();
651
652 update_ob_speed (op);
653 }
654 697
655 break; 698 break;
656 699
657 case KW_slow_move: 700 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 701 op->move_slow |= MOVE_WALK;
… …
812 CLEAR_FLAG (op, FLAG_WIZCAST); 855 CLEAR_FLAG (op, FLAG_WIZCAST);
813 } 856 }
814 break; 857 break;
815 858
816 case KW_friendly: 859 case KW_friendly:
817 GET_FLAG (op, FLAG_FRIENDLY); 860 if (thawer.get_sint32 ())
818 //TODO: move to check_object or so 861 if (op->type != PLAYER)
819 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
820 add_friendly_object (op); 862 add_friendly_object (op);
863
821 break; 864 break;
822 865
823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 866 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 867 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 868 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 869 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
870 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 871 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 872 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 873 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 874 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 875 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 876 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 877 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 878 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 879 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 907 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
865 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 908 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
866 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 909 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
867 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 910 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
868 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 911 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
912 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
869 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 913 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
870 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 914 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
871 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 915 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
872 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 916 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
873 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 917 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
… …
902 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 946 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
903 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 947 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
904 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 948 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
905 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 949 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
906 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 950 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
951 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
907 952
908 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 953 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 954 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 955 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 956 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
981 case KW_randomitems: 1026 case KW_randomitems:
982 op->randomitems = find_treasurelist (thawer.get_str ()); 1027 op->randomitems = find_treasurelist (thawer.get_str ());
983 break; 1028 break;
984 1029
985 case KW_msg: 1030 case KW_msg:
986 {
987 thawer.get_ml (KW_endmsg, op->msg); 1031 thawer.get_ml (KW_endmsg, op->msg);
988 //TODO: allow longer messages 1032 //TODO: allow longer messages
989 if (strlen (op->msg) >= HUGE_BUF) 1033 if (strlen (op->msg) >= HUGE_BUF)
990 { 1034 {
991 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 1035 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
992 op->msg = "ERROR, please report: string too long, winged.\n"; 1036 op->msg = "ERROR, please report: string too long, winged.\n";
993 } 1037 }
994 }
995 break; 1038 break;
996 1039
997 case KW_lore: 1040 case KW_lore:
998 {
999 shstr msgbuf;
1000
1001 thawer.get_ml (KW_endlore, op->lore); 1041 thawer.get_ml (KW_endlore, op->lore);
1002 //TODO: allow longer messages 1042 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 1043 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 1044 * about not overflowing the buffer.
1005 */ 1045 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 1046 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1047 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1048 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 }
1010 break; 1049 break;
1011 1050
1012 case KW_editable: 1051 case KW_editable:
1013 case KW_editor_folder: 1052 case KW_editor_folder:
1014 break; 1053 break;
… …
1031 1070
1032 case KW_EOF: 1071 case KW_EOF:
1033 return LL_EOF; 1072 return LL_EOF;
1034 1073
1035 case KW_ERROR: 1074 case KW_ERROR:
1036 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1075 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1037 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1076 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1038
1039 //TODO: skip line, ugly, factor parsing better
1040 if (thawer.last_value)
1041 thawer.line = thawer.last_value;
1042
1043 thawer.line += strlen (thawer.line) + 1;
1044
1045 break; 1077 break;
1046 1078
1047 default: 1079 default:
1048 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1080 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1049 break; 1081 break;
… …
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1095 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset. 1096 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1097 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 * 1098 *
1067 */ 1099 */
1068
1069int 1100int
1070load_object (object_thawer & fp, object *op, int map_flags) 1101load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1102{
1103 coroapi::cede_every (1000); // cede once in a while
1104
1072 return parse_object (op, fp, map_flags); 1105 return parse_object (op, fp, map_flags);
1073} 1106}
1074
1075 1107
1076/* This takes a buffer, scans it for variables, and sets those variables 1108/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1109 * as appropriate in op.
1078 * 1110 *
1079 * This function appears to be used in only 2 places - in crossedit to 1111 * This function appears to be used in only 2 places - in crossedit to
1080 * override values and in c_wiz to mutate values. 1112 * override values and in c_wiz to mutate values.
1081 */ 1113 */
1082int 1114int
1083set_variable (object *op, char *buf) 1115set_variable (object *op, char *buf)
1084{ 1116{
1085 return 0;
1086#if 0
1087 int retval;
1088 object_thawer thawer (0); 1117 object_thawer thawer (buf, (AV *)0);
1089 1118
1090 strcpy (msgbuf, "");
1091 strcpy (lorebuf, "");
1092 retval = parse_object (op, thawer, 0); 1119 return parse_object (op, thawer, 0);
1093 yy_switch_to_buffer (yycurbuf);
1094 yy_delete_buffer (yybufstate);
1095 yy_pop_state ();
1096 return retval;
1097#endif
1098} 1120}
1099
1100/* This array equates the FLAG_ values with the V_ values. Use -1 to
1101 * put gaps in the array that should not be processed.
1102 * The order matches the order of the define values in 'define.h'.
1103 */
1104
1105/* This is a list of pointers that correspond to the FLAG_.. values.
1106 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1107 * the 15'th element of this array should match that name.
1108 * If an entry is NULL, that is a flag not to loaded/saved.
1109 */
1110static const char *const flag_names[NUM_FLAGS + 1] = {
1111 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1112 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1113 "is_animated", NULL /* slow_move */ ,
1114 NULL /* flying */ , "monster", "friendly", "generator",
1115 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1116 "see_invisible", "can_roll", "overlay_floor",
1117 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1118 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1119 "changing", "splitting", "hitback", "startequip",
1120 "blocksview", "undead", "scared", "unaggressive",
1121 "reflect_missile", "reflect_spell", /* 40 */
1122 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1123 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1124 "pick_up", "unique", "no_drop", /* 50 */
1125 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1126 "can_use_bow", "can_use_armour", "can_use_weapon",
1127 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1128 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1129 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1130 "stealth", NULL, NULL, "cursed", "damned",
1131 "see_anywhere", "known_magical", "known_cursed",
1132 "can_use_skill", "been_applied", /* 80 */
1133 "has_ready_scroll", "can_use_rod", NULL,
1134 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1135 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1136 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1137 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1138 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1139 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1140 NULL
1141};
1142
1143 1121
1144/* 1122/*
1145 * Initialises the array of variable-names. Needed before any 1123 * Initialises the array of variable-names. Needed before any
1146 * objects can be loaded. Called by init_library(). 1124 * objects can be loaded. Called by init_library().
1147 */ 1125 */
… …
1204 1182
1205// compare *op against *tmp and output differences 1183// compare *op against *tmp and output differences
1206void 1184void
1207put (object_freezer &f, object *op, object *tmp) 1185put (object_freezer &f, object *op, object *tmp)
1208{ 1186{
1187 static const keyword resist_save[NROFATTACKS] = {
1188# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1189# include "attackinc.h"
1190# undef def
1191 };
1192
1193 /* This is a list of keywords that correspond to the FLAG_.. values.
1194 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1195 * the 15'th element of this array should match that name.
1196 * If an entry is NULL, that is a flag not to loaded/saved.
1197 */
1198 static const keyword flag_names [NUM_FLAGS] = {
1199 KW_alive,
1200 KW_wiz,
1201 KW_NULL,
1202 KW_NULL,
1203 KW_was_wiz,
1204 KW_applied,
1205 KW_unpaid,
1206 KW_can_use_shield,
1207 KW_no_pick,
1208 KW_NULL, // walk_on
1209 KW_NULL, // no_pass
1210 /* 10 */
1211 KW_is_animated,
1212 KW_NULL, // slow_move
1213 KW_NULL, // flying
1214 KW_monster,
1215 KW_friendly,
1216 KW_generator,
1217 KW_is_thrown,
1218 KW_auto_apply,
1219 KW_NULL, // was KW_treasure
1220 KW_player_sold,
1221 /* 20 */
1222 KW_see_invisible,
1223 KW_can_roll,
1224 KW_overlay_floor,
1225 KW_is_turnable,
1226 KW_NULL, // walk_off
1227 KW_NULL, // fly_on
1228 KW_NULL, // fly_off
1229 KW_is_used_up,
1230 KW_identified,
1231 KW_reflecting,
1232 /* 30 */
1233 KW_changing,
1234 KW_splitting,
1235 KW_hitback,
1236 KW_startequip,
1237 KW_blocksview,
1238 KW_undead,
1239 KW_scared,
1240 KW_unaggressive,
1241 KW_reflect_missile,
1242 KW_reflect_spell,
1243 /* 40 */
1244 KW_no_magic,
1245 KW_no_fix_player,
1246 KW_is_lightable,
1247 KW_tear_down,
1248 KW_run_away,
1249 KW_NULL, // pass_thru
1250 KW_NULL, // an_pass_thru
1251 KW_pick_up,
1252 KW_unique,
1253 KW_no_drop,
1254 /* 50 */
1255 KW_NULL, // wizcast
1256 KW_can_cast_spell,
1257 KW_can_use_scroll,
1258 KW_can_use_range,
1259 KW_can_use_bow,
1260 KW_can_use_armour,
1261 KW_can_use_weapon,
1262 KW_can_use_ring,
1263 KW_has_ready_range,
1264 KW_has_ready_bow,
1265 /* 60 */
1266 KW_xrays,
1267 KW_NULL,
1268 KW_is_floor,
1269 KW_lifesave,
1270 KW_no_strength,
1271 KW_sleep,
1272 KW_stand_still,
1273 KW_random_move,
1274 KW_only_attack,
1275 KW_confused,
1276 /* 70 */
1277 KW_stealth,
1278 KW_NULL,
1279 KW_NULL,
1280 KW_cursed,
1281 KW_damned,
1282 KW_see_anywhere,
1283 KW_known_magical,
1284 KW_known_cursed,
1285 KW_can_use_skill,
1286 KW_been_applied,
1287 /* 80 */
1288 KW_has_ready_scroll,
1289 KW_can_use_rod,
1290 KW_NULL,
1291 KW_can_use_horn,
1292 KW_make_invisible,
1293 KW_inv_locked,
1294 KW_is_wooded,
1295 KW_is_hilly,
1296 KW_has_ready_skill,
1297 KW_has_ready_weapon,
1298 /* 90 */
1299 KW_no_skill_ident,
1300 KW_is_blind,
1301 KW_can_see_in_dark,
1302 KW_is_cauldron,
1303 KW_NULL,
1304 KW_no_steal,
1305 KW_one_hit,
1306 KW_NULL,
1307 KW_berserk,
1308 KW_neutral,
1309 /* 100 */
1310 KW_no_attack,
1311 KW_no_damage,
1312 KW_obj_original,
1313 KW_NULL,
1314 KW_activate_on_push,
1315 KW_activate_on_release,
1316 KW_is_water,
1317 KW_use_content_on_gen,
1318 KW_NULL,
1319 KW_is_buildable,
1320 /* 110 */
1321 KW_destroy_on_death,
1322 KW_NULL,
1323 };
1324
1209 int i; 1325 int i;
1210 1326
1211 /* This saves the key/value lists. We do it first so that any 1327 /* This saves the key/value lists. We do it first so that any
1212 * keys that match field names will be overwritten by the loader. 1328 * keys that match field names will be overwritten by the loader.
1213 */ 1329 */
1214 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1330 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1215 { 1331 {
1216 /* Find the field in the opposing member. */ 1332 /* Find the field in the opposing member. */
1217 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1333 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1218 1334
1219 /* If there's no partnering field, or it's got a different value, save our field. */ 1335 /* If there's no partnering field, or it's got a different value, save our field. */
1220 if (arch_field == NULL || my_field->value != arch_field->value) 1336 if (!arch_field || my_field->value != arch_field->value)
1221 f.put (my_field->key, my_field->value); 1337 f.put (my_field->key, my_field->value);
1222 } 1338 }
1223 1339
1224 /* We don't need to worry about the arch's extra fields - they 1340 /* We don't need to worry about the arch's extra fields - they
1225 * will get taken care of the copy_object function. 1341 * will get taken care of the copy_to method.
1226 */ 1342 */
1227 1343
1228 { 1344 {
1229 char uids[64]; 1345 char uids[64];
1230 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1346 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1246 if (op->lore != tmp->lore) 1362 if (op->lore != tmp->lore)
1247 f.put (KW_lore, KW_endlore, op->lore); 1363 f.put (KW_lore, KW_endlore, op->lore);
1248 1364
1249 CMP_OUT (other_arch); 1365 CMP_OUT (other_arch);
1250 CMP_OUT (face); 1366 CMP_OUT (face);
1251
1252 if (!op->face || !op->face->name)
1253 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1254 1367
1255 if (op->animation_id != tmp->animation_id) 1368 if (op->animation_id != tmp->animation_id)
1256 if (op->animation_id) 1369 if (op->animation_id)
1257 { 1370 {
1258 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1371 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1350 CMP_OUT (move_on); 1463 CMP_OUT (move_on);
1351 CMP_OUT (move_off); 1464 CMP_OUT (move_off);
1352 CMP_OUT (move_slow); 1465 CMP_OUT (move_slow);
1353 CMP_OUT (move_slow_penalty); 1466 CMP_OUT (move_slow_penalty);
1354 1467
1355 if (!COMPARE_FLAGS (op, tmp)) 1468 if (op->flag != tmp->flag)
1356 for (i = 0; i <= NUM_FLAGS; i++) 1469 for (i = 0; i <= NUM_FLAGS; i++)
1357 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1470 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1358 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1471 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1359 1472
1360 /* Save body locations */ 1473 /* Save body locations */
1361 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1474 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1362 if (op->body_info[i] != tmp->body_info[i]) 1475 if (op->body_info[i] != tmp->body_info[i])
1363 f.put (body_locations[i].save_name, op->body_info[i]); 1476 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1365 1478
1366/* 1479/*
1367 * Dumps all variables in an object to a file. 1480 * Dumps all variables in an object to a file.
1368 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1481 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1369 * the only place this is not set is when saving the player. 1482 * the only place this is not set is when saving the player.
1370 * If bit 1 of flag is set, don't remove the object after save. As of now,
1371 * all of the callers are setting this.
1372 */ 1483 */
1373
1374void 1484void
1375save_object (object_freezer & fp, object *op, int flag) 1485save_object (object_freezer &fp, object *op, int flag)
1376{ 1486{
1377 archetype *at;
1378 object *tmp, *old;
1379
1380 /* Even if the object does have an owner, it would seem that we should 1487 /* Even if the object does have an owner, it would seem that we should
1381 * still save it. 1488 * still save it.
1382 */ 1489 */
1383 if (op->owner) 1490 if (op->owner)
1384 return; 1491 return;
1385 1492
1386 /* If it is unpaid and we don't want to save those, just return. */ 1493 /* If it is unpaid and we don't want to save those, just return. */
1387 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1494 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1388 return; 1495 return;
1389 1496
1390 if ((at = op->arch) == NULL) 1497 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1391 at = empty_archetype;
1392 1498
1393 fp.put (KW_arch, at->name); 1499 fp.put (KW_arch, at->name);
1394
1395 put (fp, op, &at->clone); 1500 put (fp, op, &at->clone);
1396 1501
1397 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1502 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1398 1503
1399 old = NULL;
1400
1401 if (flag & 2)
1402 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1504 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1403 save_object (fp, tmp, flag); 1505 save_object (fp, tmp, flag);
1404 else
1405 /* Slightly different logic because tmp/op will be removed by
1406 * the save_object we call. So we just keep looking at op->inv
1407 * until there is nothing left. In theory, the variable old
1408 * should not be needed, as recursive loops shouldn't happen.
1409 */
1410 while ((tmp = op->inv) != NULL)
1411 {
1412 if (old == tmp)
1413 {
1414 LOG (llevError, " Recursive loop in inventory\n");
1415 break;
1416 }
1417
1418 save_object (fp, tmp, flag);
1419 old = tmp;
1420 }
1421
1422 if (!(flag & 2))
1423 {
1424 remove_ob (op);
1425 free_object (op);
1426 }
1427 1506
1428 fp.put (op); 1507 fp.put (op);
1429 fprintf (fp, "end\n"); 1508 fp.put (KW_end);
1430} 1509}
1431 1510

Diff Legend

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