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.85 by root, Sat May 26 15:44:02 2007 UTC vs.
Revision 1.117 by elmex, Sun Jun 15 20:29:56 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 */
… …
325 * 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
326 * 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.
327 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 324 */
330 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)
331 name_pl = 0; 326 name_pl = 0;
332 327
333 if (!name_pl) 328 if (!name_pl)
334 name_pl = name; 329 name_pl = name;
335 330
… …
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);
… …
395 /* Old spellcasting object - need to load in the appropiate object */ 390 /* Old spellcasting object - need to load in the appropiate object */
396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 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 */ 392 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
398 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
399 { 394 {
400 /* 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'
401 * in that spell was stored in sp. 396 * in that spell was stored in sp.
402 */ 397 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
403 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]);
404 insert_ob_in_ob (tmp, this); 400 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 401 randomitems = NULL; /* So another spell isn't created for this object */
406 } 402 }
407 403
408 /* 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 */
409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
410 { 406 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
411 object *tmp = get_archetype_by_object_name (slaying); 408 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 409 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 410 randomitems = 0; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 411 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 412 value = arch->value * inv->value;
416 } 413 }
417 414
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 415 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 416 {
420 if (stats.hp > stats.maxhp) 417 if (stats.hp > stats.maxhp)
421 { 418 {
422 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);
423 stats.maxhp = stats.hp; 420 stats.maxhp = stats.hp;
424 } 421 }
425 422
426 /* The archs just need to be updated for this */ 423 /* The archs just need to be updated for this */
427 if (move_type == 0) 424 if (move_type == 0)
428 move_type = MOVE_WALK; 425 move_type = MOVE_WALK;
429 } 426 }
430 427
431 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)
432 {
433 /* Object will duplicate it's content as part of the 429 /* Object will duplicate it's content as part of the
434 * generation process. To do this, we must flag inventory 430 * generation process. To do this, we must flag inventory
435 * so it remains unevaluated concerning the randomitems and 431 * so it remains unevaluated concerning the randomitems and
436 * the living (a demonlord shouldn't cast from inside generator!) 432 * the living (a demonlord shouldn't cast from inside generator!)
437 */ 433 */
434 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
438 flag_inv (this, FLAG_IS_A_TEMPLATE); 435 flag_inv (this, FLAG_IS_A_TEMPLATE);
439 }
440 436
441 /* Handle player movers. We use move_type for player movers 437 /* Handle player movers. We use move_type for player movers
442 * because they operate on their own time (move_on 438 * because they operate on their own time (move_on
443 * would potentially cause them to be triggered when someone steps 439 * would potentially cause them to be triggered when someone steps
444 * 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
445 * are doing, otherwise, set move_type based on maxhp value. 441 * are doing, otherwise, set move_type based on maxhp value.
446 */ 442 */
447 if (type == PLAYERMOVER) 443 if (type == PLAYERMOVER)
448 { 444 {
449 if (!move_type) 445 if (!move_type)
… …
511 507
512 goto next; 508 goto next;
513 } 509 }
514 } 510 }
515 511
516 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);
517 513
518next: ; 514next: ;
519 } 515 }
520} 516}
521 517
… …
523 519
524bool 520bool
525object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
526{ 522{
527 object *op_inv = inv; 523 object *op_inv = inv;
524 key_value *last_kv = key_values;
528 525
529 for (;;) 526 for (;;)
530 { 527 {
531 switch (f.kw) 528 switch (f.kw)
532 { 529 {
533 case KW_uuid: 530 case KW_uuid:
534 if (const char *s = f.get_str ()) 531 if (const char *s = f.get_str ())
535 { 532 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 { 533 {
541 uuid.seq = seq; 534 f.parse_warn ("unparseable uuid");
542 break; 535 uuid = UUID::gen ();
543 } 536 }
544 }
545
546 uuid = gen_uuid ();
547 break; 537 break;
548 538
549 case KW_oid: 539 case KW_oid:
550 f.get (this, f.get_sint32 ()); 540 f.get (this, f.get_sint32 ());
551 break; 541 break;
… …
557 547
558 case KW_attach: f.get_ornull (attach); break; 548 case KW_attach: f.get_ornull (attach); break;
559 case KW_skill: f.get_ornull (skill); break; 549 case KW_skill: f.get_ornull (skill); break;
560 case KW_race: f.get_ornull (race); break; 550 case KW_race: f.get_ornull (race); break;
561 case KW_slaying: f.get_ornull (slaying); break; 551 case KW_slaying: f.get_ornull (slaying); break;
552 case KW_tag: f.get_ornull (tag); break;
562 553
563 case KW_arch: 554 case KW_arch:
564 { 555 {
565 object *tmp = object::read (f); 556 object *tmp = object::read (f);
566 tmp->deactivate (); 557 tmp->deactivate ();
… …
568 { 559 {
569 // was: insert_ob_in_ob (tmp, op); 560 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 561 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 562 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 563 // save ordering the same between repeated load/saves.
564 // and finally we do not want any funny effects
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 565 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 566 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 567
576 if (!op_inv) 568 if (!op_inv)
577 { 569 {
… …
593 } 585 }
594 } 586 }
595 continue; 587 continue;
596 588
597 case KW_other_arch: 589 case KW_other_arch:
598 other_arch =
599 loading_arch 590 if (loading_arch == this)
600 ? archetype::get (f.get_str ()) 591 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
592 else
593 {
601 : archetype::find (f.get_str ()); 594 other_arch = archetype::find (f.get_str ());
602 595
603 if (!other_arch) 596 if (!other_arch)
604 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 597 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
598 }
599 break;
600
601 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ());
605 break; 603 break;
606 604
607 case KW_animation: 605 case KW_animation:
608 { 606 {
609 CLEAR_FLAG (this, FLAG_ANIMATE); 607 CLEAR_FLAG (this, FLAG_ANIMATE);
610 animation_id = 0; 608 animation_id = 0;
611 609
612 const char *str = f.get_str (); 610 const char *str = f.get_str ();
613 if (str && (animation_id = find_animation (str))) 611 if (str && (animation_id = find_animation (str)))
614 SET_FLAG (this, FLAG_ANIMATE); 612 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
615 } 613 }
616 break; 614 break;
617 615
618 case KW_last_heal: f.get (last_heal); break; 616 case KW_last_heal: f.get (last_heal); break;
619 case KW_last_sp: f.get (last_sp); break; 617 case KW_last_sp: f.get (last_sp); break;
… …
636 f.get (move_slow_penalty); 634 f.get (move_slow_penalty);
637 break; 635 break;
638 636
639 case KW_face: 637 case KW_face:
640 face = face_find (f.get_str ()); 638 face = face_find (f.get_str ());
639 break;
640
641 case KW_sound:
642 sound = sound_find (f.get_str ());
643 if (!sound)
644 f.parse_warn ("sound not found");
645 break;
646
647 case KW_sound_destroy:
648 sound_destroy = sound_find (f.get_str ());
649 if (!sound_destroy)
650 f.parse_warn ("sound not found");
641 break; 651 break;
642 652
643 case KW_x: f.get (x); break; 653 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 654 case KW_y: f.get (y); break;
645 655
… …
796 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 806 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; 807 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
798 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 808 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
799 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 809 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
800 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 810 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
811 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
801 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 812 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
802 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 813 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
803 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 814 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
804 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 815 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
805 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 816 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
910 case KW_expmul: f.get (expmul); break; 921 case KW_expmul: f.get (expmul); break;
911 case KW_glow_radius: f.get (glow_radius); break; 922 case KW_glow_radius: f.get (glow_radius); break;
912 case KW_weapontype: f.get (weapontype); break; 923 case KW_weapontype: f.get (weapontype); break;
913 case KW_tooltype: f.get (tooltype); break; 924 case KW_tooltype: f.get (tooltype); break;
914 case KW_casting_time: f.get (casting_time); break; 925 case KW_casting_time: f.get (casting_time); break;
926
927 // elevation is deprecated
915 case KW_elevation: f.get (elevation); break; 928 case KW_elevation: break;
929
916 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
917 case KW_client_type: f.get (client_type); break; 931 case KW_client_type: f.get (client_type); break;
918 case KW_duration: f.get (duration); break; 932 case KW_duration: f.get (duration); break;
919 case KW_range: f.get (range); break; 933 case KW_range: f.get (range); break;
920 case KW_range_modifier: f.get (range_modifier); break; 934 case KW_range_modifier: f.get (range_modifier); 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;
… …
990 991
991 f.next (); 992 f.next ();
992 return true; 993 return true;
993 994
994 case KW_ERROR: 995 case KW_ERROR:
995 set_ob_key_value (this, f.kw_str, f.value, true); 996 // append as key value pair (do not use kv_set as it prepends)
997 // we also do not even try to find old values, duplicate keys stay duplicate
998 {
999 key_value *kv = new key_value;
1000
1001 kv->next = 0;
1002 kv->key = shstr (f.kw_str);
1003 kv->value = shstr (f.value);
1004
1005 if (!last_kv)
1006 key_values = last_kv = kv;
1007 else
1008 {
1009 while (last_kv->next)
1010 last_kv = last_kv->next;
1011
1012 last_kv->next = kv;
1013 last_kv = kv;
1014 }
1015 }
996 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1016 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
997 break; 1017 break;
998 1018
999 default: 1019 default:
1000 if (!f.parse_error ("object", name)) 1020 if (!f.parse_error ("object", name))
… …
1021 1041
1022 assert (arch); //D maybe use exception handling of sorts? 1042 assert (arch); //D maybe use exception handling of sorts?
1023 1043
1024 f.next (); 1044 f.next ();
1025 1045
1026 object *op = object::create (); 1046 object *op = arch->instance ();
1027
1028 op->map = map; 1047 op->map = map;
1029 arch->clone.copy_to (op);
1030 // copy_to activates, this should be fixed properly 1048 // instance() activates, this should be fixed properly
1031 op->deactivate (); 1049 op->deactivate ();
1032 1050
1033 if (!op->parse_kv (f)) 1051 if (!op->parse_kv (f))
1034 { 1052 {
1035 op->destroy (true); 1053 op->destroy (true);
… …
1049int 1067int
1050set_variable (object *op, char *buf) 1068set_variable (object *op, char *buf)
1051{ 1069{
1052 object_thawer f (buf, (AV *)0); 1070 object_thawer f (buf, (AV *)0);
1053 1071
1054 f.next ();
1055 return op->parse_kv (f); 1072 return op->parse_kv (f);
1056} 1073}
1057 1074
1058/* This returns a string of the integer movement type */ 1075/* This returns a string of the integer movement type */
1059#if 0 1076#if 0
… …
1246 /* 110 */ 1263 /* 110 */
1247 KW_destroy_on_death, 1264 KW_destroy_on_death,
1248 KW_NULL, 1265 KW_NULL,
1249 }; 1266 };
1250 1267
1251 int i;
1252
1253 /* This saves the key/value lists. We do it first so that any 1268 /* 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. 1269 * keys that match field names will be overwritten by the loader.
1255 */ 1270 */
1256 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1271 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 { 1272 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1258 /* Find the field in the opposing member. */ 1273 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 1274
1266 /* We don't need to worry about the arch's extra fields - they 1275 /* We don't need to worry about the arch's extra fields - they
1267 * will get taken care of the copy_to method. 1276 * will get taken care of the copy_to method.
1268 */ 1277 */
1269 1278
1270 { 1279 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 1280
1276#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1281#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) 1282#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1283
1284 if (object *owner = op->owner)
1285 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1278 1286
1279 CMP_OUT (name); 1287 CMP_OUT (name);
1280 CMP_OUT (name_pl); 1288 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1289 CMP_OUT (custom_name);
1282 CMP_OUT (title); 1290 CMP_OUT (title);
1283 CMP_OUT (race); 1291 CMP_OUT (race);
1292 CMP_OUT (skill);
1284 CMP_OUT (slaying); 1293 CMP_OUT (slaying);
1285 1294 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); 1295 CMP_OUT (other_arch);
1292 1296
1297 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1298 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1299
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1300 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1301 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1302 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1294 1303
1295 if (op->animation_id != tmp->animation_id) 1304 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1305 if (op->animation_id)
1306 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1307 else
1297 { 1308 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1309 f.put (KW_animation, (const char *)0);
1299 1310 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 } 1311 }
1303 else
1304 f.put (KW_animation, (const char *) 0);
1305 1312
1306 CMP_OUT2 (str, stats.Str); 1313 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1314 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1315 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1316 CMP_OUT2 (wis, stats.Wis);
… …
1339 CMP_OUT (direction); 1346 CMP_OUT (direction);
1340 CMP_OUT (type); 1347 CMP_OUT (type);
1341 CMP_OUT (subtype); 1348 CMP_OUT (subtype);
1342 CMP_OUT (attacktype); 1349 CMP_OUT (attacktype);
1343 1350
1344 for (i = 0; i < NROFATTACKS; i++) 1351 for (int i = 0; i < NROFATTACKS; i++)
1345 if (op->resist[i] != tmp->resist[i]) 1352 if (expect_false (op->resist[i] != tmp->resist[i]))
1346 f.put (resist_save[i], op->resist[i]); 1353 f.put (resist_save[i], op->resist[i]);
1347 1354
1348 CMP_OUT (path_attuned); 1355 CMP_OUT (path_attuned);
1349 CMP_OUT (path_repelled); 1356 CMP_OUT (path_repelled);
1350 CMP_OUT (path_denied); 1357 CMP_OUT (path_denied);
… …
1360 CMP_OUT (last_sp); 1367 CMP_OUT (last_sp);
1361 CMP_OUT (last_grace); 1368 CMP_OUT (last_grace);
1362 CMP_OUT (last_eat); 1369 CMP_OUT (last_eat);
1363 CMP_OUT (glow_radius); 1370 CMP_OUT (glow_radius);
1364 1371
1365 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1372 if (op->flag [FLAG_IS_LINKED])
1373 if (int i = get_button_value (op))
1366 f.put (KW_connected, i); 1374 f.put (KW_connected, i);
1367 1375
1368 CMP_OUT (randomitems); 1376 CMP_OUT (randomitems);
1369 CMP_OUT2 (container, weight_limit); 1377 CMP_OUT2 (container, weight_limit);
1370 1378
1371 CMP_OUT (run_away); 1379 CMP_OUT (run_away);
1372 CMP_OUT (pick_up); 1380 CMP_OUT (pick_up);
1373 CMP_OUT (will_apply); 1381 CMP_OUT (will_apply);
1374 CMP_OUT (smoothlevel); 1382 CMP_OUT (smoothlevel);
1375 CMP_OUT (weapontype); 1383 CMP_OUT (weapontype);
1376 CMP_OUT (tooltype); 1384 CMP_OUT (tooltype);
1377 CMP_OUT (elevation);
1378 CMP_OUT (client_type); 1385 CMP_OUT (client_type);
1379 CMP_OUT (item_power); 1386 CMP_OUT (item_power);
1380 CMP_OUT (duration); 1387 CMP_OUT (duration);
1381 CMP_OUT (range); 1388 CMP_OUT (range);
1382 CMP_OUT (range_modifier); 1389 CMP_OUT (range_modifier);
… …
1391 CMP_OUT (move_off); 1398 CMP_OUT (move_off);
1392 CMP_OUT (move_slow); 1399 CMP_OUT (move_slow);
1393 CMP_OUT (move_slow_penalty); 1400 CMP_OUT (move_slow_penalty);
1394 1401
1395 if (op->flag != tmp->flag) 1402 if (op->flag != tmp->flag)
1396 for (i = 0; i <= NUM_FLAGS; i++) 1403 for (int i = 0; i <= NUM_FLAGS; i++)
1397 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1404 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1398 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1405 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1399 1406
1400 // save body locations 1407 // save body locations
1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1408 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1402 if (op->slot[i].info != tmp->slot[i].info) 1409 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1403 f.put (body_locations[i].save_name, op->slot[i].info); 1410 f.put (body_locations[i].save_name, op->slot[i].info);
1404} 1411}
1405 1412
1406/* 1413/*
1407 * Dumps all variables in an object to a file. 1414 * Dumps all variables in an object to a file.
… …
1409 * the only place this is not set is when saving the player. 1416 * the only place this is not set is when saving the player.
1410 */ 1417 */
1411bool 1418bool
1412object::write (object_freezer &f) 1419object::write (object_freezer &f)
1413{ 1420{
1414 /* Even if the object does have an owner, it would seem that we should 1421 archetype *at = arch ? arch : archetype::empty;
1415 * still save it.
1416 */
1417 if (owner)
1418 return true;
1419 1422
1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1421
1422 f.put (KW_arch, at->name); 1423 f.put (KW_arch, at->archname);
1423 write_diff (f, this, &at->clone); 1424 write_diff (f, this, at);
1424 1425
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1427 tmp->write (f);
1427 1428
1428 f.put (this); 1429 f.put (this);
… …
1433 1434
1434///////////////////////////////////////////////////////////////////////////// 1435/////////////////////////////////////////////////////////////////////////////
1435 1436
1436// generic resource file load, 1437// generic resource file load,
1437// currently supports: region, treasures, archetypes 1438// currently supports: region, treasures, archetypes
1439bool
1438bool load_resource_file (const char *filename) 1440load_resource_file_ (const char *filename)
1439{ 1441{
1440 object_thawer f (filename); 1442 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444
1445 f.next ();
1446 1443
1447 for (;;) 1444 for (;;)
1448 { 1445 {
1449 switch (f.kw) 1446 switch (f.kw)
1450 { 1447 {
1451 case KW_region: 1448 case KW_region:
1452 if (!region::read (f)) 1449 if (!region::read (f))
1453 goto finish; 1450 return false;
1454 break; 1451 break;
1455 1452
1456 case KW_treasure: 1453 case KW_treasure:
1457 case KW_treasureone: 1454 case KW_treasureone:
1458 if (!treasurelist::read (f)) 1455 if (!treasurelist::read (f))
1459 goto finish; 1456 return false;
1460 break; 1457 break;
1461 1458
1462 case KW_object: 1459 case KW_object:
1463 seen_arch = true;
1464 if (!archetype::read (f)) 1460 if (!archetype::read (f))
1465 goto finish; 1461 return false;
1466 break; 1462 break;
1467 1463
1468 case KW_EOF: 1464 case KW_EOF:
1469 success = true; 1465 return true;
1470 goto finish;
1471 1466
1472 default: 1467 default:
1473 if (!f.parse_error ("resource file")) 1468 if (!f.parse_error ("resource file"))
1474 goto finish; 1469 return false;
1475 1470
1476 f.next (); 1471 f.next ();
1477 break; 1472 break;
1478 } 1473 }
1479 } 1474 }
1480
1481finish:
1482 if (seen_arch)
1483 init_archetype_pointers ();
1484
1485 return success;
1486} 1475}
1487 1476

Diff Legend

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