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.87 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.109 by root, Sun Apr 20 00:44:12 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <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 */
… …
325 * 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
326 * 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.
327 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 328 */
330 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)
331 name_pl = 0; 330 name_pl = 0;
332 331
333 if (!name_pl) 332 if (!name_pl)
334 name_pl = name; 333 name_pl = name;
335 334
… …
362 || type == AMULET || type == GIRDLE 361 || type == AMULET || type == GIRDLE
363 || type == BRACERS || type == CLOAK) 362 || type == BRACERS || type == CLOAK)
364 { 363 {
365 if (last_heal) 364 if (last_heal)
366 { 365 {
367 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 366 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
368 gen_sp_armour = last_heal; 367 gen_sp_armour = last_heal;
369 last_heal = 0; 368 last_heal = 0;
370 } 369 }
371 370
372 int ip = calc_item_power (this, 0); 371 int ip = calc_item_power (this, 0);
… …
395 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
397 /* 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 */
398 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
399 { 398 {
400 /* 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'
401 * in that spell was stored in sp. 400 * in that spell was stored in sp.
402 */ 401 */
402 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
404 insert_ob_in_ob (tmp, this); 404 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
406 } 406 }
407 407
408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
410 { 410 {
411 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
411 object *tmp = get_archetype_by_object_name (slaying); 412 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = NULL; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 415 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 416 value = arch->value * inv->value;
416 } 417 }
417 418
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 419 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 420 {
420 if (stats.hp > stats.maxhp) 421 if (stats.hp > stats.maxhp)
421 { 422 {
422 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 423 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
423 stats.maxhp = stats.hp; 424 stats.maxhp = stats.hp;
424 } 425 }
425 426
426 /* The archs just need to be updated for this */ 427 /* The archs just need to be updated for this */
427 if (move_type == 0) 428 if (move_type == 0)
428 move_type = MOVE_WALK; 429 move_type = MOVE_WALK;
429 } 430 }
430 431
431 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 432 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
432 {
433 /* Object will duplicate it's content as part of the 433 /* Object will duplicate it's content as part of the
434 * generation process. To do this, we must flag inventory 434 * generation process. To do this, we must flag inventory
435 * so it remains unevaluated concerning the randomitems and 435 * so it remains unevaluated concerning the randomitems and
436 * the living (a demonlord shouldn't cast from inside generator!) 436 * the living (a demonlord shouldn't cast from inside generator!)
437 */ 437 */
438 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
438 flag_inv (this, FLAG_IS_A_TEMPLATE); 439 flag_inv (this, FLAG_IS_A_TEMPLATE);
439 }
440 440
441 /* Handle player movers. We use move_type for player movers 441 /* Handle player movers. We use move_type for player movers
442 * because they operate on their own time (move_on 442 * because they operate on their own time (move_on
443 * would potentially cause them to be triggered when someone steps 443 * would potentially cause them to be triggered when someone steps
444 * on them). If move_type is set, presume person knows what they 444 * on them). If move_type is set, presume person knows what they
445 * are doing, otherwise, set move_type based on maxhp value. 445 * are doing, otherwise, set move_type based on maxhp value.
446 */ 446 */
447 if (type == PLAYERMOVER) 447 if (type == PLAYERMOVER)
448 { 448 {
449 if (!move_type) 449 if (!move_type)
… …
511 511
512 goto next; 512 goto next;
513 } 513 }
514 } 514 }
515 515
516 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 516 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
517 517
518next: ; 518next: ;
519 } 519 }
520} 520}
521 521
… …
530 { 530 {
531 switch (f.kw) 531 switch (f.kw)
532 { 532 {
533 case KW_uuid: 533 case KW_uuid:
534 if (const char *s = f.get_str ()) 534 if (const char *s = f.get_str ())
535 { 535 if (!uuid.parse (s))
536 unsigned int version;
537 unsigned long long seq;
538
539 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
540 { 536 {
541 uuid.seq = seq; 537 f.parse_warn ("unparseable uuid");
542 break; 538 uuid = UUID::gen ();
543 } 539 }
544 }
545
546 uuid = gen_uuid ();
547 break; 540 break;
548 541
549 case KW_oid: 542 case KW_oid:
550 f.get (this, f.get_sint32 ()); 543 f.get (this, f.get_sint32 ());
551 break; 544 break;
… …
557 550
558 case KW_attach: f.get_ornull (attach); break; 551 case KW_attach: f.get_ornull (attach); break;
559 case KW_skill: f.get_ornull (skill); break; 552 case KW_skill: f.get_ornull (skill); break;
560 case KW_race: f.get_ornull (race); break; 553 case KW_race: f.get_ornull (race); break;
561 case KW_slaying: f.get_ornull (slaying); break; 554 case KW_slaying: f.get_ornull (slaying); break;
555 case KW_tag: f.get_ornull (tag); break;
562 556
563 case KW_arch: 557 case KW_arch:
564 { 558 {
565 object *tmp = object::read (f); 559 object *tmp = object::read (f);
566 tmp->deactivate (); 560 tmp->deactivate ();
… …
568 { 562 {
569 // was: insert_ob_in_ob (tmp, op); 563 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 564 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 565 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 566 // save ordering the same between repeated load/saves.
567 // and finally we do not want any funny effects
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 568 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 569 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 570
576 if (!op_inv) 571 if (!op_inv)
577 { 572 {
… …
593 } 588 }
594 } 589 }
595 continue; 590 continue;
596 591
597 case KW_other_arch: 592 case KW_other_arch:
598 other_arch =
599 loading_arch 593 if (loading_arch == this)
600 ? archetype::get (f.get_str ()) 594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
595 else
596 {
601 : archetype::find (f.get_str ()); 597 other_arch = archetype::find (f.get_str ());
602 598
603 if (!other_arch) 599 if (!other_arch)
604 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 600 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
601 }
602 break;
603
604 case KW_owner:
605 f.delayed_deref (this, owner, f.get_str ());
605 break; 606 break;
606 607
607 case KW_animation: 608 case KW_animation:
608 { 609 {
609 CLEAR_FLAG (this, FLAG_ANIMATE); 610 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
636 f.get (move_slow_penalty); 637 f.get (move_slow_penalty);
637 break; 638 break;
638 639
639 case KW_face: 640 case KW_face:
640 face = face_find (f.get_str ()); 641 face = face_find (f.get_str ());
642 break;
643
644 case KW_sound:
645 sound = sound_find (f.get_str ());
646 if (!sound)
647 f.parse_warn ("sound not found");
648 break;
649
650 case KW_sound_destroy:
651 sound_destroy = sound_find (f.get_str ());
652 if (!sound_destroy)
653 f.parse_warn ("sound not found");
641 break; 654 break;
642 655
643 case KW_x: f.get (x); break; 656 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 657 case KW_y: f.get (y); break;
645 658
… …
796 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
797 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 810 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
798 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
799 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
800 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 813 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
814 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
801 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
802 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
803 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
804 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
805 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
959 randomitems = 0; 973 randomitems = 0;
960 break; 974 break;
961 975
962 case KW_msg: 976 case KW_msg:
963 f.get_ml (KW_endmsg, msg); 977 f.get_ml (KW_endmsg, msg);
964 //TODO: allow longer messages
965 if (strlen (msg) >= HUGE_BUF)
966 {
967 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
968 msg = "ERROR, please report: string too long, winged.\n";
969 }
970 break; 978 break;
971 979
972 case KW_lore: 980 case KW_lore:
973 f.get_ml (KW_endlore, lore); 981 f.get_ml (KW_endlore, lore);
974 //TODO: allow longer messages
975 /* Just print a warning so we can be reasonably safe
976 * about not overflowing the buffer.
977 */
978 if (strlen (lore) > (HUGE_BUF / 2))
979 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
980 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
981 break; 982 break;
982 983
983 case KW_editable: 984 case KW_editable:
984 case KW_editor_folder: 985 case KW_editor_folder:
985 break; 986 break;
… …
1024 f.next (); 1025 f.next ();
1025 1026
1026 object *op = object::create (); 1027 object *op = object::create ();
1027 1028
1028 op->map = map; 1029 op->map = map;
1029 arch->clone.copy_to (op); 1030 arch->copy_to (op);
1030 // copy_to activates, this should be fixed properly 1031 // copy_to activates, this should be fixed properly
1031 op->deactivate (); 1032 op->deactivate ();
1032 1033
1033 if (!op->parse_kv (f)) 1034 if (!op->parse_kv (f))
1034 { 1035 {
… …
1049int 1050int
1050set_variable (object *op, char *buf) 1051set_variable (object *op, char *buf)
1051{ 1052{
1052 object_thawer f (buf, (AV *)0); 1053 object_thawer f (buf, (AV *)0);
1053 1054
1054 f.next ();
1055 return op->parse_kv (f); 1055 return op->parse_kv (f);
1056} 1056}
1057 1057
1058/* This returns a string of the integer movement type */ 1058/* This returns a string of the integer movement type */
1059#if 0 1059#if 0
… …
1265 1265
1266 /* We don't need to worry about the arch's extra fields - they 1266 /* We don't need to worry about the arch's extra fields - they
1267 * will get taken care of the copy_to method. 1267 * will get taken care of the copy_to method.
1268 */ 1268 */
1269 1269
1270 { 1270 f.put (KW_uuid, op->uuid.c_str ());
1271 char uids[64];
1272 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1273 f.put (KW_uuid, (const char *)uids);
1274 }
1275 1271
1276#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1272#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1277#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1273#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1274
1275 if (object *owner = op->owner)
1276 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1278 1277
1279 CMP_OUT (name); 1278 CMP_OUT (name);
1280 CMP_OUT (name_pl); 1279 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1280 CMP_OUT (custom_name);
1282 CMP_OUT (title); 1281 CMP_OUT (title);
1283 CMP_OUT (race); 1282 CMP_OUT (race);
1284 CMP_OUT (slaying); 1283 CMP_OUT (slaying);
1284 CMP_OUT (tag);
1285 CMP_OUT (other_arch);
1285 1286
1286 if (op->msg != tmp->msg) 1287 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1287 f.put (KW_msg, KW_endmsg, op->msg);
1288 if (op->lore != tmp->lore)
1289 f.put (KW_lore, KW_endlore, op->lore); 1288 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1290 if (op->other_arch != tmp->other_arch)
1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
1292 1289
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1290 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1291 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1292 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1294 1293
1295 if (op->animation_id != tmp->animation_id) 1294 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1295 if (op->animation_id)
1297 { 1296 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1299 1298
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0); 1300 f.put (KW_is_animated, (sint32)0);
1302 } 1301 }
1303 else 1302 else
1304 f.put (KW_animation, (const char *) 0); 1303 f.put (KW_animation, (const char *)0);
1305 1304
1306 CMP_OUT2 (str, stats.Str); 1305 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1306 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1307 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1308 CMP_OUT2 (wis, stats.Wis);
… …
1340 CMP_OUT (type); 1339 CMP_OUT (type);
1341 CMP_OUT (subtype); 1340 CMP_OUT (subtype);
1342 CMP_OUT (attacktype); 1341 CMP_OUT (attacktype);
1343 1342
1344 for (i = 0; i < NROFATTACKS; i++) 1343 for (i = 0; i < NROFATTACKS; i++)
1345 if (op->resist[i] != tmp->resist[i]) 1344 if (expect_false (op->resist[i] != tmp->resist[i]))
1346 f.put (resist_save[i], op->resist[i]); 1345 f.put (resist_save[i], op->resist[i]);
1347 1346
1348 CMP_OUT (path_attuned); 1347 CMP_OUT (path_attuned);
1349 CMP_OUT (path_repelled); 1348 CMP_OUT (path_repelled);
1350 CMP_OUT (path_denied); 1349 CMP_OUT (path_denied);
… …
1392 CMP_OUT (move_slow); 1391 CMP_OUT (move_slow);
1393 CMP_OUT (move_slow_penalty); 1392 CMP_OUT (move_slow_penalty);
1394 1393
1395 if (op->flag != tmp->flag) 1394 if (op->flag != tmp->flag)
1396 for (i = 0; i <= NUM_FLAGS; i++) 1395 for (i = 0; i <= NUM_FLAGS; i++)
1397 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1396 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1398 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1397 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1399 1398
1400 // save body locations 1399 // save body locations
1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1400 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1402 if (op->slot[i].info != tmp->slot[i].info) 1401 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1403 f.put (body_locations[i].save_name, op->slot[i].info); 1402 f.put (body_locations[i].save_name, op->slot[i].info);
1404} 1403}
1405 1404
1406/* 1405/*
1407 * Dumps all variables in an object to a file. 1406 * Dumps all variables in an object to a file.
… …
1409 * the only place this is not set is when saving the player. 1408 * the only place this is not set is when saving the player.
1410 */ 1409 */
1411bool 1410bool
1412object::write (object_freezer &f) 1411object::write (object_freezer &f)
1413{ 1412{
1414 /* Even if the object does have an owner, it would seem that we should
1415 * still save it.
1416 */
1417 if (owner)
1418 return true;
1419
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1413 archetype *at = arch ? (archetype *)arch : archetype::empty;
1421 1414
1422 f.put (KW_arch, at->archname); 1415 f.put (KW_arch, at->archname);
1423 write_diff (f, this, &at->clone); 1416 write_diff (f, this, at);
1424 1417
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1418 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1419 tmp->write (f);
1427 1420
1428 f.put (this); 1421 f.put (this);
… …
1433 1426
1434///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1435 1428
1436// generic resource file load, 1429// generic resource file load,
1437// currently supports: region, treasures, archetypes 1430// currently supports: region, treasures, archetypes
1431bool
1438bool load_resource_file (const char *filename) 1432load_resource_file_ (const char *filename)
1439{ 1433{
1440 object_thawer f (filename); 1434 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444
1445 f.next ();
1446 1435
1447 for (;;) 1436 for (;;)
1448 { 1437 {
1449 switch (f.kw) 1438 switch (f.kw)
1450 { 1439 {
1451 case KW_region: 1440 case KW_region:
1452 if (!region::read (f)) 1441 if (!region::read (f))
1453 goto finish; 1442 return false;
1454 break; 1443 break;
1455 1444
1456 case KW_treasure: 1445 case KW_treasure:
1457 case KW_treasureone: 1446 case KW_treasureone:
1458 if (!treasurelist::read (f)) 1447 if (!treasurelist::read (f))
1459 goto finish; 1448 return false;
1460 break; 1449 break;
1461 1450
1462 case KW_object: 1451 case KW_object:
1463 seen_arch = true;
1464 if (!archetype::read (f)) 1452 if (!archetype::read (f))
1465 goto finish; 1453 return false;
1466 break; 1454 break;
1467 1455
1468 case KW_EOF: 1456 case KW_EOF:
1469 success = true; 1457 return true;
1470 goto finish;
1471 1458
1472 default: 1459 default:
1473 if (!f.parse_error ("resource file")) 1460 if (!f.parse_error ("resource file"))
1474 goto finish; 1461 return false;
1475 1462
1476 f.next (); 1463 f.next ();
1477 break; 1464 break;
1478 } 1465 }
1479 } 1466 }
1480
1481finish:
1482 if (seen_arch)
1483 init_archetype_pointers ();
1484
1485 return success;
1486} 1467}
1487 1468

Diff Legend

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