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.81 by root, Mon May 14 21:32:26 2007 UTC vs.
Revision 1.112 by root, Tue Apr 29 15:19:30 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,2008 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
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 23
29#include <global.h> 24#include <global.h>
30#include <loader.h> 25#include <loader.h>
31#include <sproto.h> 26#include <sproto.h>
32 27
33///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
34 31
35/* This table is only necessary to convert objects that existed before the 32/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 33 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 34 * 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 35 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 165 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 166 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 167 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 168 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 169 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 170 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 171 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 172 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 173 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 174 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 175 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 247 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 248 "spell_glyph", /* 205 */
252 NULL 249 NULL
253}; 250};
254 251
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 252/* 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 253 * 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 254 * 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. 255 * to check for objects to make sure there are no common errors.
261 */ 256 */
262void 257void
263object::post_load_check () 258object::post_load_check ()
264{ 259{
260 if (type >= NUM_TYPES)
261 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0;
264 }
265
265 switch (type) 266 switch (type)
266 { 267 {
267 case BOW: 268 case BOW:
268 case WAND: 269 case WAND:
269 case ROD: 270 case ROD:
… …
319 * also have to catch is if this object is not using the normal name for 320 * also have to catch is if this object is not using the normal name for
320 * the object. In that case, we also want to use the loaded name. 321 * the object. In that case, we also want to use the loaded name.
321 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
322 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
323 */ 324 */
324 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 325 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
325 name_pl = 0; 326 name_pl = 0;
326 327
327 if (!name_pl) 328 if (!name_pl)
328 name_pl = name; 329 name_pl = name;
329 330
… …
356 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
357 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
358 { 359 {
359 if (last_heal) 360 if (last_heal)
360 { 361 {
361 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
362 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
363 last_heal = 0; 364 last_heal = 0;
364 } 365 }
365 366
366 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
… …
378 * something that has item_power 1 is probably just fine if our calculated 379 * something that has item_power 1 is probably just fine if our calculated
379 * value is 1 or 2 - these values are small enough that hard to be precise. 380 * value is 1 or 2 - these values are small enough that hard to be precise.
380 * similarly, it item_power is 0, the first check will always pass, 381 * similarly, it item_power is 0, the first check will always pass,
381 * but not the second one. 382 * but not the second one.
382 */ 383 */
384#if 0 //TODO
383 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
384 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif
385 } 388 }
386 389
387 /* Old spellcasting object - need to load in the appropiate object */ 390 /* Old spellcasting object - need to load in the appropiate object */
388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
389 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 392 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
390 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
391 { 394 {
392 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
393 * in that spell was stored in sp. 396 * in that spell was stored in sp.
394 */ 397 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
395 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
396 insert_ob_in_ob (tmp, this); 400 insert_ob_in_ob (tmp, this);
397 randomitems = NULL; /* So another spell isn't created for this object */ 401 randomitems = NULL; /* So another spell isn't created for this object */
398 } 402 }
399 403
400 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
401 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
402 { 406 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
403 object *tmp = get_archetype_by_object_name (slaying); 408 object *tmp = get_archetype_by_object_name (slaying);
404 insert_ob_in_ob (tmp, this); 409 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 410 randomitems = NULL; /* So another spell isn't created for this object */
406 /* without this, value is all screwed up */ 411 /* without this, value is all screwed up */
407 value = arch->clone.value * inv->value; 412 value = arch->value * inv->value;
408 } 413 }
409 414
410 if (QUERY_FLAG (this, FLAG_MONSTER)) 415 if (QUERY_FLAG (this, FLAG_MONSTER))
411 { 416 {
412 if (stats.hp > stats.maxhp) 417 if (stats.hp > stats.maxhp)
413 { 418 {
414 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 419 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
415 stats.maxhp = stats.hp; 420 stats.maxhp = stats.hp;
416 } 421 }
417 422
418 /* The archs just need to be updated for this */ 423 /* The archs just need to be updated for this */
419 if (move_type == 0) 424 if (move_type == 0)
420 move_type = MOVE_WALK; 425 move_type = MOVE_WALK;
421 } 426 }
422 427
423 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 428 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
424 {
425 /* Object will duplicate it's content as part of the 429 /* Object will duplicate it's content as part of the
426 * generation process. To do this, we must flag inventory 430 * generation process. To do this, we must flag inventory
427 * so it remains unevaluated concerning the randomitems and 431 * so it remains unevaluated concerning the randomitems and
428 * the living (a demonlord shouldn't cast from inside generator!) 432 * the living (a demonlord shouldn't cast from inside generator!)
429 */ 433 */
434 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
430 flag_inv (this, FLAG_IS_A_TEMPLATE); 435 flag_inv (this, FLAG_IS_A_TEMPLATE);
431 }
432 436
433 /* Handle player movers. We use move_type for player movers 437 /* Handle player movers. We use move_type for player movers
434 * because they operate on their own time (move_on 438 * because they operate on their own time (move_on
435 * would potentially cause them to be triggered when someone steps 439 * would potentially cause them to be triggered when someone steps
436 * on them). If move_type is set, presume person knows what they 440 * on them). If move_type is set, presume person knows what they
437 * are doing, otherwise, set move_type based on maxhp value. 441 * are doing, otherwise, set move_type based on maxhp value.
438 */ 442 */
439 if (type == PLAYERMOVER) 443 if (type == PLAYERMOVER)
440 { 444 {
441 if (!move_type) 445 if (!move_type)
… …
503 507
504 goto next; 508 goto next;
505 } 509 }
506 } 510 }
507 511
508 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 512 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
509 513
510next: ; 514next: ;
511 } 515 }
512} 516}
513 517
514#define GET_FLAG(op,flag) \ 518#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
515 if (f.get_sint32 ()) \
516 SET_FLAG (op, flag); \
517 else \
518 CLEAR_FLAG (op, flag) \
519 519
520bool 520bool
521object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
522{ 522{
523 object *op_inv = inv; 523 object *op_inv = inv;
… …
526 { 526 {
527 switch (f.kw) 527 switch (f.kw)
528 { 528 {
529 case KW_uuid: 529 case KW_uuid:
530 if (const char *s = f.get_str ()) 530 if (const char *s = f.get_str ())
531 { 531 if (!uuid.parse (s))
532 unsigned int version;
533 unsigned long long seq;
534
535 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
536 { 532 {
537 uuid.seq = seq; 533 f.parse_warn ("unparseable uuid");
538 break; 534 uuid = UUID::gen ();
539 } 535 }
540 }
541
542 uuid = gen_uuid ();
543 break; 536 break;
544 537
545 case KW_oid: 538 case KW_oid:
546 f.get (this, f.get_sint32 ()); 539 f.get (this, f.get_sint32 ());
547 break; 540 break;
… …
553 546
554 case KW_attach: f.get_ornull (attach); break; 547 case KW_attach: f.get_ornull (attach); break;
555 case KW_skill: f.get_ornull (skill); break; 548 case KW_skill: f.get_ornull (skill); break;
556 case KW_race: f.get_ornull (race); break; 549 case KW_race: f.get_ornull (race); break;
557 case KW_slaying: f.get_ornull (slaying); break; 550 case KW_slaying: f.get_ornull (slaying); break;
551 case KW_tag: f.get_ornull (tag); break;
558 552
559 case KW_arch: 553 case KW_arch:
560 { 554 {
561 object *tmp = object::read (f); 555 object *tmp = object::read (f);
562 tmp->deactivate (); 556 tmp->deactivate ();
… …
564 { 558 {
565 // was: insert_ob_in_ob (tmp, op); 559 // was: insert_ob_in_ob (tmp, op);
566 // but manually adding it can improve map loading times a lot 560 // but manually adding it can improve map loading times a lot
567 // also, appending instead of prepending keeps the 561 // also, appending instead of prepending keeps the
568 // save ordering the same between repeated load/saves. 562 // save ordering the same between repeated load/saves.
563 // and finally we do not want any funny effects
569 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 564 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
570 CLEAR_FLAG (tmp, FLAG_REMOVED); 565 CLEAR_FLAG (tmp, FLAG_REMOVED);
571 566
572 if (!op_inv) 567 if (!op_inv)
573 { 568 {
… …
589 } 584 }
590 } 585 }
591 continue; 586 continue;
592 587
593 case KW_other_arch: 588 case KW_other_arch:
594 other_arch =
595 loading_arch 589 if (loading_arch == this)
596 ? archetype::get (f.get_str ()) 590 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
591 else
592 {
597 : archetype::find (f.get_str ()); 593 other_arch = archetype::find (f.get_str ());
598 594
599 if (!other_arch) 595 if (!other_arch)
600 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 596 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
597 }
598 break;
599
600 case KW_owner:
601 f.delayed_deref (this, owner, f.get_str ());
601 break; 602 break;
602 603
603 case KW_animation: 604 case KW_animation:
604 { 605 {
605 CLEAR_FLAG (this, FLAG_ANIMATE); 606 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
632 f.get (move_slow_penalty); 633 f.get (move_slow_penalty);
633 break; 634 break;
634 635
635 case KW_face: 636 case KW_face:
636 face = face_find (f.get_str ()); 637 face = face_find (f.get_str ());
638 break;
639
640 case KW_sound:
641 sound = sound_find (f.get_str ());
642 if (!sound)
643 f.parse_warn ("sound not found");
644 break;
645
646 case KW_sound_destroy:
647 sound_destroy = sound_find (f.get_str ());
648 if (!sound_destroy)
649 f.parse_warn ("sound not found");
637 break; 650 break;
638 651
639 case KW_x: f.get (x); break; 652 case KW_x: f.get (x); break;
640 case KW_y: f.get (y); break; 653 case KW_y: f.get (y); break;
641 654
… …
768 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 781 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 782 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
770 783
771 break; 784 break;
772 785
773 case KW_wiz:
774 GET_FLAG (this, FLAG_WIZ);
775 //TODO: move to check_object
776 if (QUERY_FLAG (this, FLAG_WIZ))
777 {
778 SET_FLAG (this, FLAG_WAS_WIZ);
779 SET_FLAG (this, FLAG_WIZPASS);
780 SET_FLAG (this, FLAG_WIZCAST);
781 }
782 else
783 {
784 CLEAR_FLAG (this, FLAG_WIZPASS);
785 CLEAR_FLAG (this, FLAG_WIZCAST);
786 }
787 break;
788
789 case KW_friendly: 786 case KW_friendly:
790 if (f.get_sint32 ()) 787 if (f.get_bool ())
791 if (type != PLAYER) 788 if (type != PLAYER)
792 add_friendly_object (this); 789 add_friendly_object (this);
793 790
794 break; 791 break;
795 792
… …
808 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 805 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
809 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 806 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
810 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 807 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
811 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 808 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
812 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 809 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
810 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
813 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 811 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
814 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 812 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
815 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 813 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
816 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 814 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
817 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 815 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
824 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 822 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
825 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 823 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
826 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 824 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
827 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 825 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
828 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 826 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
829 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
830 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 827 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
831 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 828 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
832 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 829 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
833 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 830 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
834 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 831 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
972 randomitems = 0; 969 randomitems = 0;
973 break; 970 break;
974 971
975 case KW_msg: 972 case KW_msg:
976 f.get_ml (KW_endmsg, msg); 973 f.get_ml (KW_endmsg, msg);
977 //TODO: allow longer messages
978 if (strlen (msg) >= HUGE_BUF)
979 {
980 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
981 msg = "ERROR, please report: string too long, winged.\n";
982 }
983 break; 974 break;
984 975
985 case KW_lore: 976 case KW_lore:
986 f.get_ml (KW_endlore, lore); 977 f.get_ml (KW_endlore, lore);
987 //TODO: allow longer messages
988 /* Just print a warning so we can be reasonably safe
989 * about not overflowing the buffer.
990 */
991 if (strlen (lore) > (HUGE_BUF / 2))
992 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
993 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
994 break; 978 break;
995 979
996 case KW_editable: 980 case KW_editable:
997 case KW_editor_folder: 981 case KW_editor_folder:
998 break; 982 break;
… …
1037 f.next (); 1021 f.next ();
1038 1022
1039 object *op = object::create (); 1023 object *op = object::create ();
1040 1024
1041 op->map = map; 1025 op->map = map;
1042 arch->clone.copy_to (op); 1026 arch->copy_to (op);
1043 // copy_to activates, this should be fixed properly 1027 // copy_to activates, this should be fixed properly
1044 op->deactivate (); 1028 op->deactivate ();
1045 1029
1046 if (!op->parse_kv (f)) 1030 if (!op->parse_kv (f))
1047 { 1031 {
… …
1062int 1046int
1063set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1064{ 1048{
1065 object_thawer f (buf, (AV *)0); 1049 object_thawer f (buf, (AV *)0);
1066 1050
1067 f.next ();
1068 return op->parse_kv (f); 1051 return op->parse_kv (f);
1069} 1052}
1070 1053
1071/* This returns a string of the integer movement type */ 1054/* This returns a string of the integer movement type */
1072#if 0 1055#if 0
… …
1134 * the 15'th element of this array should match that name. 1117 * the 15'th element of this array should match that name.
1135 * If an entry is NULL, that is a flag not to loaded/saved. 1118 * If an entry is NULL, that is a flag not to loaded/saved.
1136 */ 1119 */
1137 static const keyword flag_names [NUM_FLAGS] = { 1120 static const keyword flag_names [NUM_FLAGS] = {
1138 KW_alive, 1121 KW_alive,
1139 KW_wiz,
1140 KW_NULL, 1122 KW_NULL,
1141 KW_NULL, 1123 KW_NULL,
1142 KW_was_wiz, 1124 KW_NULL,
1125 KW_NULL,
1143 KW_applied, 1126 KW_applied,
1144 KW_unpaid, 1127 KW_unpaid,
1145 KW_can_use_shield, 1128 KW_can_use_shield,
1146 KW_no_pick, 1129 KW_no_pick,
1147 KW_NULL, // walk_on 1130 KW_NULL, // walk_on
… …
1278 1261
1279 /* We don't need to worry about the arch's extra fields - they 1262 /* We don't need to worry about the arch's extra fields - they
1280 * will get taken care of the copy_to method. 1263 * will get taken care of the copy_to method.
1281 */ 1264 */
1282 1265
1283 { 1266 f.put (KW_uuid, op->uuid.c_str ());
1284 char uids[64];
1285 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1286 f.put (KW_uuid, (const char *)uids);
1287 }
1288 1267
1289#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1268#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1290#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1269#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1270
1271 if (object *owner = op->owner)
1272 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1291 1273
1292 CMP_OUT (name); 1274 CMP_OUT (name);
1293 CMP_OUT (name_pl); 1275 CMP_OUT (name_pl);
1294 CMP_OUT (custom_name); 1276 CMP_OUT (custom_name);
1295 CMP_OUT (title); 1277 CMP_OUT (title);
1296 CMP_OUT (race); 1278 CMP_OUT (race);
1279 CMP_OUT (skill);
1297 CMP_OUT (slaying); 1280 CMP_OUT (slaying);
1298 1281 CMP_OUT (tag);
1299 if (op->msg != tmp->msg)
1300 f.put (KW_msg, KW_endmsg, op->msg);
1301 if (op->lore != tmp->lore)
1302 f.put (KW_lore, KW_endlore, op->lore);
1303
1304 CMP_OUT (other_arch); 1282 CMP_OUT (other_arch);
1305 1283
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1285 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1286
1306 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1287 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1288 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1307 1290
1308 if (op->animation_id != tmp->animation_id) 1291 if (op->animation_id != tmp->animation_id)
1309 if (op->animation_id) 1292 if (op->animation_id)
1310 { 1293 {
1311 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1312 1295
1313 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1314 f.put (KW_is_animated, (sint32) 0); 1297 f.put (KW_is_animated, (sint32)0);
1315 } 1298 }
1316 else 1299 else
1317 f.put (KW_animation, (const char *) 0); 1300 f.put (KW_animation, (const char *)0);
1318 1301
1319 CMP_OUT2 (str, stats.Str); 1302 CMP_OUT2 (str, stats.Str);
1320 CMP_OUT2 (dex, stats.Dex); 1303 CMP_OUT2 (dex, stats.Dex);
1321 CMP_OUT2 (con, stats.Con); 1304 CMP_OUT2 (con, stats.Con);
1322 CMP_OUT2 (wis, stats.Wis); 1305 CMP_OUT2 (wis, stats.Wis);
… …
1353 CMP_OUT (type); 1336 CMP_OUT (type);
1354 CMP_OUT (subtype); 1337 CMP_OUT (subtype);
1355 CMP_OUT (attacktype); 1338 CMP_OUT (attacktype);
1356 1339
1357 for (i = 0; i < NROFATTACKS; i++) 1340 for (i = 0; i < NROFATTACKS; i++)
1358 if (op->resist[i] != tmp->resist[i]) 1341 if (expect_false (op->resist[i] != tmp->resist[i]))
1359 f.put (resist_save[i], op->resist[i]); 1342 f.put (resist_save[i], op->resist[i]);
1360 1343
1361 CMP_OUT (path_attuned); 1344 CMP_OUT (path_attuned);
1362 CMP_OUT (path_repelled); 1345 CMP_OUT (path_repelled);
1363 CMP_OUT (path_denied); 1346 CMP_OUT (path_denied);
… …
1405 CMP_OUT (move_slow); 1388 CMP_OUT (move_slow);
1406 CMP_OUT (move_slow_penalty); 1389 CMP_OUT (move_slow_penalty);
1407 1390
1408 if (op->flag != tmp->flag) 1391 if (op->flag != tmp->flag)
1409 for (i = 0; i <= NUM_FLAGS; i++) 1392 for (i = 0; i <= NUM_FLAGS; i++)
1410 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1411 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1394 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1412 1395
1413 // save body locations 1396 // save body locations
1414 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1415 if (op->slot[i].info != tmp->slot[i].info) 1398 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1416 f.put (body_locations[i].save_name, op->slot[i].info); 1399 f.put (body_locations[i].save_name, op->slot[i].info);
1417} 1400}
1418 1401
1419/* 1402/*
1420 * Dumps all variables in an object to a file. 1403 * Dumps all variables in an object to a file.
… …
1422 * the only place this is not set is when saving the player. 1405 * the only place this is not set is when saving the player.
1423 */ 1406 */
1424bool 1407bool
1425object::write (object_freezer &f) 1408object::write (object_freezer &f)
1426{ 1409{
1427 /* Even if the object does have an owner, it would seem that we should 1410 archetype *at = arch ? arch : archetype::empty;
1428 * still save it.
1429 */
1430 if (owner)
1431 return true;
1432 1411
1433 archetype *at = arch ? (archetype *)arch : empty_archetype;
1434
1435 f.put (KW_arch, at->name); 1412 f.put (KW_arch, at->archname);
1436 write_diff (f, this, &at->clone); 1413 write_diff (f, this, at);
1437 1414
1438 for (object *tmp = inv; tmp; tmp = tmp->below) 1415 for (object *tmp = inv; tmp; tmp = tmp->below)
1439 tmp->write (f); 1416 tmp->write (f);
1440 1417
1441 f.put (this); 1418 f.put (this);
… …
1446 1423
1447///////////////////////////////////////////////////////////////////////////// 1424/////////////////////////////////////////////////////////////////////////////
1448 1425
1449// generic resource file load, 1426// generic resource file load,
1450// currently supports: region, treasures, archetypes 1427// currently supports: region, treasures, archetypes
1428bool
1451bool load_resource_file (const char *filename) 1429load_resource_file_ (const char *filename)
1452{ 1430{
1453 object_thawer f (filename); 1431 object_thawer f (filename);
1454
1455 bool success = false;
1456 bool seen_arch = false;
1457
1458 f.next ();
1459 1432
1460 for (;;) 1433 for (;;)
1461 { 1434 {
1462 switch (f.kw) 1435 switch (f.kw)
1463 { 1436 {
1464 case KW_region: 1437 case KW_region:
1465 if (!region::read (f)) 1438 if (!region::read (f))
1466 goto finish; 1439 return false;
1467 break; 1440 break;
1468 1441
1469 case KW_treasure: 1442 case KW_treasure:
1470 case KW_treasureone: 1443 case KW_treasureone:
1471 if (!treasurelist::read (f)) 1444 if (!treasurelist::read (f))
1472 goto finish; 1445 return false;
1473 break; 1446 break;
1474 1447
1475 case KW_object: 1448 case KW_object:
1476 seen_arch = true;
1477 if (!archetype::read (f)) 1449 if (!archetype::read (f))
1478 goto finish; 1450 return false;
1479 break; 1451 break;
1480 1452
1481 case KW_EOF: 1453 case KW_EOF:
1482 success = true; 1454 return true;
1483 goto finish;
1484 1455
1485 default: 1456 default:
1486 if (!f.parse_error ("resource file")) 1457 if (!f.parse_error ("resource file"))
1487 goto finish; 1458 return false;
1488 1459
1489 f.next (); 1460 f.next ();
1490 break; 1461 break;
1491 } 1462 }
1492 } 1463 }
1493
1494finish:
1495 if (seen_arch)
1496 init_archetype_pointers ();
1497
1498 return success;
1499} 1464}
1500 1465

Diff Legend

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