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.96 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.118 by elmex, Sun Aug 31 15:49:13 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);
… …
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 spellcasting object - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 if ((type == ROD
392 || type == WAND
393 || type == SCROLL
394 || type == HORN
395 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
398 && !inv
399 && !loading_arch
400 && !randomitems) // by elmex: not _any_ rod or horn we find on a map, which has randomitems is an old spellcasting
401 // object. For instance lythanders pipe got it's spell in the treasurelist in the randomitems,
402 // same goes for normal rods.
398 { 403 {
399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 404 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 405 * in that spell was stored in sp.
401 */ 406 */
407 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 408 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 409 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */
405 } 410 }
406 411
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 412 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 413 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 414 {
415 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 416 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 417 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 418 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 419 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 420 value = arch->value * inv->value;
415 } 421 }
416 422
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 423 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 424 {
419 if (stats.hp > stats.maxhp) 425 if (stats.hp > stats.maxhp)
420 { 426 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 427 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 428 stats.maxhp = stats.hp;
423 } 429 }
424 430
425 /* The archs just need to be updated for this */ 431 /* The archs just need to be updated for this */
426 if (move_type == 0) 432 if (move_type == 0)
427 move_type = MOVE_WALK; 433 move_type = MOVE_WALK;
428 } 434 }
429 435
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 436 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 437 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 438 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 439 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 440 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 441 */
442 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 443 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 444
440 /* Handle player movers. We use move_type for player movers 445 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 446 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 447 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 448 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 449 * are doing, otherwise, set move_type based on maxhp value.
445 */ 450 */
446 if (type == PLAYERMOVER) 451 if (type == PLAYERMOVER)
447 { 452 {
448 if (!move_type) 453 if (!move_type)
… …
510 515
511 goto next; 516 goto next;
512 } 517 }
513 } 518 }
514 519
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 520 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 521
517next: ; 522next: ;
518 } 523 }
519} 524}
520 525
… …
522 527
523bool 528bool
524object::parse_kv (object_thawer &f) 529object::parse_kv (object_thawer &f)
525{ 530{
526 object *op_inv = inv; 531 object *op_inv = inv;
532 key_value *last_kv = key_values;
527 533
528 for (;;) 534 for (;;)
529 { 535 {
530 switch (f.kw) 536 switch (f.kw)
531 { 537 {
532 case KW_uuid: 538 case KW_uuid:
533 if (const char *s = f.get_str ()) 539 if (const char *s = f.get_str ())
534 { 540 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 { 541 {
540 uuid.seq = seq; 542 f.parse_warn ("unparseable uuid");
541 break; 543 uuid = UUID::gen ();
542 } 544 }
543 }
544
545 uuid = gen_uuid ();
546 break; 545 break;
547 546
548 case KW_oid: 547 case KW_oid:
549 f.get (this, f.get_sint32 ()); 548 f.get (this, f.get_sint32 ());
550 break; 549 break;
… …
556 555
557 case KW_attach: f.get_ornull (attach); break; 556 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 557 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 558 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 559 case KW_slaying: f.get_ornull (slaying); break;
560 case KW_tag: f.get_ornull (tag); break;
561 561
562 case KW_arch: 562 case KW_arch:
563 { 563 {
564 object *tmp = object::read (f); 564 object *tmp = object::read (f);
565 tmp->deactivate (); 565 tmp->deactivate ();
… …
567 { 567 {
568 // was: insert_ob_in_ob (tmp, op); 568 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 569 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 570 // also, appending instead of prepending keeps the
571 // save ordering the same between repeated load/saves. 571 // save ordering the same between repeated load/saves.
572 // and finally we do not want any funny effects
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 574 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 575
575 if (!op_inv) 576 if (!op_inv)
576 { 577 {
… …
592 } 593 }
593 } 594 }
594 continue; 595 continue;
595 596
596 case KW_other_arch: 597 case KW_other_arch:
597 other_arch =
598 loading_arch 598 if (loading_arch == this)
599 ? archetype::get (f.get_str ()) 599 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
600 else
601 {
600 : archetype::find (f.get_str ()); 602 other_arch = archetype::find (f.get_str ());
601 603
602 if (!other_arch) 604 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 605 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
606 }
607 break;
608
609 case KW_owner:
610 f.delayed_deref (this, owner, f.get_str ());
604 break; 611 break;
605 612
606 case KW_animation: 613 case KW_animation:
607 { 614 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 615 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 616 animation_id = 0;
610 617
611 const char *str = f.get_str (); 618 const char *str = f.get_str ();
612 if (str && (animation_id = find_animation (str))) 619 if (str && (animation_id = find_animation (str)))
613 SET_FLAG (this, FLAG_ANIMATE); 620 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
614 } 621 }
615 break; 622 break;
616 623
617 case KW_last_heal: f.get (last_heal); break; 624 case KW_last_heal: f.get (last_heal); break;
618 case KW_last_sp: f.get (last_sp); break; 625 case KW_last_sp: f.get (last_sp); break;
… …
639 face = face_find (f.get_str ()); 646 face = face_find (f.get_str ());
640 break; 647 break;
641 648
642 case KW_sound: 649 case KW_sound:
643 sound = sound_find (f.get_str ()); 650 sound = sound_find (f.get_str ());
651 if (!sound)
652 f.parse_warn ("sound not found");
644 break; 653 break;
645 654
646 case KW_sound_die: 655 case KW_sound_destroy:
647 sound_die = sound_find (f.get_str ()); 656 sound_destroy = sound_find (f.get_str ());
657 if (!sound_destroy)
658 f.parse_warn ("sound not found");
648 break; 659 break;
649 660
650 case KW_x: f.get (x); break; 661 case KW_x: f.get (x); break;
651 case KW_y: f.get (y); break; 662 case KW_y: f.get (y); break;
652 663
… …
803 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 814 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
804 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 815 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
805 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 816 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
806 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 817 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
807 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 818 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
819 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
808 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 820 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
809 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 821 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
810 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 822 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
811 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 823 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
812 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 824 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
917 case KW_expmul: f.get (expmul); break; 929 case KW_expmul: f.get (expmul); break;
918 case KW_glow_radius: f.get (glow_radius); break; 930 case KW_glow_radius: f.get (glow_radius); break;
919 case KW_weapontype: f.get (weapontype); break; 931 case KW_weapontype: f.get (weapontype); break;
920 case KW_tooltype: f.get (tooltype); break; 932 case KW_tooltype: f.get (tooltype); break;
921 case KW_casting_time: f.get (casting_time); break; 933 case KW_casting_time: f.get (casting_time); break;
934
935 // elevation is deprecated
922 case KW_elevation: f.get (elevation); break; 936 case KW_elevation: break;
937
923 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 938 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
924 case KW_client_type: f.get (client_type); break; 939 case KW_client_type: f.get (client_type); break;
925 case KW_duration: f.get (duration); break; 940 case KW_duration: f.get (duration); break;
926 case KW_range: f.get (range); break; 941 case KW_range: f.get (range); break;
927 case KW_range_modifier: f.get (range_modifier); break; 942 case KW_range_modifier: f.get (range_modifier); break;
… …
984 999
985 f.next (); 1000 f.next ();
986 return true; 1001 return true;
987 1002
988 case KW_ERROR: 1003 case KW_ERROR:
989 set_ob_key_value (this, f.kw_str, f.value, true); 1004 // append as key value pair (do not use kv_set as it prepends)
1005 // we also do not even try to find old values, duplicate keys stay duplicate
1006 {
1007 key_value *kv = new key_value;
1008
1009 kv->next = 0;
1010 kv->key = shstr (f.kw_str);
1011 kv->value = shstr (f.value);
1012
1013 if (!last_kv)
1014 key_values = last_kv = kv;
1015 else
1016 {
1017 while (last_kv->next)
1018 last_kv = last_kv->next;
1019
1020 last_kv->next = kv;
1021 last_kv = kv;
1022 }
1023 }
990 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1024 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
991 break; 1025 break;
992 1026
993 default: 1027 default:
994 if (!f.parse_error ("object", name)) 1028 if (!f.parse_error ("object", name))
… …
1015 1049
1016 assert (arch); //D maybe use exception handling of sorts? 1050 assert (arch); //D maybe use exception handling of sorts?
1017 1051
1018 f.next (); 1052 f.next ();
1019 1053
1020 object *op = object::create (); 1054 object *op = arch->instance ();
1021
1022 op->map = map; 1055 op->map = map;
1023 arch->copy_to (op);
1024 // copy_to activates, this should be fixed properly 1056 // instance() activates, this should be fixed properly
1025 op->deactivate (); 1057 op->deactivate ();
1026 1058
1027 if (!op->parse_kv (f)) 1059 if (!op->parse_kv (f))
1028 { 1060 {
1029 op->destroy (true); 1061 op->destroy (true);
… …
1043int 1075int
1044set_variable (object *op, char *buf) 1076set_variable (object *op, char *buf)
1045{ 1077{
1046 object_thawer f (buf, (AV *)0); 1078 object_thawer f (buf, (AV *)0);
1047 1079
1048 f.next ();
1049 return op->parse_kv (f); 1080 return op->parse_kv (f);
1050} 1081}
1051 1082
1052/* This returns a string of the integer movement type */ 1083/* This returns a string of the integer movement type */
1053#if 0 1084#if 0
… …
1240 /* 110 */ 1271 /* 110 */
1241 KW_destroy_on_death, 1272 KW_destroy_on_death,
1242 KW_NULL, 1273 KW_NULL,
1243 }; 1274 };
1244 1275
1245 int i;
1246
1247 /* This saves the key/value lists. We do it first so that any 1276 /* This saves the key/value lists. We do it first so that any
1248 * keys that match field names will be overwritten by the loader. 1277 * keys that match field names will be overwritten by the loader.
1249 */ 1278 */
1250 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1279 for (key_value *kv = op->key_values; kv; kv = kv->next)
1251 { 1280 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1252 /* Find the field in the opposing member. */ 1281 f.put (kv->key, kv->value);
1253 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1254
1255 /* If there's no partnering field, or it's got a different value, save our field. */
1256 if (!arch_field || my_field->value != arch_field->value)
1257 f.put (my_field->key, my_field->value);
1258 }
1259 1282
1260 /* We don't need to worry about the arch's extra fields - they 1283 /* We don't need to worry about the arch's extra fields - they
1261 * will get taken care of the copy_to method. 1284 * will get taken care of the copy_to method.
1262 */ 1285 */
1263 1286
1264 { 1287 f.put (KW_uuid, op->uuid.c_str ());
1265 char uids[64];
1266 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1267 f.put (KW_uuid, (const char *)uids);
1268 }
1269 1288
1270#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1289#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1271#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1290#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1291
1292 if (object *owner = op->owner)
1293 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1272 1294
1273 CMP_OUT (name); 1295 CMP_OUT (name);
1274 CMP_OUT (name_pl); 1296 CMP_OUT (name_pl);
1275 CMP_OUT (custom_name); 1297 CMP_OUT (custom_name);
1276 CMP_OUT (title); 1298 CMP_OUT (title);
1277 CMP_OUT (race); 1299 CMP_OUT (race);
1300 CMP_OUT (skill);
1278 CMP_OUT (slaying); 1301 CMP_OUT (slaying);
1302 CMP_OUT (tag);
1279 CMP_OUT (other_arch); 1303 CMP_OUT (other_arch);
1280 1304
1281 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1305 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1282 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1306 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1283 1307
1284 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1308 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1285 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1309 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1286 if (op->sound_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0); 1310 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1287 1311
1288 if (op->animation_id != tmp->animation_id) 1312 if (op->animation_id != tmp->animation_id)
1289 if (op->animation_id) 1313 if (op->animation_id)
1314 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1315 else
1290 { 1316 {
1291 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1317 f.put (KW_animation, (const char *)0);
1292 1318 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1293 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1294 f.put (KW_is_animated, (sint32)0);
1295 } 1319 }
1296 else
1297 f.put (KW_animation, (const char *)0);
1298 1320
1299 CMP_OUT2 (str, stats.Str); 1321 CMP_OUT2 (str, stats.Str);
1300 CMP_OUT2 (dex, stats.Dex); 1322 CMP_OUT2 (dex, stats.Dex);
1301 CMP_OUT2 (con, stats.Con); 1323 CMP_OUT2 (con, stats.Con);
1302 CMP_OUT2 (wis, stats.Wis); 1324 CMP_OUT2 (wis, stats.Wis);
… …
1332 CMP_OUT (direction); 1354 CMP_OUT (direction);
1333 CMP_OUT (type); 1355 CMP_OUT (type);
1334 CMP_OUT (subtype); 1356 CMP_OUT (subtype);
1335 CMP_OUT (attacktype); 1357 CMP_OUT (attacktype);
1336 1358
1337 for (i = 0; i < NROFATTACKS; i++) 1359 for (int i = 0; i < NROFATTACKS; i++)
1338 if (op->resist[i] != tmp->resist[i]) 1360 if (expect_false (op->resist[i] != tmp->resist[i]))
1339 f.put (resist_save[i], op->resist[i]); 1361 f.put (resist_save[i], op->resist[i]);
1340 1362
1341 CMP_OUT (path_attuned); 1363 CMP_OUT (path_attuned);
1342 CMP_OUT (path_repelled); 1364 CMP_OUT (path_repelled);
1343 CMP_OUT (path_denied); 1365 CMP_OUT (path_denied);
… …
1353 CMP_OUT (last_sp); 1375 CMP_OUT (last_sp);
1354 CMP_OUT (last_grace); 1376 CMP_OUT (last_grace);
1355 CMP_OUT (last_eat); 1377 CMP_OUT (last_eat);
1356 CMP_OUT (glow_radius); 1378 CMP_OUT (glow_radius);
1357 1379
1358 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1380 if (op->flag [FLAG_IS_LINKED])
1381 if (int i = get_button_value (op))
1359 f.put (KW_connected, i); 1382 f.put (KW_connected, i);
1360 1383
1361 CMP_OUT (randomitems); 1384 CMP_OUT (randomitems);
1362 CMP_OUT2 (container, weight_limit); 1385 CMP_OUT2 (container, weight_limit);
1363 1386
1364 CMP_OUT (run_away); 1387 CMP_OUT (run_away);
1365 CMP_OUT (pick_up); 1388 CMP_OUT (pick_up);
1366 CMP_OUT (will_apply); 1389 CMP_OUT (will_apply);
1367 CMP_OUT (smoothlevel); 1390 CMP_OUT (smoothlevel);
1368 CMP_OUT (weapontype); 1391 CMP_OUT (weapontype);
1369 CMP_OUT (tooltype); 1392 CMP_OUT (tooltype);
1370 CMP_OUT (elevation);
1371 CMP_OUT (client_type); 1393 CMP_OUT (client_type);
1372 CMP_OUT (item_power); 1394 CMP_OUT (item_power);
1373 CMP_OUT (duration); 1395 CMP_OUT (duration);
1374 CMP_OUT (range); 1396 CMP_OUT (range);
1375 CMP_OUT (range_modifier); 1397 CMP_OUT (range_modifier);
… …
1384 CMP_OUT (move_off); 1406 CMP_OUT (move_off);
1385 CMP_OUT (move_slow); 1407 CMP_OUT (move_slow);
1386 CMP_OUT (move_slow_penalty); 1408 CMP_OUT (move_slow_penalty);
1387 1409
1388 if (op->flag != tmp->flag) 1410 if (op->flag != tmp->flag)
1389 for (i = 0; i <= NUM_FLAGS; i++) 1411 for (int i = 0; i <= NUM_FLAGS; i++)
1390 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1412 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1391 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1413 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1392 1414
1393 // save body locations 1415 // save body locations
1394 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1416 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1395 if (op->slot[i].info != tmp->slot[i].info) 1417 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1396 f.put (body_locations[i].save_name, op->slot[i].info); 1418 f.put (body_locations[i].save_name, op->slot[i].info);
1397} 1419}
1398 1420
1399/* 1421/*
1400 * Dumps all variables in an object to a file. 1422 * Dumps all variables in an object to a file.
… …
1402 * the only place this is not set is when saving the player. 1424 * the only place this is not set is when saving the player.
1403 */ 1425 */
1404bool 1426bool
1405object::write (object_freezer &f) 1427object::write (object_freezer &f)
1406{ 1428{
1407 /* Even if the object does have an owner, it would seem that we should 1429 archetype *at = arch ? arch : archetype::empty;
1408 * still save it.
1409 */
1410 if (owner)
1411 return true;
1412
1413 archetype *at = arch ? (archetype *)arch : empty_archetype;
1414 1430
1415 f.put (KW_arch, at->archname); 1431 f.put (KW_arch, at->archname);
1416 write_diff (f, this, at); 1432 write_diff (f, this, at);
1417 1433
1418 for (object *tmp = inv; tmp; tmp = tmp->below) 1434 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1426 1442
1427///////////////////////////////////////////////////////////////////////////// 1443/////////////////////////////////////////////////////////////////////////////
1428 1444
1429// generic resource file load, 1445// generic resource file load,
1430// currently supports: region, treasures, archetypes 1446// currently supports: region, treasures, archetypes
1447bool
1431bool load_resource_file (const char *filename) 1448load_resource_file_ (const char *filename)
1432{ 1449{
1433 object_thawer f (filename); 1450 object_thawer f (filename);
1434
1435 bool success = false;
1436 bool seen_arch = false;
1437
1438 f.next ();
1439 1451
1440 for (;;) 1452 for (;;)
1441 { 1453 {
1442 switch (f.kw) 1454 switch (f.kw)
1443 { 1455 {
1444 case KW_region: 1456 case KW_region:
1445 if (!region::read (f)) 1457 if (!region::read (f))
1446 goto finish; 1458 return false;
1447 break; 1459 break;
1448 1460
1449 case KW_treasure: 1461 case KW_treasure:
1450 case KW_treasureone: 1462 case KW_treasureone:
1451 if (!treasurelist::read (f)) 1463 if (!treasurelist::read (f))
1452 goto finish; 1464 return false;
1453 break; 1465 break;
1454 1466
1455 case KW_object: 1467 case KW_object:
1456 seen_arch = true;
1457 if (!archetype::read (f)) 1468 if (!archetype::read (f))
1458 goto finish; 1469 return false;
1459 break; 1470 break;
1460 1471
1461 case KW_EOF: 1472 case KW_EOF:
1462 success = true; 1473 return true;
1463 goto finish;
1464 1474
1465 default: 1475 default:
1466 if (!f.parse_error ("resource file")) 1476 if (!f.parse_error ("resource file"))
1467 goto finish; 1477 return false;
1468 1478
1469 f.next (); 1479 f.next ();
1470 break; 1480 break;
1471 } 1481 }
1472 } 1482 }
1473
1474finish:
1475 if (seen_arch)
1476 init_archetype_pointers ();
1477
1478 return success;
1479} 1483}
1480 1484

Diff Legend

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