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.142 by root, Mon Nov 9 17:39:05 2009 UTC vs.
Revision 1.158 by root, Fri Apr 30 20:43:18 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
… …
330 329
331 if (!name_pl) 330 if (!name_pl)
332 name_pl = name; 331 name_pl = name;
333 332
334 /* objects now have a materialname. try to patch it in */ 333 /* objects now have a materialname. try to patch it in */
335 if (!(is_weapon () && level > 0)) 334 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 set_materialname (this, map ? map->difficulty : 5, 0); 335 select_material (this, map ? map->difficulty : 5);
336
337 if (speed < 0.)
338 {
339 flag [FLAG_RANDOM_SPEED] = true;
340 speed = -speed;
341 // speed_left will be randomised in instantiate () and copy_to ()
342 }
337 343
338 /* only do these when program is first run - a bit 344 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 345 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 346 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 347 * not in the ideal fashion.
… …
388 if (ip > 2 * item_power && ip > (item_power + 3)) 394 if (ip > 2 * item_power && ip > (item_power + 3))
389 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 395 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
390#endif 396#endif
391 } 397 }
392 398
393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 399 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
394 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 400 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD 401 if ((type == ROD
396 || type == WAND 402 || type == WAND
397 || type == SCROLL 403 || type == SCROLL
398 || type == HORN 404 || type == HORN
… …
423 randomitems = 0; /* So another spell isn't created for this object */ 429 randomitems = 0; /* So another spell isn't created for this object */
424 /* without this, value is all screwed up */ 430 /* without this, value is all screwed up */
425 value = arch->value * inv->value; 431 value = arch->value * inv->value;
426 } 432 }
427 433
428 if (QUERY_FLAG (this, FLAG_MONSTER)) 434 if (this->flag [FLAG_MONSTER])
429 { 435 {
430 if (stats.hp > stats.maxhp) 436 if (stats.hp > stats.maxhp)
431 { 437 {
432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 438 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
433 stats.maxhp = stats.hp; 439 stats.maxhp = stats.hp;
… …
436 /* The archs just need to be updated for this */ 442 /* The archs just need to be updated for this */
437 if (move_type == 0) 443 if (move_type == 0)
438 move_type = MOVE_WALK; 444 move_type = MOVE_WALK;
439 } 445 }
440 446
441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 447 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
442 /* Object will duplicate it's content as part of the 448 /* Object will duplicate it's content as part of the
443 * generation process. To do this, we must flag inventory 449 * generation process. To do this, we must flag inventory
444 * so it remains unevaluated concerning the randomitems and 450 * so it remains unevaluated concerning the randomitems and
445 * the living (a demonlord shouldn't cast from inside generator!) 451 * the living (a demonlord shouldn't cast from inside generator!)
446 */ 452 */
… …
480 animate_object (this, direction); 486 animate_object (this, direction);
481 } 487 }
482} 488}
483 489
484static void 490static void
485set_move (MoveType &mt, const char *str) 491set_move (MoveType &mt, object_thawer &f)
486{ 492{
487 static const struct flagstr { 493 static const struct flagstr {
488 const char *name; 494 const char *name;
489 MoveType flags; 495 MoveType flags;
490 } move_flags[] = { 496 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 502 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 503 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 504 { "all" , MOVE_ALL },
499 }; 505 };
500 506
501 if (!str) 507 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 508
507 if (isdigit (*str)) 509 if (!*str || isdigit (*str))
508 { 510 {
509 mt = atoi (str); 511 mt = atoi (str);
510 return; 512 return;
511 } 513 }
512 514
513 mt = 0; 515 mt = 0;
514 516
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 517 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 518 {
517 bool negate = 0; 519 bool negate = 0;
518 520
519 if (*str == '-') 521 if (*str == '-')
520 { 522 {
521 negate = 1; 523 negate = 1;
522 str++; 524 str++;
523 } 525 }
524 526
525 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 527 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
526 { 528 {
527 if (!strcmp (f->name, str)) 529 if (!strcmp (f->name, str))
528 { 530 {
529 if (negate) 531 if (negate)
530 mt &= ~f->flags; 532 mt &= ~f->flags;
… …
554 for (;;) 556 for (;;)
555 { 557 {
556 switch (f.kw) 558 switch (f.kw)
557 { 559 {
558 case KW_uuid: 560 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 561 if (!uuid.parse (f.get_str ()))
561 { 562 {
562 f.parse_warn ("unparseable uuid"); 563 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 564 uuid = UUID::gen ();
564 } 565 }
565 break; 566 break;
566 567
567 case KW_oid: 568 case KW_oid:
568 f.get (this, f.get_sint32 ()); 569 f.get (this, f.get_sint32 ());
569 break; 570 break;
… …
587 // was: insert_ob_in_ob (tmp, op); 588 // was: insert_ob_in_ob (tmp, op);
588 // but manually adding it can improve map loading times a lot 589 // but manually adding it can improve map loading times a lot
589 // also, appending instead of prepending keeps the 590 // also, appending instead of prepending keeps the
590 // save ordering the same between repeated load/saves. 591 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects 592 // and finally we do not want any funny effects
592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 593 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
593 CLEAR_FLAG (tmp, FLAG_REMOVED); 594 tmp->clr_flag (FLAG_REMOVED);
594 595
595 if (!op_inv) 596 if (!op_inv)
596 { 597 {
597 inv = tmp; 598 inv = tmp;
598 tmp->above = 0; 599 tmp->above = 0;
… …
631 f.delayed_deref (this, owner, f.get_str ()); 632 f.delayed_deref (this, owner, f.get_str ());
632 break; 633 break;
633 634
634 case KW_animation: 635 case KW_animation:
635 { 636 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 637 this->clr_flag (FLAG_ANIMATE);
637 animation_id = 0; 638 animation_id = 0;
638 639
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 640 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 641 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 642 }
643 break; 643 break;
644 644
645 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
649 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
650 651
651 case KW_speed: 652 case KW_speed:
652 f.get (speed); 653 f.get (speed);
653 654
… …
662 move_slow |= MOVE_WALK; 663 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 664 f.get (move_slow_penalty);
664 break; 665 break;
665 666
666 case KW_face: 667 case KW_face:
667 face = face_find (f.get_str ()); 668 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 669 break;
669 670
670 case KW_sound: 671 case KW_sound:
672 if (f.has_value ())
673 {
671 sound = sound_find (f.get_str ()); 674 sound = sound_find (f.get_str ());
672 if (!sound) 675 if (!sound)
673 f.parse_warn ("sound not found"); 676 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
677 }
678 else
679 sound = 0;
674 break; 680 break;
675 681
676 case KW_sound_destroy: 682 case KW_sound_destroy:
683 if (f.has_value ())
684 {
677 sound_destroy = sound_find (f.get_str ()); 685 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 686 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 687 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
688 }
689 else
690 sound_destroy = 0;
680 break; 691 break;
681 692
682 case KW_x: f.get (x); break; 693 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 694 case KW_y: f.get (y); break;
684 695
… …
725 case KW_invisible: f.get (invisible); break; 736 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 737 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 738 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 739 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 740 case KW_material: f.get (materials); break; //TODO: nuke
730 case KW_materialname: f.get (materialname); break; 741 case KW_materialname: f.get (material); break;
731 742
732 /* These are the new values */ 743 /* These are the new values */
733 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
734 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
735 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
736 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
737 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
738 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
739 750
740 /* These are all legacy - any new objects should use the move_ .. values */ 751 /* These are all legacy - any new objects should use the move_ .. values */
741 case KW_no_pass: 752 case KW_no_pass:
742 { 753 {
743 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
806 817
807 818
808 case KW_identified: 819 case KW_identified:
809 GET_FLAG (this, FLAG_IDENTIFIED); 820 GET_FLAG (this, FLAG_IDENTIFIED);
810 //TODO: move to check_object or so 821 //TODO: move to check_object or so
811 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 822 if (this->flag [FLAG_IDENTIFIED])
812 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 823 this->clr_flag (FLAG_KNOWN_MAGICAL);
813 824
814 break; 825 break;
815 826
816 case KW_friendly: 827 case KW_friendly:
817 if (f.get_bool ()) 828 if (f.get_bool ())
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 867 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 870 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 871 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
862 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 872 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
906 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
907 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 918 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
909 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
910 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
921 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
911 922
912 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 923 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
913 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 924 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
914 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 925 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
915 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 926 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
990 add_link (map, connected); 1001 add_link (map, connected);
991 } 1002 }
992 break; 1003 break;
993 1004
994 case KW_randomitems: 1005 case KW_randomitems:
995 if (f.get_str ()) 1006 if (f.has_value ())
996 { 1007 {
997 randomitems = 1008 randomitems =
998 loading_arch 1009 loading_arch
999 ? treasurelist::get (f.get_str ()) 1010 ? treasurelist::get (f.get_str ())
1000 : treasurelist::find (f.get_str ()); 1011 : treasurelist::find (f.get_str ());
… …
1132 KW_applied, 1143 KW_applied,
1133 KW_unpaid, 1144 KW_unpaid,
1134 KW_can_use_shield, 1145 KW_can_use_shield,
1135 KW_no_pick, 1146 KW_no_pick,
1136 KW_NULL, // walk_on 1147 KW_NULL, // walk_on
1148 /* 10 */
1137 KW_NULL, // no_pass 1149 KW_NULL, // no_pass
1138 /* 10 */
1139 KW_is_animated, 1150 KW_is_animated,
1140 KW_NULL, // slow_move 1151 KW_NULL, // slow_move
1141 KW_NULL, // flying 1152 KW_NULL, // flying
1142 KW_monster, 1153 KW_monster,
1143 KW_friendly, 1154 KW_friendly,
1144 KW_generator, 1155 KW_generator,
1145 KW_is_thrown, 1156 KW_is_thrown,
1146 KW_auto_apply, 1157 KW_auto_apply,
1147 KW_treasure_env, 1158 KW_treasure_env,
1159 /* 20 */
1148 KW_player_sold, 1160 KW_player_sold,
1149 /* 20 */
1150 KW_see_invisible, 1161 KW_see_invisible,
1151 KW_can_roll, 1162 KW_can_roll,
1152 KW_overlay_floor, 1163 KW_overlay_floor,
1153 KW_is_turnable, 1164 KW_is_turnable,
1154 KW_NULL, // walk_off 1165 KW_NULL, // walk_off
1155 KW_NULL, // fly_on 1166 KW_NULL, // fly_on
1156 KW_NULL, // fly_off 1167 KW_NULL, // fly_off
1157 KW_is_used_up, 1168 KW_is_used_up,
1158 KW_identified, 1169 KW_identified,
1170 /* 30 */
1159 KW_reflecting, 1171 KW_reflecting,
1160 /* 30 */
1161 KW_changing, 1172 KW_changing,
1162 KW_splitting, 1173 KW_splitting,
1163 KW_hitback, 1174 KW_hitback,
1164 KW_startequip, 1175 KW_startequip,
1165 KW_blocksview, 1176 KW_blocksview,
1166 KW_undead, 1177 KW_undead,
1167 KW_scared, 1178 KW_scared,
1168 KW_unaggressive, 1179 KW_unaggressive,
1169 KW_reflect_missile, 1180 KW_reflect_missile,
1181 /* 40 */
1170 KW_reflect_spell, 1182 KW_reflect_spell,
1171 /* 40 */
1172 KW_no_magic, 1183 KW_no_magic,
1173 KW_no_fix_player, 1184 KW_NULL,
1174 KW_is_lightable, 1185 KW_is_lightable,
1175 KW_tear_down, 1186 KW_tear_down,
1176 KW_run_away, 1187 KW_run_away,
1177 KW_NULL, // pass_thru 1188 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1189 KW_NULL, // an_pass_thru
1179 KW_pick_up, 1190 KW_pick_up,
1180 KW_unique, 1191 KW_unique,
1192 /* 50 */
1181 KW_no_drop, 1193 KW_no_drop,
1182 /* 50 */
1183 KW_NULL, // wizcast 1194 KW_NULL, // wizcast
1184 KW_can_cast_spell, 1195 KW_can_cast_spell,
1185 KW_can_use_scroll, 1196 KW_can_use_scroll,
1186 KW_can_use_range, 1197 KW_can_use_range,
1187 KW_can_use_bow, 1198 KW_can_use_bow,
1188 KW_can_use_armour, 1199 KW_can_use_armour,
1189 KW_can_use_weapon, 1200 KW_can_use_weapon,
1190 KW_can_use_ring, 1201 KW_can_use_ring,
1191 KW_has_ready_range, 1202 KW_has_ready_range,
1203 /* 60 */
1192 KW_has_ready_bow, 1204 KW_has_ready_bow,
1193 /* 60 */
1194 KW_xrays, 1205 KW_xrays,
1195 KW_NULL, 1206 KW_NULL,
1196 KW_is_floor, 1207 KW_is_floor,
1197 KW_lifesave, 1208 KW_lifesave,
1198 KW_no_strength, 1209 KW_no_strength,
1199 KW_sleep, 1210 KW_sleep,
1200 KW_stand_still, 1211 KW_stand_still,
1201 KW_random_move, 1212 KW_random_move,
1202 KW_only_attack, 1213 KW_only_attack,
1214 /* 70 */
1203 KW_confused, 1215 KW_confused,
1204 /* 70 */
1205 KW_stealth, 1216 KW_stealth,
1206 KW_NULL, 1217 KW_NULL,
1207 KW_NULL, 1218 KW_NULL,
1208 KW_cursed, 1219 KW_cursed,
1209 KW_damned, 1220 KW_damned,
1210 KW_see_anywhere, 1221 KW_see_anywhere,
1211 KW_known_magical, 1222 KW_known_magical,
1212 KW_known_cursed, 1223 KW_known_cursed,
1213 KW_can_use_skill, 1224 KW_can_use_skill,
1225 /* 80 */
1214 KW_been_applied, 1226 KW_been_applied,
1215 /* 80 */
1216 KW_has_ready_scroll, 1227 KW_has_ready_scroll,
1217 KW_can_use_rod, 1228 KW_can_use_rod,
1218 KW_precious, 1229 KW_precious,
1219 KW_can_use_horn, 1230 KW_can_use_horn,
1220 KW_make_invisible, 1231 KW_make_invisible,
1221 KW_inv_locked, 1232 KW_inv_locked,
1222 KW_is_wooded, 1233 KW_is_wooded,
1223 KW_is_hilly, 1234 KW_is_hilly,
1224 KW_has_ready_skill, 1235 KW_has_ready_skill,
1236 /* 90 */
1225 KW_has_ready_weapon, 1237 KW_has_ready_weapon,
1226 /* 90 */
1227 KW_no_skill_ident, 1238 KW_no_skill_ident,
1228 KW_is_blind, 1239 KW_is_blind,
1229 KW_can_see_in_dark, 1240 KW_can_see_in_dark,
1230 KW_is_cauldron, 1241 KW_is_cauldron,
1231 KW_NULL, 1242 KW_NULL,
1232 KW_no_steal, 1243 KW_no_steal,
1233 KW_one_hit, 1244 KW_one_hit,
1234 KW_NULL, 1245 KW_NULL,
1235 KW_berserk, 1246 KW_berserk,
1247 /* 100 */
1236 KW_neutral, 1248 KW_neutral,
1237 /* 100 */
1238 KW_no_attack, 1249 KW_no_attack,
1239 KW_no_damage, 1250 KW_no_damage,
1240 KW_obj_original, 1251 KW_obj_original,
1241 KW_NULL, 1252 KW_random_speed,
1242 KW_activate_on_push, 1253 KW_activate_on_push,
1243 KW_activate_on_release, 1254 KW_activate_on_release,
1244 KW_is_water, 1255 KW_is_water,
1245 KW_use_content_on_gen, 1256 KW_use_content_on_gen,
1246 KW_NULL, 1257 KW_NULL,
1258 /* 110 */
1247 KW_is_buildable, 1259 KW_is_buildable,
1248 /* 110 */
1249 KW_destroy_on_death, 1260 KW_destroy_on_death,
1250 KW_NULL, 1261 KW_NULL,
1251 }; 1262 };
1263
1264 // obj_original is the only commonly differing flag between archetype
1265 // and object, so special-case it here to be able to skip the loop
1266 static const struct flagmask : object::flags_t
1267 {
1268 flagmask ()
1269 {
1270 for (int i = 0; i < NUM_FLAGS; i++)
1271 if (flag_names [i])
1272 set (i);
1273 }
1274 } flagmask;
1252 1275
1253 /* 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
1254 * keys that match field names will be overwritten by the loader. 1277 * keys that match field names will be overwritten by the loader.
1255 */ 1278 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1279 for (key_value *kv = op->key_values; kv; kv = kv->next)
… …
1269 *ptr++ = '\n'; 1292 *ptr++ = '\n';
1270 1293
1271 f.alloc (ptr - cur); 1294 f.alloc (ptr - cur);
1272 } 1295 }
1273 1296
1274#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v) 1297#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1275#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) 1298#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1276 1299
1277 CMP_OUT (x); 1300 CMP_OUT (x);
1278 CMP_OUT (y); 1301 CMP_OUT (y);
1279 1302
1280 CMP_OUT (type); 1303 CMP_OUT (type);
1281 CMP_OUT (subtype); 1304 CMP_OUT (subtype);
1282 CMP_OUT (direction); 1305 CMP_OUT (direction);
1283 1306
1284 CMP_OUT (name); 1307 CMP_OUT (name);
1285 CMP_OUT (name_pl); 1308 CMP_OUT (name_pl);
1286
1287 CMP_OUT (speed); 1309 CMP_OUT (speed);
1288 CMP_OUT (speed_left); 1310
1311 // speed_left is a major time-burner, and has good locality, so
1312 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left)
1314 {
1315 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318
1319 if (last_speed_left != op->speed_left)
1320 {
1321 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 }
1325
1326 f.add (last_speed_left_str, last_speed_left_len);
1327 }
1289 1328
1290 CMP_OUT (title); 1329 CMP_OUT (title);
1291 CMP_OUT (race); 1330 CMP_OUT (race);
1292 CMP_OUT (slaying); 1331 CMP_OUT (slaying);
1293 CMP_OUT (skill); 1332 CMP_OUT (skill);
1294 1333
1295 CMP_OUT (tag); 1334 CMP_OUT (tag);
1296 CMP_OUT (custom_name); 1335 CMP_OUT (custom_name);
1297 1336
1298 if (object *owner = op->owner) 1337 if (object *owner = op->owner)
1299 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1338 if (const char *ref = owner->ref ())
1339 f.put (KW(owner), ref);
1300 1340
1301 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1341 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1302 1342
1303 CMP_OUT (other_arch); 1343 CMP_OUT (other_arch);
1304 1344
1305 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1345 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1306 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1346 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1307 1347
1308 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1348 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1309 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1349 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1310 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1350 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1311 1351
1312 if (op->animation_id != arch->animation_id) 1352 if (op->animation_id != arch->animation_id)
1313 if (op->has_anim ()) 1353 if (op->has_anim ())
1314 f.put (KW_animation, op->anim ().name); 1354 f.put (KW(animation), op->anim ().name);
1315 else 1355 else
1316 { 1356 {
1317 f.put (KW_animation, (const char *)0); 1357 f.put (KW(animation));
1318 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1358 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1319 } 1359 }
1320 1360
1321 CMP_OUT2 (str, stats.Str); 1361 CMP_OUT2 (str, stats.Str);
1322 CMP_OUT2 (dex, stats.Dex); 1362 CMP_OUT2 (dex, stats.Dex);
… …
1347 CMP_OUT (attack_movement); 1387 CMP_OUT (attack_movement);
1348 CMP_OUT (nrof); 1388 CMP_OUT (nrof);
1349 CMP_OUT (level); 1389 CMP_OUT (level);
1350 CMP_OUT (attacktype); 1390 CMP_OUT (attacktype);
1351 1391
1352 // using memcmp here seems to be a loss - us gcc vectorising? 1392 // using memcmp here seems to be a loss - is gcc vectorising?
1353 for (int i = 0; i < NROFATTACKS; i++) 1393 for (int i = 0; i < NROFATTACKS; i++)
1354 if (expect_false (op->resist[i] != arch->resist[i])) 1394 if (expect_false (op->resist[i] != arch->resist[i]))
1355 f.put (resist_save[i], op->resist[i]); 1395 f.put (resist_save[i], op->resist[i]);
1356 1396
1357 CMP_OUT (path_attuned); 1397 CMP_OUT (path_attuned);
1358 CMP_OUT (path_repelled); 1398 CMP_OUT (path_repelled);
1359 CMP_OUT (path_denied); 1399 CMP_OUT (path_denied);
1400
1360 CMP_OUT2 (material, materials);//TODO: nuke 1401 CMP_OUT2 (material, materials);//TODO: nuke
1361 CMP_OUT (materialname); 1402 if (op->material != arch->material)
1403 f.put (KW(materialname), op->material->name);
1404
1362 CMP_OUT (value); 1405 CMP_OUT (value);
1363 CMP_OUT (carrying); 1406 CMP_OUT (carrying);
1364 CMP_OUT (weight); 1407 CMP_OUT (weight);
1365 CMP_OUT (invisible); 1408 CMP_OUT (invisible);
1366 CMP_OUT (state); 1409 CMP_OUT (state);
… …
1371 CMP_OUT (last_eat); 1414 CMP_OUT (last_eat);
1372 CMP_OUT (glow_radius); 1415 CMP_OUT (glow_radius);
1373 1416
1374 if (op->flag [FLAG_IS_LINKED]) 1417 if (op->flag [FLAG_IS_LINKED])
1375 if (auto (ol, op->find_link ())) 1418 if (auto (ol, op->find_link ()))
1376 f.put (KW_connected, ol->id); 1419 f.put (KW(connected), ol->id);
1377 1420
1378 CMP_OUT (randomitems); 1421 CMP_OUT (randomitems);
1422
1379 CMP_OUT2 (container, weight_limit); 1423 CMP_OUT2 (container, weight_limit);
1380 1424
1381 CMP_OUT (run_away); 1425 CMP_OUT (run_away);
1382 CMP_OUT (pick_up); 1426 CMP_OUT (pick_up);
1383 CMP_OUT (will_apply); 1427 CMP_OUT (will_apply);
… …
1398 CMP_OUT (move_on); 1442 CMP_OUT (move_on);
1399 CMP_OUT (move_off); 1443 CMP_OUT (move_off);
1400 CMP_OUT (move_slow); 1444 CMP_OUT (move_slow);
1401 CMP_OUT (move_slow_penalty); 1445 CMP_OUT (move_slow_penalty);
1402 1446
1403 // obj_original is the only commonly differing flag between archetype
1404 // and object, so special-case it here to be able to skip the loop
1405 object::flags_t diff = op->flag ^ arch->flag; 1447 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1406 1448
1449#if stdcpp // we need gcc, sorry
1450 if (diff [FLAG_OBJ_ORIGINAL])
1451 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1452
1453 diff.reset (FLAG_OBJ_ORIGINAL);
1454
1455 // quickly test whether any other flags differ
1407 if (expect_true (diff.any ())) 1456 if (expect_true (diff.any ()))
1408 {
1409 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()) || 1)
1410 {
1411 // some other flags differ, too
1412 for (int i = 0; i < NUM_FLAGS; i++) 1457 for (int i = 0; i < NUM_FLAGS; i++)
1413 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) 1458 if (expect_false (diff [i]))
1414 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1459 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1415 } 1460#else
1416 else 1461 // use sgi extensions
1417 { 1462 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1418 // only obj_original differs 1463 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1419 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1464#endif
1420 }
1421 }
1422 1465
1423 // save body locations. gcc's memcmp does an abysmal job when used 1466 // save body locations. gcc's memcmp does an abysmal job when used
1424 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1425 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1426 f.put (body_locations[i].save_name, op->slot[i].info); 1469 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1432 * the only place this is not set is when saving the player. 1475 * the only place this is not set is when saving the player.
1433 */ 1476 */
1434bool 1477bool
1435object::write (object_freezer &f) 1478object::write (object_freezer &f)
1436{ 1479{
1437 if (is_arch ()) 1480 if (expect_false (is_arch ()))
1438 { 1481 {
1439 f.put (KW_object, arch->archname); 1482 f.put (KW(object), arch->archname);
1440 write_diff (f, this, archetype::empty); 1483 write_diff (f, this, archetype::empty);
1441 } 1484 }
1442 else 1485 else
1443 { 1486 {
1444 f.put (KW_arch, arch->archname); 1487 f.put (KW(arch), arch->archname);
1445 write_diff (f, this, arch); 1488 write_diff (f, this, arch);
1446 } 1489 }
1447 1490
1448 for (object *tmp = inv; tmp; tmp = tmp->below) 1491 for (object *tmp = inv; tmp; tmp = tmp->below)
1449 tmp->write (f); 1492 tmp->write (f);
1450 1493
1451 f.put (this); 1494 f.put (this);
1452 f.put (KW_end); 1495 f.put (KW(end));
1453 1496
1454 return true; 1497 return true;
1455} 1498}
1456 1499
1457///////////////////////////////////////////////////////////////////////////// 1500/////////////////////////////////////////////////////////////////////////////

Diff Legend

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