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.92 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.122 by root, Mon Sep 15 00:16:19 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 23
28#include <global.h> 24#include <global.h>
29#include <loader.h> 25#include <loader.h>
30#include <sproto.h> 26#include <sproto.h>
31 27
32///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
33 31
34/* 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
35 * spell object conversion to the new object. It was not practical 33 * spell object conversion to the new object. It was not practical
36 * 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
37 * 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
… …
167 "spell_magic_drain", /* 122 */ 165 "spell_magic_drain", /* 122 */
168 "spell_counterspell", /* 123 */ 166 "spell_counterspell", /* 123 */
169 "spell_disarm", /* 124 */ 167 "spell_disarm", /* 124 */
170 "spell_cure_confusion", /* 125 */ 168 "spell_cure_confusion", /* 125 */
171 "spell_restoration", /* 126 */ 169 "spell_restoration", /* 126 */
172 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 170 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
173 "spell_counterwall", /* 128 */ 171 "spell_counterwall", /* 128 */
174 "spell_cause_light_wounds", /* 129 */ 172 "spell_cause_light_wounds", /* 129 */
175 "spell_cause_medium_wounds", /* 130 */ 173 "spell_cause_medium_wounds", /* 130 */
176 "spell_cause_heavy_wounds", /* 131 */ 174 "spell_cause_heavy_wounds", /* 131 */
177 "spell_charm_monsters", /* 132 */ 175 "spell_charm_monsters", /* 132 */
… …
249 "spell_cause_rabies", /* 204 */ 247 "spell_cause_rabies", /* 204 */
250 "spell_glyph", /* 205 */ 248 "spell_glyph", /* 205 */
251 NULL 249 NULL
252}; 250};
253 251
254extern bool loading_arch;
255
256/* 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
257 * 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
258 * 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
259 * 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.
260 */ 256 */
… …
361 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
363 { 359 {
364 if (last_heal) 360 if (last_heal)
365 { 361 {
366 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 ());
367 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
368 last_heal = 0; 364 last_heal = 0;
369 } 365 }
370 366
371 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
390 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);
391#endif 387#endif
392 } 388 }
393 389
394 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 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
396 /* 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 */
397 ((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
398 { 403 {
404 // TODO: fix firewall object on map
399 /* 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'
400 * in that spell was stored in sp. 406 * in that spell was stored in sp.
401 */ 407 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 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]);
403 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
405 } 412 }
406 413
407 /* 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 */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 416 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 422 value = arch->value * inv->value;
415 } 423 }
416 424
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 426 {
419 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
420 { 428 {
421 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);
422 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
423 } 431 }
424 432
425 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
426 if (move_type == 0) 434 if (move_type == 0)
427 move_type = MOVE_WALK; 435 move_type = MOVE_WALK;
428 } 436 }
429 437
430 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)
431 {
432 /* Object will duplicate it's content as part of the 439 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 440 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 441 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 442 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 443 */
444 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 445 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 446
440 /* Handle player movers. We use move_type for player movers 447 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 448 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 449 * would potentially cause them to be triggered when someone steps
443 * 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
444 * are doing, otherwise, set move_type based on maxhp value. 451 * are doing, otherwise, set move_type based on maxhp value.
445 */ 452 */
446 if (type == PLAYERMOVER) 453 if (type == PLAYERMOVER)
447 { 454 {
448 if (!move_type) 455 if (!move_type)
… …
510 517
511 goto next; 518 goto next;
512 } 519 }
513 } 520 }
514 521
515 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);
516 523
517next: ; 524next: ;
518 } 525 }
519} 526}
520 527
… …
522 529
523bool 530bool
524object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
525{ 532{
526 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
527 535
528 for (;;) 536 for (;;)
529 { 537 {
530 switch (f.kw) 538 switch (f.kw)
531 { 539 {
532 case KW_uuid: 540 case KW_uuid:
533 if (const char *s = f.get_str ()) 541 if (const char *s = f.get_str ())
534 { 542 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 543 {
540 uuid.seq = seq; 544 f.parse_warn ("unparseable uuid");
541 break; 545 uuid = UUID::gen ();
542 } 546 }
543 }
544
545 uuid = gen_uuid ();
546 break; 547 break;
547 548
548 case KW_oid: 549 case KW_oid:
549 f.get (this, f.get_sint32 ()); 550 f.get (this, f.get_sint32 ());
550 break; 551 break;
… …
556 557
557 case KW_attach: f.get_ornull (attach); break; 558 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 559 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
560 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;
561 563
562 case KW_arch: 564 case KW_arch:
563 {
564 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
565 tmp->deactivate ();
566
567 { 566 {
567 tmp->deactivate ();
568
568 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
571 // 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
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 576
575 if (!op_inv) 577 if (!op_inv)
576 { 578 {
… …
588 590
589 tmp->below = 0; 591 tmp->below = 0;
590 tmp->env = this; 592 tmp->env = this;
591 op_inv = tmp; 593 op_inv = tmp;
592 } 594 }
593 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
594 continue; 598 continue;
595 599
596 case KW_other_arch: 600 case KW_other_arch:
597 other_arch =
598 loading_arch 601 if (loading_arch == this)
599 ? archetype::get (f.get_str ()) 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
603 else
604 {
600 : archetype::find (f.get_str ()); 605 other_arch = archetype::find (f.get_str ());
601 606
602 if (!other_arch) 607 if (!other_arch)
603 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 ());
604 break; 614 break;
605 615
606 case KW_animation: 616 case KW_animation:
607 { 617 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 619 animation_id = 0;
610 620
611 const char *str = f.get_str (); 621 const char *str = f.get_str ();
612 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
613 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
614 } 624 }
615 break; 625 break;
616 626
617 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
618 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
635 f.get (move_slow_penalty); 645 f.get (move_slow_penalty);
636 break; 646 break;
637 647
638 case KW_face: 648 case KW_face:
639 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");
640 break; 662 break;
641 663
642 case KW_x: f.get (x); break; 664 case KW_x: f.get (x); break;
643 case KW_y: f.get (y); break; 665 case KW_y: f.get (y); break;
644 666
… …
795 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 817 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
796 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;
797 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 819 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
798 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 820 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
799 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;
800 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 823 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
801 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 824 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
802 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 825 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
803 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 826 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
804 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 827 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
909 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
910 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
911 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
912 case KW_tooltype: f.get (tooltype); break; 935 case KW_tooltype: f.get (tooltype); break;
913 case KW_casting_time: f.get (casting_time); break; 936 case KW_casting_time: f.get (casting_time); break;
937
938 // elevation is deprecated
914 case KW_elevation: f.get (elevation); break; 939 case KW_elevation: break;
940
915 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;
916 case KW_client_type: f.get (client_type); break; 942 case KW_client_type: f.get (client_type); break;
917 case KW_duration: f.get (duration); break; 943 case KW_duration: f.get (duration); break;
918 case KW_range: f.get (range); break; 944 case KW_range: f.get (range); break;
919 case KW_range_modifier: f.get (range_modifier); break; 945 case KW_range_modifier: f.get (range_modifier); break;
… …
976 1002
977 f.next (); 1003 f.next ();
978 return true; 1004 return true;
979 1005
980 case KW_ERROR: 1006 case KW_ERROR:
981 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 }
982 //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
983 break; 1028 break;
984 1029
985 default: 1030 default:
986 if (!f.parse_error ("object", name)) 1031 if (!f.parse_error ("object", name))
… …
1007 1052
1008 assert (arch); //D maybe use exception handling of sorts? 1053 assert (arch); //D maybe use exception handling of sorts?
1009 1054
1010 f.next (); 1055 f.next ();
1011 1056
1012 object *op = object::create (); 1057 object *op = arch->instance ();
1013
1014 op->map = map; 1058 op->map = map;
1015 arch->copy_to (op);
1016 // copy_to activates, this should be fixed properly 1059 // instance() activates, this should be fixed properly
1017 op->deactivate (); 1060 op->deactivate ();
1018 1061
1019 if (!op->parse_kv (f)) 1062 if (!op->parse_kv (f))
1020 { 1063 {
1021 op->destroy (true); 1064 op->destroy (true);
… …
1035int 1078int
1036set_variable (object *op, char *buf) 1079set_variable (object *op, char *buf)
1037{ 1080{
1038 object_thawer f (buf, (AV *)0); 1081 object_thawer f (buf, (AV *)0);
1039 1082
1040 f.next ();
1041 return op->parse_kv (f); 1083 return op->parse_kv (f);
1042} 1084}
1043 1085
1044/* This returns a string of the integer movement type */ 1086/* This returns a string of the integer movement type */
1045#if 0 1087#if 0
… …
1232 /* 110 */ 1274 /* 110 */
1233 KW_destroy_on_death, 1275 KW_destroy_on_death,
1234 KW_NULL, 1276 KW_NULL,
1235 }; 1277 };
1236 1278
1237 int i;
1238
1239 /* 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
1240 * keys that match field names will be overwritten by the loader. 1280 * keys that match field names will be overwritten by the loader.
1241 */ 1281 */
1242 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)
1243 { 1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1244 /* Find the field in the opposing member. */ 1284 f.put (kv->key, kv->value);
1245 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1246
1247 /* If there's no partnering field, or it's got a different value, save our field. */
1248 if (!arch_field || my_field->value != arch_field->value)
1249 f.put (my_field->key, my_field->value);
1250 }
1251 1285
1252 /* 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
1253 * will get taken care of the copy_to method. 1287 * will get taken care of the copy_to method.
1254 */ 1288 */
1255 1289
1256 { 1290 f.put (KW_uuid, op->uuid.c_str ());
1257 char uids[64];
1258 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1259 f.put (KW_uuid, (const char *)uids);
1260 }
1261 1291
1262#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)
1263#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 ()));
1264 1297
1265 CMP_OUT (name); 1298 CMP_OUT (name);
1266 CMP_OUT (name_pl); 1299 CMP_OUT (name_pl);
1267 CMP_OUT (custom_name); 1300 CMP_OUT (custom_name);
1268 CMP_OUT (title); 1301 CMP_OUT (title);
1269 CMP_OUT (race); 1302 CMP_OUT (race);
1303 CMP_OUT (skill);
1270 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1271 1305 CMP_OUT (tag);
1272 if (op->msg != tmp->msg)
1273 f.put (KW_msg, KW_endmsg, op->msg);
1274 if (op->lore != tmp->lore)
1275 f.put (KW_lore, KW_endlore, op->lore);
1276
1277 CMP_OUT (other_arch); 1306 CMP_OUT (other_arch);
1278 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
1279 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);
1280 1314
1281 if (op->animation_id != tmp->animation_id) 1315 if (op->animation_id != tmp->animation_id)
1282 if (op->animation_id) 1316 if (op->animation_id)
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1318 else
1283 { 1319 {
1284 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1320 f.put (KW_animation, (const char *)0);
1285 1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1286 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1287 f.put (KW_is_animated, (sint32)0);
1288 } 1322 }
1289 else
1290 f.put (KW_animation, (const char *)0);
1291 1323
1292 CMP_OUT2 (str, stats.Str); 1324 CMP_OUT2 (str, stats.Str);
1293 CMP_OUT2 (dex, stats.Dex); 1325 CMP_OUT2 (dex, stats.Dex);
1294 CMP_OUT2 (con, stats.Con); 1326 CMP_OUT2 (con, stats.Con);
1295 CMP_OUT2 (wis, stats.Wis); 1327 CMP_OUT2 (wis, stats.Wis);
… …
1325 CMP_OUT (direction); 1357 CMP_OUT (direction);
1326 CMP_OUT (type); 1358 CMP_OUT (type);
1327 CMP_OUT (subtype); 1359 CMP_OUT (subtype);
1328 CMP_OUT (attacktype); 1360 CMP_OUT (attacktype);
1329 1361
1330 for (i = 0; i < NROFATTACKS; i++) 1362 for (int i = 0; i < NROFATTACKS; i++)
1331 if (op->resist[i] != tmp->resist[i]) 1363 if (expect_false (op->resist[i] != tmp->resist[i]))
1332 f.put (resist_save[i], op->resist[i]); 1364 f.put (resist_save[i], op->resist[i]);
1333 1365
1334 CMP_OUT (path_attuned); 1366 CMP_OUT (path_attuned);
1335 CMP_OUT (path_repelled); 1367 CMP_OUT (path_repelled);
1336 CMP_OUT (path_denied); 1368 CMP_OUT (path_denied);
… …
1346 CMP_OUT (last_sp); 1378 CMP_OUT (last_sp);
1347 CMP_OUT (last_grace); 1379 CMP_OUT (last_grace);
1348 CMP_OUT (last_eat); 1380 CMP_OUT (last_eat);
1349 CMP_OUT (glow_radius); 1381 CMP_OUT (glow_radius);
1350 1382
1351 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))
1352 f.put (KW_connected, i); 1385 f.put (KW_connected, i);
1353 1386
1354 CMP_OUT (randomitems); 1387 CMP_OUT (randomitems);
1355 CMP_OUT2 (container, weight_limit); 1388 CMP_OUT2 (container, weight_limit);
1356 1389
1357 CMP_OUT (run_away); 1390 CMP_OUT (run_away);
1358 CMP_OUT (pick_up); 1391 CMP_OUT (pick_up);
1359 CMP_OUT (will_apply); 1392 CMP_OUT (will_apply);
1360 CMP_OUT (smoothlevel); 1393 CMP_OUT (smoothlevel);
1361 CMP_OUT (weapontype); 1394 CMP_OUT (weapontype);
1362 CMP_OUT (tooltype); 1395 CMP_OUT (tooltype);
1363 CMP_OUT (elevation);
1364 CMP_OUT (client_type); 1396 CMP_OUT (client_type);
1365 CMP_OUT (item_power); 1397 CMP_OUT (item_power);
1366 CMP_OUT (duration); 1398 CMP_OUT (duration);
1367 CMP_OUT (range); 1399 CMP_OUT (range);
1368 CMP_OUT (range_modifier); 1400 CMP_OUT (range_modifier);
… …
1377 CMP_OUT (move_off); 1409 CMP_OUT (move_off);
1378 CMP_OUT (move_slow); 1410 CMP_OUT (move_slow);
1379 CMP_OUT (move_slow_penalty); 1411 CMP_OUT (move_slow_penalty);
1380 1412
1381 if (op->flag != tmp->flag) 1413 if (op->flag != tmp->flag)
1382 for (i = 0; i <= NUM_FLAGS; i++) 1414 for (int i = 0; i <= NUM_FLAGS; i++)
1383 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1384 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1416 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1385 1417
1386 // save body locations 1418 // save body locations
1387 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1388 if (op->slot[i].info != tmp->slot[i].info) 1420 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1389 f.put (body_locations[i].save_name, op->slot[i].info); 1421 f.put (body_locations[i].save_name, op->slot[i].info);
1390} 1422}
1391 1423
1392/* 1424/*
1393 * Dumps all variables in an object to a file. 1425 * Dumps all variables in an object to a file.
… …
1395 * 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.
1396 */ 1428 */
1397bool 1429bool
1398object::write (object_freezer &f) 1430object::write (object_freezer &f)
1399{ 1431{
1400 /* Even if the object does have an owner, it would seem that we should 1432 archetype *at = arch ? arch : archetype::empty;
1401 * still save it.
1402 */
1403 if (owner)
1404 return true;
1405
1406 archetype *at = arch ? (archetype *)arch : empty_archetype;
1407 1433
1408 f.put (KW_arch, at->archname); 1434 f.put (KW_arch, at->archname);
1409 write_diff (f, this, at); 1435 write_diff (f, this, at);
1410 1436
1411 for (object *tmp = inv; tmp; tmp = tmp->below) 1437 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1419 1445
1420///////////////////////////////////////////////////////////////////////////// 1446/////////////////////////////////////////////////////////////////////////////
1421 1447
1422// generic resource file load, 1448// generic resource file load,
1423// currently supports: region, treasures, archetypes 1449// currently supports: region, treasures, archetypes
1450bool
1424bool load_resource_file (const char *filename) 1451load_resource_file_ (const char *filename)
1425{ 1452{
1426 object_thawer f (filename); 1453 object_thawer f (filename);
1427
1428 bool success = false;
1429 bool seen_arch = false;
1430
1431 f.next ();
1432 1454
1433 for (;;) 1455 for (;;)
1434 { 1456 {
1435 switch (f.kw) 1457 switch (f.kw)
1436 { 1458 {
1437 case KW_region: 1459 case KW_region:
1438 if (!region::read (f)) 1460 if (!region::read (f))
1439 goto finish; 1461 return false;
1440 break; 1462 break;
1441 1463
1442 case KW_treasure: 1464 case KW_treasure:
1443 case KW_treasureone: 1465 case KW_treasureone:
1444 if (!treasurelist::read (f)) 1466 if (!treasurelist::read (f))
1445 goto finish; 1467 return false;
1446 break; 1468 break;
1447 1469
1448 case KW_object: 1470 case KW_object:
1449 seen_arch = true;
1450 if (!archetype::read (f)) 1471 if (!archetype::read (f))
1451 goto finish; 1472 return false;
1452 break; 1473 break;
1453 1474
1454 case KW_EOF: 1475 case KW_EOF:
1455 success = true; 1476 return true;
1456 goto finish;
1457 1477
1458 default: 1478 default:
1459 if (!f.parse_error ("resource file")) 1479 if (!f.parse_error ("resource file"))
1460 goto finish; 1480 return false;
1461 1481
1462 f.next (); 1482 f.next ();
1463 break; 1483 break;
1464 } 1484 }
1465 } 1485 }
1466
1467finish:
1468 if (seen_arch)
1469 init_archetype_pointers ();
1470
1471 return success;
1472} 1486}
1473 1487

Diff Legend

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