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 | |
|
|
30 | extern 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 | |
254 | extern 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); |
… | |
… | |
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 || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
396 | /* 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 */ |
397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | { |
394 | { |
399 | /* 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' |
400 | * in that spell was stored in sp. |
396 | * in that spell was stored in sp. |
401 | */ |
397 | */ |
|
|
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
402 | 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]); |
403 | insert_ob_in_ob (tmp, this); |
400 | insert_ob_in_ob (tmp, this); |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
405 | } |
402 | } |
406 | |
403 | |
407 | /* 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 */ |
408 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
409 | { |
406 | { |
|
|
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
410 | object *tmp = get_archetype_by_object_name (slaying); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
411 | insert_ob_in_ob (tmp, this); |
409 | insert_ob_in_ob (tmp, this); |
412 | randomitems = NULL; /* So another spell isn't created for this object */ |
410 | randomitems = NULL; /* So another spell isn't created for this object */ |
413 | /* without this, value is all screwed up */ |
411 | /* without this, value is all screwed up */ |
414 | value = arch->value * inv->value; |
412 | value = arch->value * inv->value; |
… | |
… | |
416 | |
414 | |
417 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
418 | { |
416 | { |
419 | if (stats.hp > stats.maxhp) |
417 | if (stats.hp > stats.maxhp) |
420 | { |
418 | { |
421 | 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); |
422 | stats.maxhp = stats.hp; |
420 | stats.maxhp = stats.hp; |
423 | } |
421 | } |
424 | |
422 | |
425 | /* The archs just need to be updated for this */ |
423 | /* The archs just need to be updated for this */ |
426 | if (move_type == 0) |
424 | if (move_type == 0) |
427 | move_type = MOVE_WALK; |
425 | move_type = MOVE_WALK; |
428 | } |
426 | } |
429 | |
427 | |
430 | 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) |
431 | { |
|
|
432 | /* Object will duplicate it's content as part of the |
429 | /* Object will duplicate it's content as part of the |
433 | * generation process. To do this, we must flag inventory |
430 | * generation process. To do this, we must flag inventory |
434 | * so it remains unevaluated concerning the randomitems and |
431 | * so it remains unevaluated concerning the randomitems and |
435 | * the living (a demonlord shouldn't cast from inside generator!) |
432 | * the living (a demonlord shouldn't cast from inside generator!) |
436 | */ |
433 | */ |
|
|
434 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
437 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
435 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
438 | } |
|
|
439 | |
436 | |
440 | /* Handle player movers. We use move_type for player movers |
437 | /* Handle player movers. We use move_type for player movers |
441 | * because they operate on their own time (move_on |
438 | * because they operate on their own time (move_on |
442 | * would potentially cause them to be triggered when someone steps |
439 | * would potentially cause them to be triggered when someone steps |
443 | * 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 |
444 | * are doing, otherwise, set move_type based on maxhp value. |
441 | * are doing, otherwise, set move_type based on maxhp value. |
445 | */ |
442 | */ |
446 | if (type == PLAYERMOVER) |
443 | if (type == PLAYERMOVER) |
447 | { |
444 | { |
448 | if (!move_type) |
445 | if (!move_type) |
… | |
… | |
510 | |
507 | |
511 | goto next; |
508 | goto next; |
512 | } |
509 | } |
513 | } |
510 | } |
514 | |
511 | |
515 | 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); |
516 | |
513 | |
517 | next: ; |
514 | next: ; |
518 | } |
515 | } |
519 | } |
516 | } |
520 | |
517 | |
… | |
… | |
529 | { |
526 | { |
530 | switch (f.kw) |
527 | switch (f.kw) |
531 | { |
528 | { |
532 | case KW_uuid: |
529 | case KW_uuid: |
533 | if (const char *s = f.get_str ()) |
530 | if (const char *s = f.get_str ()) |
534 | { |
531 | 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 | { |
532 | { |
540 | uuid.seq = seq; |
533 | f.parse_warn ("unparseable uuid"); |
541 | break; |
534 | uuid = UUID::gen (); |
542 | } |
535 | } |
543 | } |
|
|
544 | |
|
|
545 | uuid = gen_uuid (); |
|
|
546 | break; |
536 | break; |
547 | |
537 | |
548 | case KW_oid: |
538 | case KW_oid: |
549 | f.get (this, f.get_sint32 ()); |
539 | f.get (this, f.get_sint32 ()); |
550 | break; |
540 | break; |
… | |
… | |
556 | |
546 | |
557 | case KW_attach: f.get_ornull (attach); break; |
547 | case KW_attach: f.get_ornull (attach); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
548 | case KW_skill: f.get_ornull (skill); break; |
559 | case KW_race: f.get_ornull (race); break; |
549 | case KW_race: f.get_ornull (race); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
550 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
551 | case KW_tag: f.get_ornull (tag); break; |
561 | |
552 | |
562 | case KW_arch: |
553 | case KW_arch: |
563 | { |
554 | { |
564 | object *tmp = object::read (f); |
555 | object *tmp = object::read (f); |
565 | tmp->deactivate (); |
556 | tmp->deactivate (); |
… | |
… | |
567 | { |
558 | { |
568 | // was: insert_ob_in_ob (tmp, op); |
559 | // was: insert_ob_in_ob (tmp, op); |
569 | // but manually adding it can improve map loading times a lot |
560 | // but manually adding it can improve map loading times a lot |
570 | // also, appending instead of prepending keeps the |
561 | // also, appending instead of prepending keeps the |
571 | // save ordering the same between repeated load/saves. |
562 | // save ordering the same between repeated load/saves. |
|
|
563 | // and finally we do not want any funny effects |
572 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
564 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
573 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
565 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
574 | |
566 | |
575 | if (!op_inv) |
567 | if (!op_inv) |
576 | { |
568 | { |
… | |
… | |
592 | } |
584 | } |
593 | } |
585 | } |
594 | continue; |
586 | continue; |
595 | |
587 | |
596 | case KW_other_arch: |
588 | case KW_other_arch: |
597 | other_arch = |
|
|
598 | loading_arch |
589 | if (loading_arch == this) |
599 | ? archetype::get (f.get_str ()) |
590 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
591 | else |
|
|
592 | { |
600 | : archetype::find (f.get_str ()); |
593 | other_arch = archetype::find (f.get_str ()); |
601 | |
594 | |
602 | if (!other_arch) |
595 | if (!other_arch) |
603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
596 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
|
|
597 | } |
|
|
598 | break; |
|
|
599 | |
|
|
600 | case KW_owner: |
|
|
601 | f.delayed_deref (this, owner, f.get_str ()); |
604 | break; |
602 | break; |
605 | |
603 | |
606 | case KW_animation: |
604 | case KW_animation: |
607 | { |
605 | { |
608 | CLEAR_FLAG (this, FLAG_ANIMATE); |
606 | CLEAR_FLAG (this, FLAG_ANIMATE); |
… | |
… | |
639 | face = face_find (f.get_str ()); |
637 | face = face_find (f.get_str ()); |
640 | break; |
638 | break; |
641 | |
639 | |
642 | case KW_sound: |
640 | case KW_sound: |
643 | sound = sound_find (f.get_str ()); |
641 | sound = sound_find (f.get_str ()); |
|
|
642 | if (!sound) |
|
|
643 | f.parse_warn ("sound not found"); |
644 | break; |
644 | break; |
645 | |
645 | |
646 | case KW_sound_die: |
646 | case KW_sound_destroy: |
647 | sound_die = sound_find (f.get_str ()); |
647 | sound_destroy = sound_find (f.get_str ()); |
|
|
648 | if (!sound_destroy) |
|
|
649 | f.parse_warn ("sound not found"); |
648 | break; |
650 | break; |
649 | |
651 | |
650 | case KW_x: f.get (x); break; |
652 | case KW_x: f.get (x); break; |
651 | case KW_y: f.get (y); break; |
653 | case KW_y: f.get (y); break; |
652 | |
654 | |
… | |
… | |
803 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
805 | 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; |
806 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
805 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
807 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
806 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
808 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
807 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
809 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
810 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
808 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
811 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
809 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
812 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
810 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
813 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
811 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
814 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
812 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
815 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
… | |
… | |
1043 | int |
1046 | int |
1044 | set_variable (object *op, char *buf) |
1047 | set_variable (object *op, char *buf) |
1045 | { |
1048 | { |
1046 | object_thawer f (buf, (AV *)0); |
1049 | object_thawer f (buf, (AV *)0); |
1047 | |
1050 | |
1048 | f.next (); |
|
|
1049 | return op->parse_kv (f); |
1051 | return op->parse_kv (f); |
1050 | } |
1052 | } |
1051 | |
1053 | |
1052 | /* This returns a string of the integer movement type */ |
1054 | /* This returns a string of the integer movement type */ |
1053 | #if 0 |
1055 | #if 0 |
… | |
… | |
1259 | |
1261 | |
1260 | /* We don't need to worry about the arch's extra fields - they |
1262 | /* We don't need to worry about the arch's extra fields - they |
1261 | * will get taken care of the copy_to method. |
1263 | * will get taken care of the copy_to method. |
1262 | */ |
1264 | */ |
1263 | |
1265 | |
1264 | { |
1266 | 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 | |
1267 | |
1270 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1268 | #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) |
1269 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
|
|
1270 | |
|
|
1271 | if (object *owner = op->owner) |
|
|
1272 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1272 | |
1273 | |
1273 | CMP_OUT (name); |
1274 | CMP_OUT (name); |
1274 | CMP_OUT (name_pl); |
1275 | CMP_OUT (name_pl); |
1275 | CMP_OUT (custom_name); |
1276 | CMP_OUT (custom_name); |
1276 | CMP_OUT (title); |
1277 | CMP_OUT (title); |
1277 | CMP_OUT (race); |
1278 | CMP_OUT (race); |
|
|
1279 | CMP_OUT (skill); |
1278 | CMP_OUT (slaying); |
1280 | CMP_OUT (slaying); |
|
|
1281 | CMP_OUT (tag); |
1279 | CMP_OUT (other_arch); |
1282 | CMP_OUT (other_arch); |
1280 | |
1283 | |
1281 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1284 | 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); |
1285 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1283 | |
1286 | |
1284 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1287 | 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); |
1288 | 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); |
1289 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1287 | |
1290 | |
1288 | if (op->animation_id != tmp->animation_id) |
1291 | if (op->animation_id != tmp->animation_id) |
1289 | if (op->animation_id) |
1292 | if (op->animation_id) |
1290 | { |
1293 | { |
1291 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1294 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
… | |
… | |
1333 | CMP_OUT (type); |
1336 | CMP_OUT (type); |
1334 | CMP_OUT (subtype); |
1337 | CMP_OUT (subtype); |
1335 | CMP_OUT (attacktype); |
1338 | CMP_OUT (attacktype); |
1336 | |
1339 | |
1337 | for (i = 0; i < NROFATTACKS; i++) |
1340 | for (i = 0; i < NROFATTACKS; i++) |
1338 | if (op->resist[i] != tmp->resist[i]) |
1341 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1339 | f.put (resist_save[i], op->resist[i]); |
1342 | f.put (resist_save[i], op->resist[i]); |
1340 | |
1343 | |
1341 | CMP_OUT (path_attuned); |
1344 | CMP_OUT (path_attuned); |
1342 | CMP_OUT (path_repelled); |
1345 | CMP_OUT (path_repelled); |
1343 | CMP_OUT (path_denied); |
1346 | CMP_OUT (path_denied); |
… | |
… | |
1385 | CMP_OUT (move_slow); |
1388 | CMP_OUT (move_slow); |
1386 | CMP_OUT (move_slow_penalty); |
1389 | CMP_OUT (move_slow_penalty); |
1387 | |
1390 | |
1388 | if (op->flag != tmp->flag) |
1391 | if (op->flag != tmp->flag) |
1389 | for (i = 0; i <= NUM_FLAGS; i++) |
1392 | for (i = 0; i <= NUM_FLAGS; i++) |
1390 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1393 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1391 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1394 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1392 | |
1395 | |
1393 | // save body locations |
1396 | // save body locations |
1394 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1397 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1395 | if (op->slot[i].info != tmp->slot[i].info) |
1398 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1396 | f.put (body_locations[i].save_name, op->slot[i].info); |
1399 | f.put (body_locations[i].save_name, op->slot[i].info); |
1397 | } |
1400 | } |
1398 | |
1401 | |
1399 | /* |
1402 | /* |
1400 | * Dumps all variables in an object to a file. |
1403 | * Dumps all variables in an object to a file. |
… | |
… | |
1402 | * the only place this is not set is when saving the player. |
1405 | * the only place this is not set is when saving the player. |
1403 | */ |
1406 | */ |
1404 | bool |
1407 | bool |
1405 | object::write (object_freezer &f) |
1408 | object::write (object_freezer &f) |
1406 | { |
1409 | { |
1407 | /* Even if the object does have an owner, it would seem that we should |
1410 | 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 | |
1411 | |
1415 | f.put (KW_arch, at->archname); |
1412 | f.put (KW_arch, at->archname); |
1416 | write_diff (f, this, at); |
1413 | write_diff (f, this, at); |
1417 | |
1414 | |
1418 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1415 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
1426 | |
1423 | |
1427 | ///////////////////////////////////////////////////////////////////////////// |
1424 | ///////////////////////////////////////////////////////////////////////////// |
1428 | |
1425 | |
1429 | // generic resource file load, |
1426 | // generic resource file load, |
1430 | // currently supports: region, treasures, archetypes |
1427 | // currently supports: region, treasures, archetypes |
|
|
1428 | bool |
1431 | bool load_resource_file (const char *filename) |
1429 | load_resource_file_ (const char *filename) |
1432 | { |
1430 | { |
1433 | object_thawer f (filename); |
1431 | object_thawer f (filename); |
1434 | |
|
|
1435 | bool success = false; |
|
|
1436 | bool seen_arch = false; |
|
|
1437 | |
|
|
1438 | f.next (); |
|
|
1439 | |
1432 | |
1440 | for (;;) |
1433 | for (;;) |
1441 | { |
1434 | { |
1442 | switch (f.kw) |
1435 | switch (f.kw) |
1443 | { |
1436 | { |
1444 | case KW_region: |
1437 | case KW_region: |
1445 | if (!region::read (f)) |
1438 | if (!region::read (f)) |
1446 | goto finish; |
1439 | return false; |
1447 | break; |
1440 | break; |
1448 | |
1441 | |
1449 | case KW_treasure: |
1442 | case KW_treasure: |
1450 | case KW_treasureone: |
1443 | case KW_treasureone: |
1451 | if (!treasurelist::read (f)) |
1444 | if (!treasurelist::read (f)) |
1452 | goto finish; |
1445 | return false; |
1453 | break; |
1446 | break; |
1454 | |
1447 | |
1455 | case KW_object: |
1448 | case KW_object: |
1456 | seen_arch = true; |
|
|
1457 | if (!archetype::read (f)) |
1449 | if (!archetype::read (f)) |
1458 | goto finish; |
1450 | return false; |
1459 | break; |
1451 | break; |
1460 | |
1452 | |
1461 | case KW_EOF: |
1453 | case KW_EOF: |
1462 | success = true; |
1454 | return true; |
1463 | goto finish; |
|
|
1464 | |
1455 | |
1465 | default: |
1456 | default: |
1466 | if (!f.parse_error ("resource file")) |
1457 | if (!f.parse_error ("resource file")) |
1467 | goto finish; |
1458 | return false; |
1468 | |
1459 | |
1469 | f.next (); |
1460 | f.next (); |
1470 | break; |
1461 | break; |
1471 | } |
1462 | } |
1472 | } |
1463 | } |
1473 | |
|
|
1474 | finish: |
|
|
1475 | if (seen_arch) |
|
|
1476 | init_archetype_pointers (); |
|
|
1477 | |
|
|
1478 | return success; |
|
|
1479 | } |
1464 | } |
1480 | |
1465 | |