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.19 by root, Thu Sep 21 00:05:24 2006 UTC vs.
Revision 1.46 by pippijn, Mon Jan 15 21:06:18 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 33
34/* Maps the MOVE_* values to names */ 34/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 36
… …
264static void 264static void
265check_loaded_object (object *op) 265check_loaded_object (object *op)
266{ 266{
267 int ip; 267 int ip;
268 268
269 /* We do some specialized handling to handle legacy cases of name_pl. 269 /* 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 - 270 * 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 271 * 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 272 * 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 273 * 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. 274 * 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 275 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 276 * information (appear as just 'hearts' and not 'goblins heart')
… …
280 280
281 if (!op->name_pl) 281 if (!op->name_pl)
282 op->name_pl = op->name; 282 op->name_pl = op->name;
283 283
284 /* objects now have a materialname. try to patch it in */ 284 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 285 if (!(op->is_weapon () && op->level > 0))
286 { 286 {
287 if (op->map != NULL) 287 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 288 set_materialname (op, op->map->difficulty, NULL);
289 else 289 else
290 set_materialname (op, 5, NULL); 290 set_materialname (op, 5, NULL);
… …
321 { 321 {
322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 322 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; 323 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 324 op->last_heal = 0;
325 } 325 }
326 if (editor) 326
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
330 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 329 if (!op->item_power && ip)
332 { 330 {
333 if (ip > 3) 331 if (ip > 3)
334 { 332 {
… …
488 SET_FLAG (op, flag); \ 486 SET_FLAG (op, flag); \
489 else \ 487 else \
490 CLEAR_FLAG (op, flag) \ 488 CLEAR_FLAG (op, flag) \
491 489
492int 490int
493parse_object (object *op, object_thawer & thawer, int map_flags) 491parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 492{
495 bool ismore = 0; 493 bool ismore = 0;
496 object *op_inv = op->inv; 494 object *op_inv = op->inv;
497 495
498 for (;;) 496 for (;;)
… …
503 { 501 {
504 case KW_Object: // uppercase alias 502 case KW_Object: // uppercase alias
505 case KW_object: 503 case KW_object:
506 thawer.get (op->name); 504 thawer.get (op->name);
507 505
508 if (op->arch != NULL) 506 if (op->arch)
509 op->arch->name = op->name; 507 op->arch->name = op->name;
510 508
511 break; 509 break;
512 510
513 case KW_uuid: 511 case KW_uuid:
… …
552 */ 550 */
553 archetype *arch = archetype::find (str); 551 archetype *arch = archetype::find (str);
554 552
555 object *tmp; 553 object *tmp;
556 554
557 if (arch != NULL) 555 if (arch)
558 tmp = arch_to_object (arch); 556 tmp = arch_to_object (arch);
559 else 557 else
560 { 558 {
561 tmp = get_object (); 559 tmp = object::create ();
562 /* record the name of the broken object */ 560 /* record the name of the broken object */
563 tmp->name = str; 561 tmp->name = str;
564 } 562 }
563
564 // decativate the object we, as we are still going
565 // to read the speed value. Objects should be activated
566 // when the map, object or player is completly loaded.
567 tmp->deactivate ();
565 568
566 parse_object (tmp, thawer, map_flags); 569 parse_object (tmp, thawer, map_flags);
567 570
568 if (tmp->arch) 571 if (tmp->arch)
569 { 572 {
… …
593 op_inv = tmp; 596 op_inv = tmp;
594 } 597 }
595 else 598 else
596 { 599 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 600 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 601 tmp->destroy ();
599 } 602 }
600 } 603 }
601 else 604 else
602 { 605 {
603 /* This is the actual archetype definition then */ 606 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 607 op->arch = archetype::find (str);
605 608
606 if (op->arch != NULL) 609 if (op->arch)
607 copy_object (&op->arch->clone, op); 610 {
611 op->arch->clone.copy_to (op);
612 // copy_to activates, this should be fixed properly
613 op->deactivate ();
614 }
608 else if (!arch_init) 615 else if (!arch_init)
609 /* record the name of the broken object */ 616 /* record the name of the broken object */
610 op->name = str; 617 op->name = str;
611 } 618 }
612 } 619 }
… …
623 if (!str) 630 if (!str)
624 { 631 {
625 op->animation_id = 0; 632 op->animation_id = 0;
626 CLEAR_FLAG (op, FLAG_ANIMATE); 633 CLEAR_FLAG (op, FLAG_ANIMATE);
627 } 634 }
628 else
629 {
630 op->animation_id = find_animation (str); 635 else if ((op->animation_id = find_animation (str)))
631 SET_FLAG (op, FLAG_ANIMATE); 636 SET_FLAG (op, FLAG_ANIMATE);
632 }
633 } 637 }
634 638
635 break; 639 break;
636 640
637 case KW_last_heal: thawer.get (op->last_heal); break; 641 case KW_last_heal: thawer.get (op->last_heal); break;
… …
642 646
643 case KW_speed: 647 case KW_speed:
644 thawer.get (op->speed); 648 thawer.get (op->speed);
645 649
646 //TODO: maybe do in check_object 650 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 651 // removed check for style maps
648 {
649 if (op->speed < 0) 652 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 653 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
651
652 update_ob_speed (op);
653 }
654 654
655 break; 655 break;
656 656
657 case KW_slow_move: 657 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 658 op->move_slow |= MOVE_WALK;
… …
812 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
813 } 813 }
814 break; 814 break;
815 815
816 case KW_friendly: 816 case KW_friendly:
817 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
818 //TODO: move to check_object or so 818 if (op->type != PLAYER)
819 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
820 add_friendly_object (op); 819 add_friendly_object (op);
820
821 break; 821 break;
822 822
823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 829 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; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 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; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 835 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; 836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
908 909
909 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 910 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 911 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
911 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 912 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
912 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 913 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
982 case KW_randomitems: 983 case KW_randomitems:
983 op->randomitems = find_treasurelist (thawer.get_str ()); 984 op->randomitems = find_treasurelist (thawer.get_str ());
984 break; 985 break;
985 986
986 case KW_msg: 987 case KW_msg:
987 {
988 thawer.get_ml (KW_endmsg, op->msg); 988 thawer.get_ml (KW_endmsg, op->msg);
989 //TODO: allow longer messages 989 //TODO: allow longer messages
990 if (strlen (op->msg) >= HUGE_BUF) 990 if (strlen (op->msg) >= HUGE_BUF)
991 { 991 {
992 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 992 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
993 op->msg = "ERROR, please report: string too long, winged.\n"; 993 op->msg = "ERROR, please report: string too long, winged.\n";
994 } 994 }
995 }
996 break; 995 break;
997 996
998 case KW_lore: 997 case KW_lore:
999 {
1000 shstr msgbuf;
1001
1002 thawer.get_ml (KW_endlore, op->lore); 998 thawer.get_ml (KW_endlore, op->lore);
1003 //TODO: allow longer messages 999 //TODO: allow longer messages
1004 /* Just print a warning so we can be reasonably safe 1000 /* Just print a warning so we can be reasonably safe
1005 * about not overflowing the buffer. 1001 * about not overflowing the buffer.
1006 */ 1002 */
1007 if (strlen (op->lore) > (HUGE_BUF / 2)) 1003 if (strlen (op->lore) > (HUGE_BUF / 2))
1008 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1004 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1009 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1005 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1010 }
1011 break; 1006 break;
1012 1007
1013 case KW_editable: 1008 case KW_editable:
1014 case KW_editor_folder: 1009 case KW_editor_folder:
1015 break; 1010 break;
… …
1032 1027
1033 case KW_EOF: 1028 case KW_EOF:
1034 return LL_EOF; 1029 return LL_EOF;
1035 1030
1036 case KW_ERROR: 1031 case KW_ERROR:
1037 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1032 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1038 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1033 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1039
1040 //TODO: skip line, ugly, factor parsing better
1041 if (thawer.last_value)
1042 thawer.line = thawer.last_value;
1043
1044 thawer.line += strlen (thawer.line) + 1;
1045
1046 break; 1034 break;
1047 1035
1048 default: 1036 default:
1049 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1037 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1050 break; 1038 break;
… …
1064 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1052 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1065 * be reset. 1053 * be reset.
1066 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1054 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1067 * 1055 *
1068 */ 1056 */
1069
1070int 1057int
1071load_object (object_thawer & fp, object *op, int map_flags) 1058load_object (object_thawer &fp, object *op, int map_flags)
1072{ 1059{
1060 coroapi::cede_every (1000); // cede once in a while
1061
1073 return parse_object (op, fp, map_flags); 1062 return parse_object (op, fp, map_flags);
1074} 1063}
1075
1076 1064
1077/* This takes a buffer, scans it for variables, and sets those variables 1065/* This takes a buffer, scans it for variables, and sets those variables
1078 * as appropriate in op. 1066 * as appropriate in op.
1079 * 1067 *
1080 * This function appears to be used in only 2 places - in crossedit to 1068 * This function appears to be used in only 2 places - in crossedit to
1081 * override values and in c_wiz to mutate values. 1069 * override values and in c_wiz to mutate values.
1082 */ 1070 */
1083int 1071int
1084set_variable (object *op, char *buf) 1072set_variable (object *op, char *buf)
1085{ 1073{
1086 return 0;
1087#if 0
1088 int retval;
1089 object_thawer thawer (0); 1074 object_thawer thawer (buf, (AV *)0);
1090 1075
1091 strcpy (msgbuf, "");
1092 strcpy (lorebuf, "");
1093 retval = parse_object (op, thawer, 0); 1076 return parse_object (op, thawer, 0);
1094 yy_switch_to_buffer (yycurbuf);
1095 yy_delete_buffer (yybufstate);
1096 yy_pop_state ();
1097 return retval;
1098#endif
1099} 1077}
1100 1078
1101/* 1079/*
1102 * Initialises the array of variable-names. Needed before any 1080 * Initialises the array of variable-names. Needed before any
1103 * objects can be loaded. Called by init_library(). 1081 * objects can be loaded. Called by init_library().
… …
1193 KW_monster, 1171 KW_monster,
1194 KW_friendly, 1172 KW_friendly,
1195 KW_generator, 1173 KW_generator,
1196 KW_is_thrown, 1174 KW_is_thrown,
1197 KW_auto_apply, 1175 KW_auto_apply,
1198 KW_treasure, 1176 KW_NULL, // was KW_treasure
1199 KW_player_sold, 1177 KW_player_sold,
1200 /* 20 */ 1178 /* 20 */
1201 KW_see_invisible, 1179 KW_see_invisible,
1202 KW_can_roll, 1180 KW_can_roll,
1203 KW_overlay_floor, 1181 KW_overlay_floor,
… …
1286 KW_berserk, 1264 KW_berserk,
1287 KW_neutral, 1265 KW_neutral,
1288 /* 100 */ 1266 /* 100 */
1289 KW_no_attack, 1267 KW_no_attack,
1290 KW_no_damage, 1268 KW_no_damage,
1291 KW_NULL, 1269 KW_obj_original,
1292 KW_NULL, 1270 KW_NULL,
1293 KW_activate_on_push, 1271 KW_activate_on_push,
1294 KW_activate_on_release, 1272 KW_activate_on_release,
1295 KW_is_water, 1273 KW_is_water,
1296 KW_use_content_on_gen, 1274 KW_use_content_on_gen,
1297 KW_NULL, 1275 KW_NULL,
1298 KW_is_buildable, 1276 KW_is_buildable,
1299 /* 110 */ 1277 /* 110 */
1278 KW_destroy_on_death,
1279 KW_NULL,
1300 }; 1280 };
1301 1281
1302 int i; 1282 int i;
1303 1283
1304 /* This saves the key/value lists. We do it first so that any 1284 /* This saves the key/value lists. We do it first so that any
1305 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1306 */ 1286 */
1307 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1287 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1308 { 1288 {
1309 /* Find the field in the opposing member. */ 1289 /* Find the field in the opposing member. */
1310 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1290 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1311 1291
1312 /* If there's no partnering field, or it's got a different value, save our field. */ 1292 /* If there's no partnering field, or it's got a different value, save our field. */
1313 if (!arch_field || my_field->value != arch_field->value) 1293 if (!arch_field || my_field->value != arch_field->value)
1314 f.put (my_field->key, my_field->value); 1294 f.put (my_field->key, my_field->value);
1315 } 1295 }
1316 1296
1317 /* We don't need to worry about the arch's extra fields - they 1297 /* We don't need to worry about the arch's extra fields - they
1318 * will get taken care of the copy_object function. 1298 * will get taken care of the copy_to method.
1319 */ 1299 */
1320 1300
1321 { 1301 {
1322 char uids[64]; 1302 char uids[64];
1323 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1303 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1440 CMP_OUT (move_on); 1420 CMP_OUT (move_on);
1441 CMP_OUT (move_off); 1421 CMP_OUT (move_off);
1442 CMP_OUT (move_slow); 1422 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1423 CMP_OUT (move_slow_penalty);
1444 1424
1445 if (!COMPARE_FLAGS (op, tmp)) 1425 if (op->flag != tmp->flag)
1446 for (i = 0; i <= NUM_FLAGS; i++) 1426 for (i = 0; i <= NUM_FLAGS; i++)
1447 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1427 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1448 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1428 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1449 1429
1450 /* Save body locations */ 1430 /* Save body locations */
1451 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1431 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1452 if (op->body_info[i] != tmp->body_info[i]) 1432 if (op->body_info[i] != tmp->body_info[i])
1453 f.put (body_locations[i].save_name, op->body_info[i]); 1433 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1455 1435
1456/* 1436/*
1457 * Dumps all variables in an object to a file. 1437 * Dumps all variables in an object to a file.
1458 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1438 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1459 * the only place this is not set is when saving the player. 1439 * the only place this is not set is when saving the player.
1460 * If bit 1 of flag is set, don't remove the object after save. As of now,
1461 * all of the callers are setting this.
1462 */ 1440 */
1463
1464void 1441void
1465save_object (object_freezer & fp, object *op, int flag) 1442save_object (object_freezer &fp, object *op, int flag)
1466{ 1443{
1467 archetype *at;
1468 object *tmp, *old;
1469
1470 /* Even if the object does have an owner, it would seem that we should 1444 /* Even if the object does have an owner, it would seem that we should
1471 * still save it. 1445 * still save it.
1472 */ 1446 */
1473 if (op->owner) 1447 if (op->owner)
1474 return; 1448 return;
1475 1449
1476 /* If it is unpaid and we don't want to save those, just return. */ 1450 /* If it is unpaid and we don't want to save those, just return. */
1477 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1451 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1478 return; 1452 return;
1479 1453
1480 if ((at = op->arch) == NULL) 1454 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1481 at = empty_archetype;
1482 1455
1483 fp.put (KW_arch, at->name); 1456 fp.put (KW_arch, at->name);
1484
1485 put (fp, op, &at->clone); 1457 put (fp, op, &at->clone);
1486 1458
1487 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1459 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1488 1460
1489 old = NULL;
1490
1491 if (flag & 2)
1492 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1461 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1493 save_object (fp, tmp, flag); 1462 save_object (fp, tmp, flag);
1494 else
1495 /* Slightly different logic because tmp/op will be removed by
1496 * the save_object we call. So we just keep looking at op->inv
1497 * until there is nothing left. In theory, the variable old
1498 * should not be needed, as recursive loops shouldn't happen.
1499 */
1500 while ((tmp = op->inv) != NULL)
1501 {
1502 if (old == tmp)
1503 {
1504 LOG (llevError, " Recursive loop in inventory\n");
1505 break;
1506 }
1507
1508 save_object (fp, tmp, flag);
1509 old = tmp;
1510 }
1511
1512 if (!(flag & 2))
1513 {
1514 remove_ob (op);
1515 free_object (op);
1516 }
1517 1463
1518 fp.put (op); 1464 fp.put (op);
1519 fprintf (fp, "end\n"); 1465 fp.put (KW_end);
1520} 1466}
1521 1467

Diff Legend

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