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.80 by root, Sat May 12 16:06:41 2007 UTC vs.
Revision 1.106 by root, Thu Apr 10 15:35:15 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
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. */
… …
29#include <global.h> 28#include <global.h>
30#include <loader.h> 29#include <loader.h>
31#include <sproto.h> 30#include <sproto.h>
32 31
33///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
34 35
35/* This table is only necessary to convert objects that existed before the 36/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 38 * to go through every mapping looking for every potion, rod, wand, etc
38 * that had a sp set and update to the new value. So this maps the 39 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
252 NULL 253 NULL
253}; 254};
254 255
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 256/* This function checks the object after it has been loaded (when we
258 * get the 'end' in the input stream). This function can be used to 257 * get the 'end' in the input stream). This function can be used to
259 * deal with legacy objects where fields may have changed. It can also be used 258 * deal with legacy objects where fields may have changed. It can also be used
260 * to check for objects to make sure there are no common errors. 259 * to check for objects to make sure there are no common errors.
261 */ 260 */
262void 261void
263object::post_load_check () 262object::post_load_check ()
264{ 263{
264 if (type >= NUM_TYPES)
265 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0;
268 }
269
265 switch (type) 270 switch (type)
266 { 271 {
267 case BOW: 272 case BOW:
268 case WAND: 273 case WAND:
269 case ROD: 274 case ROD:
270 case HORN: 275 case HORN:
271 case SKILL_TOOL:
272 if (slot [body_range].info != -1) 276 if (slot [body_range].info != -1)
273 { 277 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 279 slot [body_range].info = -1;
276 } 280 }
… …
320 * also have to catch is if this object is not using the normal name for 324 * also have to catch is if this object is not using the normal name for
321 * the object. In that case, we also want to use the loaded name. 325 * the object. In that case, we also want to use the loaded name.
322 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
323 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
324 */ 328 */
325 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
326 name_pl = 0; 330 name_pl = 0;
327 331
328 if (!name_pl) 332 if (!name_pl)
329 name_pl = name; 333 name_pl = name;
330 334
… …
379 * something that has item_power 1 is probably just fine if our calculated 383 * something that has item_power 1 is probably just fine if our calculated
380 * value is 1 or 2 - these values are small enough that hard to be precise. 384 * value is 1 or 2 - these values are small enough that hard to be precise.
381 * similarly, it item_power is 0, the first check will always pass, 385 * similarly, it item_power is 0, the first check will always pass,
382 * but not the second one. 386 * but not the second one.
383 */ 387 */
388#if 0 //TODO
384 if (ip > 2 * item_power && ip > (item_power + 3)) 389 if (ip > 2 * item_power && ip > (item_power + 3))
385 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif
386 } 392 }
387 393
388 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
389 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
390 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
391 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
392 { 398 {
393 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
394 * in that spell was stored in sp. 400 * in that spell was stored in sp.
395 */ 401 */
396 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
397 insert_ob_in_ob (tmp, this); 403 insert_ob_in_ob (tmp, this);
398 randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
… …
403 { 409 {
404 object *tmp = get_archetype_by_object_name (slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
405 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
406 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
407 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
408 value = arch->clone.value * inv->value; 414 value = arch->value * inv->value;
409 } 415 }
410 416
411 if (QUERY_FLAG (this, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
412 { 418 {
413 if (stats.hp > stats.maxhp) 419 if (stats.hp > stats.maxhp)
… …
510 516
511next: ; 517next: ;
512 } 518 }
513} 519}
514 520
515#define GET_FLAG(op,flag) \ 521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
516 if (f.get_sint32 ()) \
517 SET_FLAG (op, flag); \
518 else \
519 CLEAR_FLAG (op, flag) \
520 522
521bool 523bool
522object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
523{ 525{
524 object *op_inv = inv; 526 object *op_inv = inv;
… …
538 uuid.seq = seq; 540 uuid.seq = seq;
539 break; 541 break;
540 } 542 }
541 } 543 }
542 544
543 uuid = gen_uuid (); 545 uuid = UUID::gen ();
544 break; 546 break;
545 547
546 case KW_oid: 548 case KW_oid:
547 f.get (this, f.get_sint32 ()); 549 f.get (this, f.get_sint32 ());
548 break; 550 break;
… …
554 556
555 case KW_attach: f.get_ornull (attach); break; 557 case KW_attach: f.get_ornull (attach); break;
556 case KW_skill: f.get_ornull (skill); break; 558 case KW_skill: f.get_ornull (skill); break;
557 case KW_race: f.get_ornull (race); break; 559 case KW_race: f.get_ornull (race); break;
558 case KW_slaying: f.get_ornull (slaying); break; 560 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break;
559 562
560 case KW_arch: 563 case KW_arch:
561 { 564 {
562 object *tmp = object::read (f); 565 object *tmp = object::read (f);
563 tmp->deactivate (); 566 tmp->deactivate ();
… …
565 { 568 {
566 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
567 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
568 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
569 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects
570 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
571 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
572 576
573 if (!op_inv) 577 if (!op_inv)
574 { 578 {
… …
599 603
600 if (!other_arch) 604 if (!other_arch)
601 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
602 break; 606 break;
603 607
608 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ());
610 break;
611
604 case KW_animation: 612 case KW_animation:
605 { 613 {
606 CLEAR_FLAG (this, FLAG_ANIMATE); 614 CLEAR_FLAG (this, FLAG_ANIMATE);
607 animation_id = 0; 615 animation_id = 0;
608 616
… …
633 f.get (move_slow_penalty); 641 f.get (move_slow_penalty);
634 break; 642 break;
635 643
636 case KW_face: 644 case KW_face:
637 face = face_find (f.get_str ()); 645 face = face_find (f.get_str ());
646 break;
647
648 case KW_sound:
649 sound = sound_find (f.get_str ());
650 if (!sound)
651 f.parse_warn ("sound not found");
652 break;
653
654 case KW_sound_destroy:
655 sound_destroy = sound_find (f.get_str ());
656 if (!sound_destroy)
657 f.parse_warn ("sound not found");
638 break; 658 break;
639 659
640 case KW_x: f.get (x); break; 660 case KW_x: f.get (x); break;
641 case KW_y: f.get (y); break; 661 case KW_y: f.get (y); break;
642 662
… …
769 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 789 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
770 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 790 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
771 791
772 break; 792 break;
773 793
774 case KW_wiz:
775 GET_FLAG (this, FLAG_WIZ);
776 //TODO: move to check_object
777 if (QUERY_FLAG (this, FLAG_WIZ))
778 {
779 SET_FLAG (this, FLAG_WAS_WIZ);
780 SET_FLAG (this, FLAG_WIZPASS);
781 SET_FLAG (this, FLAG_WIZCAST);
782 }
783 else
784 {
785 CLEAR_FLAG (this, FLAG_WIZPASS);
786 CLEAR_FLAG (this, FLAG_WIZCAST);
787 }
788 break;
789
790 case KW_friendly: 794 case KW_friendly:
791 if (f.get_sint32 ()) 795 if (f.get_bool ())
792 if (type != PLAYER) 796 if (type != PLAYER)
793 add_friendly_object (this); 797 add_friendly_object (this);
794 798
795 break; 799 break;
796 800
… …
825 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 829 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
826 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 830 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
827 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 831 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
828 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 832 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
829 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 833 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
830 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
831 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 834 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 835 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 836 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
834 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 837 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 838 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
973 randomitems = 0; 976 randomitems = 0;
974 break; 977 break;
975 978
976 case KW_msg: 979 case KW_msg:
977 f.get_ml (KW_endmsg, msg); 980 f.get_ml (KW_endmsg, msg);
978 //TODO: allow longer messages
979 if (strlen (msg) >= HUGE_BUF)
980 {
981 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
982 msg = "ERROR, please report: string too long, winged.\n";
983 }
984 break; 981 break;
985 982
986 case KW_lore: 983 case KW_lore:
987 f.get_ml (KW_endlore, lore); 984 f.get_ml (KW_endlore, lore);
988 //TODO: allow longer messages
989 /* Just print a warning so we can be reasonably safe
990 * about not overflowing the buffer.
991 */
992 if (strlen (lore) > (HUGE_BUF / 2))
993 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
994 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
995 break; 985 break;
996 986
997 case KW_editable: 987 case KW_editable:
998 case KW_editor_folder: 988 case KW_editor_folder:
999 break; 989 break;
… …
1038 f.next (); 1028 f.next ();
1039 1029
1040 object *op = object::create (); 1030 object *op = object::create ();
1041 1031
1042 op->map = map; 1032 op->map = map;
1043 arch->clone.copy_to (op); 1033 arch->copy_to (op);
1044 // copy_to activates, this should be fixed properly 1034 // copy_to activates, this should be fixed properly
1045 op->deactivate (); 1035 op->deactivate ();
1046 1036
1047 if (!op->parse_kv (f)) 1037 if (!op->parse_kv (f))
1048 { 1038 {
… …
1063int 1053int
1064set_variable (object *op, char *buf) 1054set_variable (object *op, char *buf)
1065{ 1055{
1066 object_thawer f (buf, (AV *)0); 1056 object_thawer f (buf, (AV *)0);
1067 1057
1068 f.next ();
1069 return op->parse_kv (f); 1058 return op->parse_kv (f);
1070} 1059}
1071 1060
1072/* This returns a string of the integer movement type */ 1061/* This returns a string of the integer movement type */
1073#if 0 1062#if 0
… …
1135 * the 15'th element of this array should match that name. 1124 * the 15'th element of this array should match that name.
1136 * If an entry is NULL, that is a flag not to loaded/saved. 1125 * If an entry is NULL, that is a flag not to loaded/saved.
1137 */ 1126 */
1138 static const keyword flag_names [NUM_FLAGS] = { 1127 static const keyword flag_names [NUM_FLAGS] = {
1139 KW_alive, 1128 KW_alive,
1140 KW_wiz,
1141 KW_NULL, 1129 KW_NULL,
1142 KW_NULL, 1130 KW_NULL,
1143 KW_was_wiz, 1131 KW_NULL,
1132 KW_NULL,
1144 KW_applied, 1133 KW_applied,
1145 KW_unpaid, 1134 KW_unpaid,
1146 KW_can_use_shield, 1135 KW_can_use_shield,
1147 KW_no_pick, 1136 KW_no_pick,
1148 KW_NULL, // walk_on 1137 KW_NULL, // walk_on
… …
1285 char uids[64]; 1274 char uids[64];
1286 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1287 f.put (KW_uuid, (const char *)uids); 1276 f.put (KW_uuid, (const char *)uids);
1288 } 1277 }
1289 1278
1290#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1279#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1291#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1280#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1281
1282 if (object *owner = op->owner)
1283 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1292 1284
1293 CMP_OUT (name); 1285 CMP_OUT (name);
1294 CMP_OUT (name_pl); 1286 CMP_OUT (name_pl);
1295 CMP_OUT (custom_name); 1287 CMP_OUT (custom_name);
1296 CMP_OUT (title); 1288 CMP_OUT (title);
1297 CMP_OUT (race); 1289 CMP_OUT (race);
1298 CMP_OUT (slaying); 1290 CMP_OUT (slaying);
1299 1291 CMP_OUT (tag);
1300 if (op->msg != tmp->msg)
1301 f.put (KW_msg, KW_endmsg, op->msg);
1302 if (op->lore != tmp->lore)
1303 f.put (KW_lore, KW_endlore, op->lore);
1304
1305 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1306 1293
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1295 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1296
1307 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1308 1300
1309 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != tmp->animation_id)
1310 if (op->animation_id) 1302 if (op->animation_id)
1311 { 1303 {
1312 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1313 1305
1314 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1315 f.put (KW_is_animated, (sint32) 0); 1307 f.put (KW_is_animated, (sint32)0);
1316 } 1308 }
1317 else 1309 else
1318 f.put (KW_animation, (const char *) 0); 1310 f.put (KW_animation, (const char *)0);
1319 1311
1320 CMP_OUT2 (str, stats.Str); 1312 CMP_OUT2 (str, stats.Str);
1321 CMP_OUT2 (dex, stats.Dex); 1313 CMP_OUT2 (dex, stats.Dex);
1322 CMP_OUT2 (con, stats.Con); 1314 CMP_OUT2 (con, stats.Con);
1323 CMP_OUT2 (wis, stats.Wis); 1315 CMP_OUT2 (wis, stats.Wis);
… …
1354 CMP_OUT (type); 1346 CMP_OUT (type);
1355 CMP_OUT (subtype); 1347 CMP_OUT (subtype);
1356 CMP_OUT (attacktype); 1348 CMP_OUT (attacktype);
1357 1349
1358 for (i = 0; i < NROFATTACKS; i++) 1350 for (i = 0; i < NROFATTACKS; i++)
1359 if (op->resist[i] != tmp->resist[i]) 1351 if (expect_false (op->resist[i] != tmp->resist[i]))
1360 f.put (resist_save[i], op->resist[i]); 1352 f.put (resist_save[i], op->resist[i]);
1361 1353
1362 CMP_OUT (path_attuned); 1354 CMP_OUT (path_attuned);
1363 CMP_OUT (path_repelled); 1355 CMP_OUT (path_repelled);
1364 CMP_OUT (path_denied); 1356 CMP_OUT (path_denied);
… …
1406 CMP_OUT (move_slow); 1398 CMP_OUT (move_slow);
1407 CMP_OUT (move_slow_penalty); 1399 CMP_OUT (move_slow_penalty);
1408 1400
1409 if (op->flag != tmp->flag) 1401 if (op->flag != tmp->flag)
1410 for (i = 0; i <= NUM_FLAGS; i++) 1402 for (i = 0; i <= NUM_FLAGS; i++)
1411 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1412 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1404 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1413 1405
1414 // save body locations 1406 // save body locations
1415 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1416 if (op->slot[i].info != tmp->slot[i].info) 1408 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1417 f.put (body_locations[i].save_name, op->slot[i].info); 1409 f.put (body_locations[i].save_name, op->slot[i].info);
1418} 1410}
1419 1411
1420/* 1412/*
1421 * Dumps all variables in an object to a file. 1413 * Dumps all variables in an object to a file.
… …
1423 * the only place this is not set is when saving the player. 1415 * the only place this is not set is when saving the player.
1424 */ 1416 */
1425bool 1417bool
1426object::write (object_freezer &f) 1418object::write (object_freezer &f)
1427{ 1419{
1428 /* Even if the object does have an owner, it would seem that we should
1429 * still save it.
1430 */
1431 if (owner)
1432 return true;
1433
1434 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1435 1421
1436 f.put (KW_arch, at->name); 1422 f.put (KW_arch, at->archname);
1437 write_diff (f, this, &at->clone); 1423 write_diff (f, this, at);
1438 1424
1439 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1440 tmp->write (f); 1426 tmp->write (f);
1441 1427
1442 f.put (this); 1428 f.put (this);
… …
1454 object_thawer f (filename); 1440 object_thawer f (filename);
1455 1441
1456 bool success = false; 1442 bool success = false;
1457 bool seen_arch = false; 1443 bool seen_arch = false;
1458 1444
1459 f.next ();
1460
1461 for (;;) 1445 for (;;)
1462 { 1446 {
1463 switch (f.kw) 1447 switch (f.kw)
1464 { 1448 {
1465 case KW_region: 1449 case KW_region:

Diff Legend

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