| … | |
… | |
| 265 | type = 0; |
265 | type = 0; |
| 266 | } |
266 | } |
| 267 | |
267 | |
| 268 | switch (type) |
268 | switch (type) |
| 269 | { |
269 | { |
|
|
270 | case RANGED: |
| 270 | case BOW: |
271 | case BOW: |
| 271 | case WAND: |
272 | case WAND: |
| 272 | case ROD: |
273 | case ROD: |
| 273 | case HORN: |
274 | case HORN: |
| 274 | if (slot [body_range].info != -1) |
275 | if (slot [body_range].info != -1) |
| … | |
… | |
| 394 | if (ip > 2 * item_power && ip > (item_power + 3)) |
395 | if (ip > 2 * item_power && ip > (item_power + 3)) |
| 395 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
396 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
| 396 | #endif |
397 | #endif |
| 397 | } |
398 | } |
| 398 | |
399 | |
| 399 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
400 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
| 400 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
401 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
| 401 | if ((type == ROD |
402 | if ((type == ROD |
| 402 | || type == WAND |
403 | || type == WAND |
| 403 | || type == SCROLL |
404 | || type == SCROLL |
| 404 | || type == HORN |
405 | || type == HORN |
| … | |
… | |
| 429 | randomitems = 0; /* So another spell isn't created for this object */ |
430 | randomitems = 0; /* So another spell isn't created for this object */ |
| 430 | /* without this, value is all screwed up */ |
431 | /* without this, value is all screwed up */ |
| 431 | value = arch->value * inv->value; |
432 | value = arch->value * inv->value; |
| 432 | } |
433 | } |
| 433 | |
434 | |
| 434 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
435 | if (this->flag [FLAG_MONSTER]) |
| 435 | { |
436 | { |
| 436 | if (stats.hp > stats.maxhp) |
437 | if (stats.hp > stats.maxhp) |
| 437 | { |
438 | { |
| 438 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
439 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
| 439 | stats.maxhp = stats.hp; |
440 | stats.maxhp = stats.hp; |
| … | |
… | |
| 442 | /* The archs just need to be updated for this */ |
443 | /* The archs just need to be updated for this */ |
| 443 | if (move_type == 0) |
444 | if (move_type == 0) |
| 444 | move_type = MOVE_WALK; |
445 | move_type = MOVE_WALK; |
| 445 | } |
446 | } |
| 446 | |
447 | |
| 447 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
448 | if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) |
| 448 | /* Object will duplicate it's content as part of the |
449 | /* Object will duplicate it's content as part of the |
| 449 | * generation process. To do this, we must flag inventory |
450 | * generation process. To do this, we must flag inventory |
| 450 | * so it remains unevaluated concerning the randomitems and |
451 | * so it remains unevaluated concerning the randomitems and |
| 451 | * the living (a demonlord shouldn't cast from inside generator!) |
452 | * the living (a demonlord shouldn't cast from inside generator!) |
| 452 | */ |
453 | */ |
| … | |
… | |
| 522 | { |
523 | { |
| 523 | negate = 1; |
524 | negate = 1; |
| 524 | str++; |
525 | str++; |
| 525 | } |
526 | } |
| 526 | |
527 | |
| 527 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
528 | for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) |
| 528 | { |
529 | { |
| 529 | if (!strcmp (f->name, str)) |
530 | if (!strcmp (f->name, str)) |
| 530 | { |
531 | { |
| 531 | if (negate) |
532 | if (negate) |
| 532 | mt &= ~f->flags; |
533 | mt &= ~f->flags; |
| … | |
… | |
| 588 | // was: insert_ob_in_ob (tmp, op); |
589 | // was: insert_ob_in_ob (tmp, op); |
| 589 | // but manually adding it can improve map loading times a lot |
590 | // but manually adding it can improve map loading times a lot |
| 590 | // also, appending instead of prepending keeps the |
591 | // also, appending instead of prepending keeps the |
| 591 | // save ordering the same between repeated load/saves. |
592 | // save ordering the same between repeated load/saves. |
| 592 | // and finally we do not want any funny effects |
593 | // and finally we do not want any funny effects |
| 593 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
594 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
| 594 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
595 | tmp->clr_flag (FLAG_REMOVED); |
| 595 | |
596 | |
| 596 | if (!op_inv) |
597 | if (!op_inv) |
| 597 | { |
598 | { |
| 598 | inv = tmp; |
599 | inv = tmp; |
| 599 | tmp->above = 0; |
600 | tmp->above = 0; |
| … | |
… | |
| 632 | f.delayed_deref (this, owner, f.get_str ()); |
633 | f.delayed_deref (this, owner, f.get_str ()); |
| 633 | break; |
634 | break; |
| 634 | |
635 | |
| 635 | case KW_animation: |
636 | case KW_animation: |
| 636 | { |
637 | { |
| 637 | CLEAR_FLAG (this, FLAG_ANIMATE); |
638 | this->clr_flag (FLAG_ANIMATE); |
| 638 | animation_id = 0; |
639 | animation_id = 0; |
| 639 | |
640 | |
| 640 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
641 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
| 641 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
642 | this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
| 642 | } |
643 | } |
| 643 | break; |
644 | break; |
| 644 | |
645 | |
| 645 | case KW_last_heal: f.get (last_heal); break; |
646 | case KW_last_heal: f.get (last_heal); break; |
| 646 | case KW_last_sp: f.get (last_sp); break; |
647 | case KW_last_sp: f.get (last_sp); break; |
| … | |
… | |
| 736 | case KW_invisible: f.get (invisible); break; |
737 | case KW_invisible: f.get (invisible); break; |
| 737 | case KW_magic: f.get (magic); break; |
738 | case KW_magic: f.get (magic); break; |
| 738 | case KW_state: f.get (state); break; |
739 | case KW_state: f.get (state); break; |
| 739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
740 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
| 740 | case KW_material: f.get (materials); break; //TODO: nuke |
741 | case KW_material: f.get (materials); break; //TODO: nuke |
| 741 | |
742 | case KW_materialname: f.get (material); break; |
| 742 | case KW_materialname: |
|
|
| 743 | { |
|
|
| 744 | shstr sh; |
|
|
| 745 | f.get (sh); |
|
|
| 746 | material = name_to_material (sh); |
|
|
| 747 | } |
|
|
| 748 | break; |
|
|
| 749 | |
743 | |
| 750 | /* These are the new values */ |
744 | /* These are the new values */ |
| 751 | case KW_move_block: set_move (move_block, f); break; |
745 | case KW_move_block: set_move (move_block, f); break; |
| 752 | case KW_move_allow: set_move (move_allow, f); break; |
746 | case KW_move_allow: set_move (move_allow, f); break; |
| 753 | case KW_move_type: set_move (move_type , f); break; |
747 | case KW_move_type: set_move (move_type , f); break; |
| … | |
… | |
| 824 | |
818 | |
| 825 | |
819 | |
| 826 | case KW_identified: |
820 | case KW_identified: |
| 827 | GET_FLAG (this, FLAG_IDENTIFIED); |
821 | GET_FLAG (this, FLAG_IDENTIFIED); |
| 828 | //TODO: move to check_object or so |
822 | //TODO: move to check_object or so |
| 829 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
823 | if (this->flag [FLAG_IDENTIFIED]) |
| 830 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
824 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
| 831 | |
825 | |
| 832 | break; |
826 | break; |
| 833 | |
827 | |
| 834 | case KW_friendly: |
828 | case KW_friendly: |
| 835 | if (f.get_bool ()) |
829 | if (f.get_bool ()) |
| … | |
… | |
| 1087 | |
1081 | |
| 1088 | archetype *arch = archetype::find (f.get_str ()); |
1082 | archetype *arch = archetype::find (f.get_str ()); |
| 1089 | |
1083 | |
| 1090 | if (!arch) |
1084 | if (!arch) |
| 1091 | { |
1085 | { |
| 1092 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1086 | LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); |
| 1093 | arch = archetype::find (shstr_earthwall); |
1087 | arch = archetype::find (shstr_earthwall); |
| 1094 | } |
1088 | } |
| 1095 | |
1089 | |
| 1096 | assert (arch); //D maybe use exception handling of sorts? |
1090 | assert (arch); //D maybe use exception handling of sorts? |
| 1097 | |
1091 | |
| … | |
… | |
| 1119 | * override values and in c_wiz to mutate values. |
1113 | * override values and in c_wiz to mutate values. |
| 1120 | */ |
1114 | */ |
| 1121 | int |
1115 | int |
| 1122 | set_variable (object *op, char *buf) |
1116 | set_variable (object *op, char *buf) |
| 1123 | { |
1117 | { |
| 1124 | object_thawer f (buf, (AV *)0); |
1118 | object_thawer f (format ("%s\nend", buf), (AV *)0); |
| 1125 | |
1119 | |
| 1126 | return op->parse_kv (f); |
1120 | return op->parse_kv (f); |
| 1127 | } |
1121 | } |
| 1128 | |
1122 | |
| 1129 | // compare *op against *arch and output differences |
1123 | // compare *op against *arch and output differences |
| … | |
… | |
| 1340 | |
1334 | |
| 1341 | CMP_OUT (tag); |
1335 | CMP_OUT (tag); |
| 1342 | CMP_OUT (custom_name); |
1336 | CMP_OUT (custom_name); |
| 1343 | |
1337 | |
| 1344 | if (object *owner = op->owner) |
1338 | if (object *owner = op->owner) |
| 1345 | f.put (KW(owner), static_cast<const char *>(owner->ref ())); |
1339 | if (const char *ref = owner->ref ()) |
|
|
1340 | f.put (KW(owner), ref); |
| 1346 | |
1341 | |
| 1347 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1342 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
| 1348 | |
1343 | |
| 1349 | CMP_OUT (other_arch); |
1344 | CMP_OUT (other_arch); |
| 1350 | |
1345 | |
| … | |
… | |
| 1450 | CMP_OUT (move_slow); |
1445 | CMP_OUT (move_slow); |
| 1451 | CMP_OUT (move_slow_penalty); |
1446 | CMP_OUT (move_slow_penalty); |
| 1452 | |
1447 | |
| 1453 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1448 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
| 1454 | |
1449 | |
|
|
1450 | #if stdcpp // we need gcc, sorry |
| 1455 | if (diff [FLAG_OBJ_ORIGINAL]) |
1451 | if (diff [FLAG_OBJ_ORIGINAL]) |
| 1456 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
1452 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
| 1457 | |
1453 | |
| 1458 | diff.reset (FLAG_OBJ_ORIGINAL); |
1454 | diff.reset (FLAG_OBJ_ORIGINAL); |
| 1459 | |
1455 | |
| 1460 | // quickly test whether any other flags differ |
1456 | // quickly test whether any other flags differ |
| 1461 | if (expect_true (diff.any ())) |
1457 | if (expect_true (diff.any ())) |
| 1462 | for (int i = 0; i < NUM_FLAGS; i++) |
1458 | for (int i = 0; i < NUM_FLAGS; i++) |
| 1463 | if (expect_false (diff [i])) |
1459 | if (expect_false (diff [i])) |
| 1464 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
1460 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1461 | #else |
|
|
1462 | // use sgi extensions |
|
|
1463 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1464 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1465 | #endif |
| 1465 | |
1466 | |
| 1466 | // save body locations. gcc's memcmp does an abysmal job when used |
1467 | // save body locations. gcc's memcmp does an abysmal job when used |
| 1467 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1468 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
| 1468 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1469 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
| 1469 | f.put (body_locations[i].save_name, op->slot[i].info); |
1470 | f.put (body_locations[i].kw, op->slot[i].info); |
| 1470 | } |
1471 | } |
| 1471 | |
1472 | |
| 1472 | /* |
1473 | /* |
| 1473 | * Dumps all variables in an object to a file. |
1474 | * Dumps all variables in an object to a file. |
| 1474 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1475 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
| … | |
… | |
| 1506 | { |
1507 | { |
| 1507 | object_thawer f (filename); |
1508 | object_thawer f (filename); |
| 1508 | |
1509 | |
| 1509 | for (;;) |
1510 | for (;;) |
| 1510 | { |
1511 | { |
|
|
1512 | coroapi::cede_to_tick (); |
|
|
1513 | |
| 1511 | switch (f.kw) |
1514 | switch (f.kw) |
| 1512 | { |
1515 | { |
| 1513 | case KW_region: |
1516 | case KW_region: |
| 1514 | if (!region::read (f)) |
1517 | if (!region::read (f)) |
| 1515 | return false; |
1518 | return false; |
