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.100 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.120 by root, Thu Sep 11 12:43:17 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 { 565 {
564 object *tmp = object::read (f); 566 object *tmp = object::read (f);
565 tmp->deactivate (); 567 tmp->deactivate ();
… …
567 { 569 {
568 // was: insert_ob_in_ob (tmp, op); 570 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 571 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 572 // also, appending instead of prepending keeps the
571 // save ordering the same between repeated load/saves. 573 // save ordering the same between repeated load/saves.
574 // and finally we do not want any funny effects
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 575 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 576 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 577
575 if (!op_inv) 578 if (!op_inv)
576 { 579 {
… …
592 } 595 }
593 } 596 }
594 continue; 597 continue;
595 598
596 case KW_other_arch: 599 case KW_other_arch:
597 other_arch =
598 loading_arch 600 if (loading_arch == this)
599 ? archetype::get (f.get_str ()) 601 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
602 else
603 {
600 : archetype::find (f.get_str ()); 604 other_arch = archetype::find (f.get_str ());
601 605
602 if (!other_arch) 606 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 607 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
608 }
604 break; 609 break;
605 610
606 case KW_owner: 611 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ()); 612 f.delayed_deref (this, owner, f.get_str ());
608 break; 613 break;
… …
612 CLEAR_FLAG (this, FLAG_ANIMATE); 617 CLEAR_FLAG (this, FLAG_ANIMATE);
613 animation_id = 0; 618 animation_id = 0;
614 619
615 const char *str = f.get_str (); 620 const char *str = f.get_str ();
616 if (str && (animation_id = find_animation (str))) 621 if (str && (animation_id = find_animation (str)))
617 SET_FLAG (this, FLAG_ANIMATE); 622 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
618 } 623 }
619 break; 624 break;
620 625
621 case KW_last_heal: f.get (last_heal); break; 626 case KW_last_heal: f.get (last_heal); break;
622 case KW_last_sp: f.get (last_sp); break; 627 case KW_last_sp: f.get (last_sp); break;
… …
811 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 816 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
812 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 817 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
813 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 818 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
814 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 819 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
815 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 820 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
821 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
816 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 822 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
817 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 823 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
818 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 824 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
819 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 825 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
820 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 826 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
925 case KW_expmul: f.get (expmul); break; 931 case KW_expmul: f.get (expmul); break;
926 case KW_glow_radius: f.get (glow_radius); break; 932 case KW_glow_radius: f.get (glow_radius); break;
927 case KW_weapontype: f.get (weapontype); break; 933 case KW_weapontype: f.get (weapontype); break;
928 case KW_tooltype: f.get (tooltype); break; 934 case KW_tooltype: f.get (tooltype); break;
929 case KW_casting_time: f.get (casting_time); break; 935 case KW_casting_time: f.get (casting_time); break;
936
937 // elevation is deprecated
930 case KW_elevation: f.get (elevation); break; 938 case KW_elevation: break;
939
931 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 940 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
932 case KW_client_type: f.get (client_type); break; 941 case KW_client_type: f.get (client_type); break;
933 case KW_duration: f.get (duration); break; 942 case KW_duration: f.get (duration); break;
934 case KW_range: f.get (range); break; 943 case KW_range: f.get (range); break;
935 case KW_range_modifier: f.get (range_modifier); break; 944 case KW_range_modifier: f.get (range_modifier); break;
… …
992 1001
993 f.next (); 1002 f.next ();
994 return true; 1003 return true;
995 1004
996 case KW_ERROR: 1005 case KW_ERROR:
997 set_ob_key_value (this, f.kw_str, f.value, true); 1006 // append as key value pair (do not use kv_set as it prepends)
1007 // we also do not even try to find old values, duplicate keys stay duplicate
1008 {
1009 key_value *kv = new key_value;
1010
1011 kv->next = 0;
1012 kv->key = shstr (f.kw_str);
1013 kv->value = shstr (f.value);
1014
1015 if (!last_kv)
1016 key_values = last_kv = kv;
1017 else
1018 {
1019 while (last_kv->next)
1020 last_kv = last_kv->next;
1021
1022 last_kv->next = kv;
1023 last_kv = kv;
1024 }
1025 }
998 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1026 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
999 break; 1027 break;
1000 1028
1001 default: 1029 default:
1002 if (!f.parse_error ("object", name)) 1030 if (!f.parse_error ("object", name))
… …
1023 1051
1024 assert (arch); //D maybe use exception handling of sorts? 1052 assert (arch); //D maybe use exception handling of sorts?
1025 1053
1026 f.next (); 1054 f.next ();
1027 1055
1028 object *op = object::create (); 1056 object *op = arch->instance ();
1029
1030 op->map = map; 1057 op->map = map;
1031 arch->copy_to (op);
1032 // copy_to activates, this should be fixed properly 1058 // instance() activates, this should be fixed properly
1033 op->deactivate (); 1059 op->deactivate ();
1034 1060
1035 if (!op->parse_kv (f)) 1061 if (!op->parse_kv (f))
1036 { 1062 {
1037 op->destroy (true); 1063 op->destroy (true);
… …
1247 /* 110 */ 1273 /* 110 */
1248 KW_destroy_on_death, 1274 KW_destroy_on_death,
1249 KW_NULL, 1275 KW_NULL,
1250 }; 1276 };
1251 1277
1252 int i;
1253
1254 /* This saves the key/value lists. We do it first so that any 1278 /* This saves the key/value lists. We do it first so that any
1255 * keys that match field names will be overwritten by the loader. 1279 * keys that match field names will be overwritten by the loader.
1256 */ 1280 */
1257 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1281 for (key_value *kv = op->key_values; kv; kv = kv->next)
1258 { 1282 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1259 /* Find the field in the opposing member. */ 1283 f.put (kv->key, kv->value);
1260 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1261
1262 /* If there's no partnering field, or it's got a different value, save our field. */
1263 if (!arch_field || my_field->value != arch_field->value)
1264 f.put (my_field->key, my_field->value);
1265 }
1266 1284
1267 /* We don't need to worry about the arch's extra fields - they 1285 /* We don't need to worry about the arch's extra fields - they
1268 * will get taken care of the copy_to method. 1286 * will get taken care of the copy_to method.
1269 */ 1287 */
1270 1288
1271 { 1289 f.put (KW_uuid, op->uuid.c_str ());
1272 char uids[64];
1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1274 f.put (KW_uuid, (const char *)uids);
1275 }
1276 1290
1277#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1278#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1279 1293
1280 if (object *owner = op->owner) 1294 if (object *owner = op->owner)
… …
1283 CMP_OUT (name); 1297 CMP_OUT (name);
1284 CMP_OUT (name_pl); 1298 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1299 CMP_OUT (custom_name);
1286 CMP_OUT (title); 1300 CMP_OUT (title);
1287 CMP_OUT (race); 1301 CMP_OUT (race);
1302 CMP_OUT (skill);
1288 CMP_OUT (slaying); 1303 CMP_OUT (slaying);
1304 CMP_OUT (tag);
1289 CMP_OUT (other_arch); 1305 CMP_OUT (other_arch);
1290 1306
1291 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1307 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1292 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1308 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1293 1309
… …
1295 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1296 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1297 1313
1298 if (op->animation_id != tmp->animation_id) 1314 if (op->animation_id != tmp->animation_id)
1299 if (op->animation_id) 1315 if (op->animation_id)
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1317 else
1300 { 1318 {
1301 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1319 f.put (KW_animation, (const char *)0);
1302 1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1303 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1304 f.put (KW_is_animated, (sint32)0);
1305 } 1321 }
1306 else
1307 f.put (KW_animation, (const char *)0);
1308 1322
1309 CMP_OUT2 (str, stats.Str); 1323 CMP_OUT2 (str, stats.Str);
1310 CMP_OUT2 (dex, stats.Dex); 1324 CMP_OUT2 (dex, stats.Dex);
1311 CMP_OUT2 (con, stats.Con); 1325 CMP_OUT2 (con, stats.Con);
1312 CMP_OUT2 (wis, stats.Wis); 1326 CMP_OUT2 (wis, stats.Wis);
… …
1342 CMP_OUT (direction); 1356 CMP_OUT (direction);
1343 CMP_OUT (type); 1357 CMP_OUT (type);
1344 CMP_OUT (subtype); 1358 CMP_OUT (subtype);
1345 CMP_OUT (attacktype); 1359 CMP_OUT (attacktype);
1346 1360
1347 for (i = 0; i < NROFATTACKS; i++) 1361 for (int i = 0; i < NROFATTACKS; i++)
1348 if (expect_false (op->resist[i] != tmp->resist[i])) 1362 if (expect_false (op->resist[i] != tmp->resist[i]))
1349 f.put (resist_save[i], op->resist[i]); 1363 f.put (resist_save[i], op->resist[i]);
1350 1364
1351 CMP_OUT (path_attuned); 1365 CMP_OUT (path_attuned);
1352 CMP_OUT (path_repelled); 1366 CMP_OUT (path_repelled);
… …
1363 CMP_OUT (last_sp); 1377 CMP_OUT (last_sp);
1364 CMP_OUT (last_grace); 1378 CMP_OUT (last_grace);
1365 CMP_OUT (last_eat); 1379 CMP_OUT (last_eat);
1366 CMP_OUT (glow_radius); 1380 CMP_OUT (glow_radius);
1367 1381
1368 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1382 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op))
1369 f.put (KW_connected, i); 1384 f.put (KW_connected, i);
1370 1385
1371 CMP_OUT (randomitems); 1386 CMP_OUT (randomitems);
1372 CMP_OUT2 (container, weight_limit); 1387 CMP_OUT2 (container, weight_limit);
1373 1388
1374 CMP_OUT (run_away); 1389 CMP_OUT (run_away);
1375 CMP_OUT (pick_up); 1390 CMP_OUT (pick_up);
1376 CMP_OUT (will_apply); 1391 CMP_OUT (will_apply);
1377 CMP_OUT (smoothlevel); 1392 CMP_OUT (smoothlevel);
1378 CMP_OUT (weapontype); 1393 CMP_OUT (weapontype);
1379 CMP_OUT (tooltype); 1394 CMP_OUT (tooltype);
1380 CMP_OUT (elevation);
1381 CMP_OUT (client_type); 1395 CMP_OUT (client_type);
1382 CMP_OUT (item_power); 1396 CMP_OUT (item_power);
1383 CMP_OUT (duration); 1397 CMP_OUT (duration);
1384 CMP_OUT (range); 1398 CMP_OUT (range);
1385 CMP_OUT (range_modifier); 1399 CMP_OUT (range_modifier);
… …
1394 CMP_OUT (move_off); 1408 CMP_OUT (move_off);
1395 CMP_OUT (move_slow); 1409 CMP_OUT (move_slow);
1396 CMP_OUT (move_slow_penalty); 1410 CMP_OUT (move_slow_penalty);
1397 1411
1398 if (op->flag != tmp->flag) 1412 if (op->flag != tmp->flag)
1399 for (i = 0; i <= NUM_FLAGS; i++) 1413 for (int i = 0; i <= NUM_FLAGS; i++)
1400 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1414 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1401 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1415 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1402 1416
1403 // save body locations 1417 // save body locations
1404 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1418 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1405 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1419 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1406 f.put (body_locations[i].save_name, op->slot[i].info); 1420 f.put (body_locations[i].save_name, op->slot[i].info);
1407} 1421}
1408 1422
1409/* 1423/*
… …
1412 * the only place this is not set is when saving the player. 1426 * the only place this is not set is when saving the player.
1413 */ 1427 */
1414bool 1428bool
1415object::write (object_freezer &f) 1429object::write (object_freezer &f)
1416{ 1430{
1417 archetype *at = arch ? (archetype *)arch : empty_archetype; 1431 archetype *at = arch ? arch : archetype::empty;
1418 1432
1419 f.put (KW_arch, at->archname); 1433 f.put (KW_arch, at->archname);
1420 write_diff (f, this, at); 1434 write_diff (f, this, at);
1421 1435
1422 for (object *tmp = inv; tmp; tmp = tmp->below) 1436 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1430 1444
1431///////////////////////////////////////////////////////////////////////////// 1445/////////////////////////////////////////////////////////////////////////////
1432 1446
1433// generic resource file load, 1447// generic resource file load,
1434// currently supports: region, treasures, archetypes 1448// currently supports: region, treasures, archetypes
1449bool
1435bool load_resource_file (const char *filename) 1450load_resource_file_ (const char *filename)
1436{ 1451{
1437 object_thawer f (filename); 1452 object_thawer f (filename);
1438
1439 bool success = false;
1440 bool seen_arch = false;
1441 1453
1442 for (;;) 1454 for (;;)
1443 { 1455 {
1444 switch (f.kw) 1456 switch (f.kw)
1445 { 1457 {
1446 case KW_region: 1458 case KW_region:
1447 if (!region::read (f)) 1459 if (!region::read (f))
1448 goto finish; 1460 return false;
1449 break; 1461 break;
1450 1462
1451 case KW_treasure: 1463 case KW_treasure:
1452 case KW_treasureone: 1464 case KW_treasureone:
1453 if (!treasurelist::read (f)) 1465 if (!treasurelist::read (f))
1454 goto finish; 1466 return false;
1455 break; 1467 break;
1456 1468
1457 case KW_object: 1469 case KW_object:
1458 seen_arch = true;
1459 if (!archetype::read (f)) 1470 if (!archetype::read (f))
1460 goto finish; 1471 return false;
1461 break; 1472 break;
1462 1473
1463 case KW_EOF: 1474 case KW_EOF:
1464 success = true; 1475 return true;
1465 goto finish;
1466 1476
1467 default: 1477 default:
1468 if (!f.parse_error ("resource file")) 1478 if (!f.parse_error ("resource file"))
1469 goto finish; 1479 return false;
1470 1480
1471 f.next (); 1481 f.next ();
1472 break; 1482 break;
1473 } 1483 }
1474 } 1484 }
1475
1476finish:
1477 if (seen_arch)
1478 init_archetype_pointers ();
1479
1480 return success;
1481} 1485}
1482 1486

Diff Legend

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