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.89 by root, Wed Jun 6 05:41:25 2007 UTC vs.
Revision 1.123 by root, Mon Sep 29 10:32:50 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
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 */
… …
362 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
363 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
364 { 359 {
365 if (last_heal) 360 if (last_heal)
366 { 361 {
367 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 ());
368 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
369 last_heal = 0; 364 last_heal = 0;
370 } 365 }
371 366
372 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
… …
390 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
391 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);
392#endif 387#endif
393 } 388 }
394 389
395 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
398 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
399 { 403 {
404 // TODO: fix firewall object on map
400 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
401 * in that spell was stored in sp. 406 * in that spell was stored in sp.
402 */ 407 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
404 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
406 } 412 }
407 413
408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
410 { 416 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
411 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
415 value = arch->value * inv->value; 422 value = arch->value * inv->value;
416 } 423 }
417 424
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 426 {
420 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
421 { 428 {
422 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 429 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
423 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
424 } 431 }
425 432
426 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
427 if (move_type == 0) 434 if (move_type == 0)
428 move_type = MOVE_WALK; 435 move_type = MOVE_WALK;
429 } 436 }
430 437
431 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 438 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 439 /* Object will duplicate it's content as part of the
434 * generation process. To do this, we must flag inventory 440 * generation process. To do this, we must flag inventory
435 * so it remains unevaluated concerning the randomitems and 441 * so it remains unevaluated concerning the randomitems and
436 * the living (a demonlord shouldn't cast from inside generator!) 442 * the living (a demonlord shouldn't cast from inside generator!)
437 */ 443 */
444 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
438 flag_inv (this, FLAG_IS_A_TEMPLATE); 445 flag_inv (this, FLAG_IS_A_TEMPLATE);
439 }
440 446
441 /* Handle player movers. We use move_type for player movers 447 /* Handle player movers. We use move_type for player movers
442 * because they operate on their own time (move_on 448 * because they operate on their own time (move_on
443 * would potentially cause them to be triggered when someone steps 449 * would potentially cause them to be triggered when someone steps
444 * on them). If move_type is set, presume person knows what they 450 * on them). If move_type is set, presume person knows what they
445 * are doing, otherwise, set move_type based on maxhp value. 451 * are doing, otherwise, set move_type based on maxhp value.
446 */ 452 */
447 if (type == PLAYERMOVER) 453 if (type == PLAYERMOVER)
448 { 454 {
449 if (!move_type) 455 if (!move_type)
… …
511 517
512 goto next; 518 goto next;
513 } 519 }
514 } 520 }
515 521
516 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 522 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
517 523
518next: ; 524next: ;
519 } 525 }
520} 526}
521 527
… …
523 529
524bool 530bool
525object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
526{ 532{
527 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
528 535
529 for (;;) 536 for (;;)
530 { 537 {
531 switch (f.kw) 538 switch (f.kw)
532 { 539 {
533 case KW_uuid: 540 case KW_uuid:
534 if (const char *s = f.get_str ()) 541 if (const char *s = f.get_str ())
535 { 542 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 { 543 {
541 uuid.seq = seq; 544 f.parse_warn ("unparseable uuid");
542 break; 545 uuid = UUID::gen ();
543 } 546 }
544 }
545
546 uuid = gen_uuid ();
547 break; 547 break;
548 548
549 case KW_oid: 549 case KW_oid:
550 f.get (this, f.get_sint32 ()); 550 f.get (this, f.get_sint32 ());
551 break; 551 break;
… …
557 557
558 case KW_attach: f.get_ornull (attach); break; 558 case KW_attach: f.get_ornull (attach); break;
559 case KW_skill: f.get_ornull (skill); break; 559 case KW_skill: f.get_ornull (skill); break;
560 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
561 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
562 case KW_tag: f.get_ornull (tag); break;
562 563
563 case KW_arch: 564 case KW_arch:
564 {
565 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 566 {
567 tmp->deactivate ();
568
569 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
572 // 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
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 576
576 if (!op_inv) 577 if (!op_inv)
577 { 578 {
… …
589 590
590 tmp->below = 0; 591 tmp->below = 0;
591 tmp->env = this; 592 tmp->env = this;
592 op_inv = tmp; 593 op_inv = tmp;
593 } 594 }
594 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
595 continue; 598 continue;
596 599
597 case KW_other_arch: 600 case KW_other_arch:
598 other_arch =
599 loading_arch 601 if (loading_arch == this)
600 ? archetype::get (f.get_str ()) 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
603 else
604 {
601 : archetype::find (f.get_str ()); 605 other_arch = archetype::find (f.get_str ());
602 606
603 if (!other_arch) 607 if (!other_arch)
604 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 608 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
609 }
610 break;
611
612 case KW_owner:
613 f.delayed_deref (this, owner, f.get_str ());
605 break; 614 break;
606 615
607 case KW_animation: 616 case KW_animation:
608 { 617 {
609 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
610 animation_id = 0; 619 animation_id = 0;
611 620
612 const char *str = f.get_str (); 621 const char *str = f.get_str ();
613 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
614 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
615 } 624 }
616 break; 625 break;
617 626
618 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
619 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
636 f.get (move_slow_penalty); 645 f.get (move_slow_penalty);
637 break; 646 break;
638 647
639 case KW_face: 648 case KW_face:
640 face = face_find (f.get_str ()); 649 face = face_find (f.get_str ());
650 break;
651
652 case KW_sound:
653 sound = sound_find (f.get_str ());
654 if (!sound)
655 f.parse_warn ("sound not found");
656 break;
657
658 case KW_sound_destroy:
659 sound_destroy = sound_find (f.get_str ());
660 if (!sound_destroy)
661 f.parse_warn ("sound not found");
641 break; 662 break;
642 663
643 case KW_x: f.get (x); break; 664 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 665 case KW_y: f.get (y); break;
645 666
… …
796 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 817 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; 818 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
798 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 819 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
799 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 820 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
800 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 821 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
822 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
801 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 823 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
802 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 824 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
803 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 825 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
804 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 826 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
805 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 827 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
910 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
911 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
912 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
913 case KW_tooltype: f.get (tooltype); break; 935 case KW_tooltype: f.get (tooltype); break;
914 case KW_casting_time: f.get (casting_time); break; 936 case KW_casting_time: f.get (casting_time); break;
937
938 // elevation is deprecated
915 case KW_elevation: f.get (elevation); break; 939 case KW_elevation: break;
940
916 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 941 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
917 case KW_client_type: f.get (client_type); break; 942 case KW_client_type: f.get (client_type); break;
918 case KW_duration: f.get (duration); break; 943 case KW_duration: f.get (duration); break;
919 case KW_range: f.get (range); break; 944 case KW_range: f.get (range); break;
920 case KW_range_modifier: f.get (range_modifier); break; 945 case KW_range_modifier: f.get (range_modifier); break;
… …
959 randomitems = 0; 984 randomitems = 0;
960 break; 985 break;
961 986
962 case KW_msg: 987 case KW_msg:
963 f.get_ml (KW_endmsg, msg); 988 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; 989 break;
971 990
972 case KW_lore: 991 case KW_lore:
973 f.get_ml (KW_endlore, lore); 992 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; 993 break;
982 994
983 case KW_editable: 995 case KW_editable:
984 case KW_editor_folder: 996 case KW_editor_folder:
985 break; 997 break;
… …
990 1002
991 f.next (); 1003 f.next ();
992 return true; 1004 return true;
993 1005
994 case KW_ERROR: 1006 case KW_ERROR:
995 set_ob_key_value (this, f.kw_str, f.value, true); 1007 // append as key value pair (do not use kv_set as it prepends)
1008 // we also do not even try to find old values, duplicate keys stay duplicate
1009 {
1010 key_value *kv = new key_value;
1011
1012 kv->next = 0;
1013 kv->key = shstr (f.kw_str);
1014 kv->value = shstr (f.value);
1015
1016 if (!last_kv)
1017 key_values = last_kv = kv;
1018 else
1019 {
1020 while (last_kv->next)
1021 last_kv = last_kv->next;
1022
1023 last_kv->next = kv;
1024 last_kv = kv;
1025 }
1026 }
996 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1027 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
997 break; 1028 break;
998 1029
999 default: 1030 default:
1000 if (!f.parse_error ("object", name)) 1031 if (!f.parse_error ("object", name))
… …
1021 1052
1022 assert (arch); //D maybe use exception handling of sorts? 1053 assert (arch); //D maybe use exception handling of sorts?
1023 1054
1024 f.next (); 1055 f.next ();
1025 1056
1026 object *op = object::create (); 1057 object *op = arch->instance ();
1027
1028 op->map = map; 1058 op->map = map;
1029 arch->copy_to (op);
1030 // copy_to activates, this should be fixed properly 1059 // instance() activates, this should be fixed properly
1031 op->deactivate (); 1060 op->deactivate ();
1032 1061
1033 if (!op->parse_kv (f)) 1062 if (!op->parse_kv (f))
1034 { 1063 {
1035 op->destroy (true); 1064 op->destroy ();
1036 return 0; 1065 return 0;
1037 } 1066 }
1038 1067
1039 op->post_load_check (); 1068 op->post_load_check ();
1040 return op; 1069 return op;
… …
1049int 1078int
1050set_variable (object *op, char *buf) 1079set_variable (object *op, char *buf)
1051{ 1080{
1052 object_thawer f (buf, (AV *)0); 1081 object_thawer f (buf, (AV *)0);
1053 1082
1054 f.next ();
1055 return op->parse_kv (f); 1083 return op->parse_kv (f);
1056} 1084}
1057 1085
1058/* This returns a string of the integer movement type */ 1086/* This returns a string of the integer movement type */
1059#if 0 1087#if 0
… …
1246 /* 110 */ 1274 /* 110 */
1247 KW_destroy_on_death, 1275 KW_destroy_on_death,
1248 KW_NULL, 1276 KW_NULL,
1249 }; 1277 };
1250 1278
1251 int i;
1252
1253 /* This saves the key/value lists. We do it first so that any 1279 /* This saves the key/value lists. We do it first so that any
1254 * keys that match field names will be overwritten by the loader. 1280 * keys that match field names will be overwritten by the loader.
1255 */ 1281 */
1256 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1282 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 { 1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1258 /* Find the field in the opposing member. */ 1284 f.put (kv->key, kv->value);
1259 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1260
1261 /* If there's no partnering field, or it's got a different value, save our field. */
1262 if (!arch_field || my_field->value != arch_field->value)
1263 f.put (my_field->key, my_field->value);
1264 }
1265 1285
1266 /* We don't need to worry about the arch's extra fields - they 1286 /* We don't need to worry about the arch's extra fields - they
1267 * will get taken care of the copy_to method. 1287 * will get taken care of the copy_to method.
1268 */ 1288 */
1269 1289
1270 { 1290 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 1291
1276#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1292#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) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1294
1295 if (object *owner = op->owner)
1296 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1278 1297
1279 CMP_OUT (name); 1298 CMP_OUT (name);
1280 CMP_OUT (name_pl); 1299 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1300 CMP_OUT (custom_name);
1282 CMP_OUT (title); 1301 CMP_OUT (title);
1283 CMP_OUT (race); 1302 CMP_OUT (race);
1303 CMP_OUT (skill);
1284 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1285 1305 CMP_OUT (tag);
1286 if (op->msg != tmp->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);
1290
1291 CMP_OUT (other_arch); 1306 CMP_OUT (other_arch);
1292 1307
1308 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1309 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1310
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1311 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1294 1314
1295 if (op->animation_id != tmp->animation_id) 1315 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1316 if (op->animation_id)
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1318 else
1297 { 1319 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1320 f.put (KW_animation, (const char *)0);
1299 1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0);
1302 } 1322 }
1303 else
1304 f.put (KW_animation, (const char *) 0);
1305 1323
1306 CMP_OUT2 (str, stats.Str); 1324 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1325 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1326 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1327 CMP_OUT2 (wis, stats.Wis);
… …
1339 CMP_OUT (direction); 1357 CMP_OUT (direction);
1340 CMP_OUT (type); 1358 CMP_OUT (type);
1341 CMP_OUT (subtype); 1359 CMP_OUT (subtype);
1342 CMP_OUT (attacktype); 1360 CMP_OUT (attacktype);
1343 1361
1344 for (i = 0; i < NROFATTACKS; i++) 1362 for (int i = 0; i < NROFATTACKS; i++)
1345 if (op->resist[i] != tmp->resist[i]) 1363 if (expect_false (op->resist[i] != tmp->resist[i]))
1346 f.put (resist_save[i], op->resist[i]); 1364 f.put (resist_save[i], op->resist[i]);
1347 1365
1348 CMP_OUT (path_attuned); 1366 CMP_OUT (path_attuned);
1349 CMP_OUT (path_repelled); 1367 CMP_OUT (path_repelled);
1350 CMP_OUT (path_denied); 1368 CMP_OUT (path_denied);
… …
1360 CMP_OUT (last_sp); 1378 CMP_OUT (last_sp);
1361 CMP_OUT (last_grace); 1379 CMP_OUT (last_grace);
1362 CMP_OUT (last_eat); 1380 CMP_OUT (last_eat);
1363 CMP_OUT (glow_radius); 1381 CMP_OUT (glow_radius);
1364 1382
1365 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1383 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op))
1366 f.put (KW_connected, i); 1385 f.put (KW_connected, i);
1367 1386
1368 CMP_OUT (randomitems); 1387 CMP_OUT (randomitems);
1369 CMP_OUT2 (container, weight_limit); 1388 CMP_OUT2 (container, weight_limit);
1370 1389
1371 CMP_OUT (run_away); 1390 CMP_OUT (run_away);
1372 CMP_OUT (pick_up); 1391 CMP_OUT (pick_up);
1373 CMP_OUT (will_apply); 1392 CMP_OUT (will_apply);
1374 CMP_OUT (smoothlevel); 1393 CMP_OUT (smoothlevel);
1375 CMP_OUT (weapontype); 1394 CMP_OUT (weapontype);
1376 CMP_OUT (tooltype); 1395 CMP_OUT (tooltype);
1377 CMP_OUT (elevation);
1378 CMP_OUT (client_type); 1396 CMP_OUT (client_type);
1379 CMP_OUT (item_power); 1397 CMP_OUT (item_power);
1380 CMP_OUT (duration); 1398 CMP_OUT (duration);
1381 CMP_OUT (range); 1399 CMP_OUT (range);
1382 CMP_OUT (range_modifier); 1400 CMP_OUT (range_modifier);
… …
1391 CMP_OUT (move_off); 1409 CMP_OUT (move_off);
1392 CMP_OUT (move_slow); 1410 CMP_OUT (move_slow);
1393 CMP_OUT (move_slow_penalty); 1411 CMP_OUT (move_slow_penalty);
1394 1412
1395 if (op->flag != tmp->flag) 1413 if (op->flag != tmp->flag)
1396 for (i = 0; i <= NUM_FLAGS; i++) 1414 for (int i = 0; i <= NUM_FLAGS; i++)
1397 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1398 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1416 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1399 1417
1400 // save body locations 1418 // save body locations
1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1402 if (op->slot[i].info != tmp->slot[i].info) 1420 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1403 f.put (body_locations[i].save_name, op->slot[i].info); 1421 f.put (body_locations[i].save_name, op->slot[i].info);
1404} 1422}
1405 1423
1406/* 1424/*
1407 * Dumps all variables in an object to a file. 1425 * Dumps all variables in an object to a file.
… …
1409 * the only place this is not set is when saving the player. 1427 * the only place this is not set is when saving the player.
1410 */ 1428 */
1411bool 1429bool
1412object::write (object_freezer &f) 1430object::write (object_freezer &f)
1413{ 1431{
1414 /* Even if the object does have an owner, it would seem that we should 1432 archetype *at = arch ? arch : archetype::empty;
1415 * still save it.
1416 */
1417 if (owner)
1418 return true;
1419
1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1421 1433
1422 f.put (KW_arch, at->archname); 1434 f.put (KW_arch, at->archname);
1423 write_diff (f, this, at); 1435 write_diff (f, this, at);
1424 1436
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1437 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1433 1445
1434///////////////////////////////////////////////////////////////////////////// 1446/////////////////////////////////////////////////////////////////////////////
1435 1447
1436// generic resource file load, 1448// generic resource file load,
1437// currently supports: region, treasures, archetypes 1449// currently supports: region, treasures, archetypes
1450bool
1438bool load_resource_file (const char *filename) 1451load_resource_file_ (const char *filename)
1439{ 1452{
1440 object_thawer f (filename); 1453 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444
1445 f.next ();
1446 1454
1447 for (;;) 1455 for (;;)
1448 { 1456 {
1449 switch (f.kw) 1457 switch (f.kw)
1450 { 1458 {
1451 case KW_region: 1459 case KW_region:
1452 if (!region::read (f)) 1460 if (!region::read (f))
1453 goto finish; 1461 return false;
1454 break; 1462 break;
1455 1463
1456 case KW_treasure: 1464 case KW_treasure:
1457 case KW_treasureone: 1465 case KW_treasureone:
1458 if (!treasurelist::read (f)) 1466 if (!treasurelist::read (f))
1459 goto finish; 1467 return false;
1460 break; 1468 break;
1461 1469
1462 case KW_object: 1470 case KW_object:
1463 seen_arch = true;
1464 if (!archetype::read (f)) 1471 if (!archetype::read (f))
1465 goto finish; 1472 return false;
1466 break; 1473 break;
1467 1474
1468 case KW_EOF: 1475 case KW_EOF:
1469 success = true; 1476 return true;
1470 goto finish;
1471 1477
1472 default: 1478 default:
1473 if (!f.parse_error ("resource file")) 1479 if (!f.parse_error ("resource file"))
1474 goto finish; 1480 return false;
1475 1481
1476 f.next (); 1482 f.next ();
1477 break; 1483 break;
1478 } 1484 }
1479 } 1485 }
1480
1481finish:
1482 if (seen_arch)
1483 init_archetype_pointers ();
1484
1485 return success;
1486} 1486}
1487 1487

Diff Legend

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