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.146 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.185 by root, Wed Dec 5 19:03:26 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <loader.h>
27#include <sproto.h> 27#include <sproto.h>
28 28
29///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30 30
31extern archetype *loading_arch; 31extern archetype *loading_arch;
… …
251 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
252 NULL 252 NULL
253}; 253};
254 254
255/* This function checks the object after it has been loaded (when we 255/* This function checks the object after it has been loaded (when we
256 * get the 'end' in the input stream). This function can be used to 256 * get the 'end' in the input stream). This function can be used to
257 * deal with legacy objects where fields may have changed. It can also be used 257 * deal with legacy objects where fields may have changed. It can also be used
258 * to check for objects to make sure there are no common errors. 258 * to check for objects to make sure there are no common errors.
259 */ 259 */
260void 260void
261object::post_load_check () 261object::post_load_check ()
… …
266 type = 0; 266 type = 0;
267 } 267 }
268 268
269 switch (type) 269 switch (type)
270 { 270 {
271 case RANGED:
271 case BOW: 272 case BOW:
272 case WAND: 273 case WAND:
273 case ROD: 274 case ROD:
274 case HORN: 275 case HORN:
275 if (slot [body_range].info != -1) 276 if (slot [body_range].info != -1)
… …
293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 294 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
294 slot [body_shield].info = -1; 295 slot [body_shield].info = -1;
295 } 296 }
296 break; 297 break;
297 298
299 case CONTAINER:
300 if (nrof)
301 {
302 LOG (llevError, "ITEMBUG: %s: stackable container (nrof %d)\n", debug_desc (), (int)nrof);
303 nrof = 0;
304 }
305 break;
306
298 case PLAYER: 307 case PLAYER:
299 if (slot [body_shield].info != 1) 308 if (slot [body_shield].info != 1)
300 { 309 {
301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 310 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
302 slot [body_shield].info = 1; 311 slot [body_shield].info = 1;
… …
321 * this isn't perfect (things won't be properly pluralised), but works to 330 * this isn't perfect (things won't be properly pluralised), but works to
322 * that degree (5 heart is still quite understandable). But the case we 331 * that degree (5 heart is still quite understandable). But the case we
323 * also have to catch is if this object is not using the normal name for 332 * also have to catch is if this object is not using the normal name for
324 * the object. In that case, we also want to use the loaded name. 333 * the object. In that case, we also want to use the loaded name.
325 * Otherwise, what happens is that the the plural name will lose 334 * Otherwise, what happens is that the the plural name will lose
326 * information (appear as just 'hearts' and not 'goblins heart') 335 * information (appear as just 'hearts' and not 'goblins heart')
327 */ 336 */
328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl) 337 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
329 name_pl = 0; 338 name_pl = 0;
330 339
331 if (!name_pl) 340 if (!name_pl)
332 name_pl = name; 341 name_pl = name;
333 342
334 /* objects now have a materialname. try to patch it in */ 343 /* objects now have a materialname. try to patch it in */
335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 344 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 345 select_material (this, map ? map->difficulty : 5);
346
347 if (speed < 0.)
348 {
349 flag [FLAG_RANDOM_SPEED] = true;
350 speed = -speed;
351 // speed_left will be randomised in instantiate () and copy_to ()
352 }
337 353
338 /* only do these when program is first run - a bit 354 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 355 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 356 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 357 * not in the ideal fashion.
… …
388 if (ip > 2 * item_power && ip > (item_power + 3)) 404 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); 405 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
390#endif 406#endif
391 } 407 }
392 408
393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 409 /* 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 */ 410 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD 411 if ((type == ROD
396 || type == WAND 412 || type == WAND
397 || type == SCROLL 413 || type == SCROLL
398 || type == HORN 414 || type == HORN
… …
407 // TODO: fix firewall object on map 423 // TODO: fix firewall object on map
408 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 424 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
409 * in that spell was stored in sp. 425 * in that spell was stored in sp.
410 */ 426 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 427 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
412 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 428 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
413 insert_ob_in_ob (tmp, this); 429 insert_ob_in_ob (tmp, this);
414 randomitems = 0; 430 randomitems = 0;
415 } 431 }
416 432
417 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 433 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
… …
423 randomitems = 0; /* So another spell isn't created for this object */ 439 randomitems = 0; /* So another spell isn't created for this object */
424 /* without this, value is all screwed up */ 440 /* without this, value is all screwed up */
425 value = arch->value * inv->value; 441 value = arch->value * inv->value;
426 } 442 }
427 443
428 if (QUERY_FLAG (this, FLAG_MONSTER)) 444 if (this->flag [FLAG_MONSTER])
429 { 445 {
430 if (stats.hp > stats.maxhp) 446 if (stats.hp > stats.maxhp)
431 { 447 {
432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 448 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; 449 stats.maxhp = stats.hp;
… …
436 /* The archs just need to be updated for this */ 452 /* The archs just need to be updated for this */
437 if (move_type == 0) 453 if (move_type == 0)
438 move_type = MOVE_WALK; 454 move_type = MOVE_WALK;
439 } 455 }
440 456
441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 457 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 458 /* Object will duplicate it's content as part of the
443 * generation process. To do this, we must flag inventory 459 * generation process. To do this, we must flag inventory
444 * so it remains unevaluated concerning the randomitems and 460 * so it remains unevaluated concerning the randomitems and
445 * the living (a demonlord shouldn't cast from inside generator!) 461 * the living (a demonlord shouldn't cast from inside generator!)
446 */ 462 */
… …
468 } 484 }
469 485
470 // if the object has an animation, try to provide a default face 486 // if the object has an animation, try to provide a default face
471 if (has_anim ()) 487 if (has_anim ())
472 { 488 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed) 489 if (anim_speed)
476 // if this item is time-animated, force the last frame 490 // if this item is time-animated, force the last frame
477 animate_object (this, 0); 491 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER]) 492 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing 493 // if it is a monster, set appropriate facing
480 animate_object (this, direction); 494 animate_object (this, direction);
481 } 495 }
482} 496}
483 497
484static void 498static void
485set_move (MoveType &mt, const char *str) 499set_move (MoveType &mt, object_thawer &f)
486{ 500{
487 static const struct flagstr { 501 static const struct flagstr {
488 const char *name; 502 const char *name;
489 MoveType flags; 503 MoveType flags;
490 } move_flags[] = { 504 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 510 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 511 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 512 { "all" , MOVE_ALL },
499 }; 513 };
500 514
501 if (!str) 515 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 516
507 if (isdigit (*str)) 517 if (!*str || isdigit (*str))
508 { 518 {
509 mt = atoi (str); 519 mt = atoi (str);
510 return; 520 return;
511 } 521 }
512 522
513 mt = 0; 523 mt = 0;
514 524
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 525 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 526 {
517 bool negate = 0; 527 bool negate = 0;
518 528
519 if (*str == '-') 529 if (*str == '-')
520 { 530 {
521 negate = 1; 531 negate = 1;
522 str++; 532 str++;
523 } 533 }
524 534
525 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 535 for (const flagstr *f = move_flags; f < move_flags + ecb_array_length (move_flags); ++f)
526 { 536 {
527 if (!strcmp (f->name, str)) 537 if (!strcmp (f->name, str))
528 { 538 {
529 if (negate) 539 if (negate)
530 mt &= ~f->flags; 540 mt &= ~f->flags;
… …
547 557
548bool 558bool
549object::parse_kv (object_thawer &f) 559object::parse_kv (object_thawer &f)
550{ 560{
551 object *op_inv = inv; 561 object *op_inv = inv;
552 key_value *last_kv = key_values;
553 562
554 for (;;) 563 for (;;)
555 { 564 {
556 switch (f.kw) 565 switch (f.kw)
557 { 566 {
558 case KW_uuid: 567 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 568 if (!uuid.parse (f.get_str ()))
561 { 569 {
562 f.parse_warn ("unparseable uuid"); 570 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 571 uuid = UUID::gen ();
564 } 572 }
565 break; 573 break;
566 574
567 case KW_oid: 575 case KW_oid:
568 f.get (this, f.get_sint32 ()); 576 f.get (this, f.get_sint32 ());
569 break; 577 break;
… …
587 // was: insert_ob_in_ob (tmp, op); 595 // was: insert_ob_in_ob (tmp, op);
588 // but manually adding it can improve map loading times a lot 596 // but manually adding it can improve map loading times a lot
589 // also, appending instead of prepending keeps the 597 // also, appending instead of prepending keeps the
590 // save ordering the same between repeated load/saves. 598 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects 599 // and finally we do not want any funny effects
592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 600 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
593 CLEAR_FLAG (tmp, FLAG_REMOVED); 601 tmp->clr_flag (FLAG_REMOVED);
594 602
595 if (!op_inv) 603 if (!op_inv)
596 { 604 {
597 inv = tmp; 605 inv = tmp;
598 tmp->above = 0; 606 tmp->above = 0;
… …
631 f.delayed_deref (this, owner, f.get_str ()); 639 f.delayed_deref (this, owner, f.get_str ());
632 break; 640 break;
633 641
634 case KW_animation: 642 case KW_animation:
635 { 643 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 644 clr_flag (FLAG_ANIMATE);
637 animation_id = 0; 645 animation_id = 0;
638 646
639 const char *str = f.get_str (); 647 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
640 if (str && (animation_id = find_animation (str)))
641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 649 }
643 break; 650 break;
644 651
645 case KW_last_heal: f.get (last_heal); break; 652 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 653 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break; 654 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break; 655 case KW_last_eat: f.get (last_eat); break;
656 case KW_sl:
649 case KW_speed_left: f.get (speed_left); break; 657 case KW_speed_left: f.get (speed_left); break;
650 658
651 case KW_speed: 659 case KW_speed:
652 f.get (speed); 660 f.get (speed);
653 661
… …
662 move_slow |= MOVE_WALK; 670 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 671 f.get (move_slow_penalty);
664 break; 672 break;
665 673
666 case KW_face: 674 case KW_face:
667 face = face_find (f.get_str ()); 675 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 676 break;
669 677
670 case KW_sound: 678 case KW_sound:
679 if (f.has_value ())
680 {
671 sound = sound_find (f.get_str ()); 681 sound = sound_find (f.get_str ());
672 if (!sound) 682 if (!sound)
673 f.parse_warn ("sound not found"); 683 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
684 }
685 else
686 sound = 0;
674 break; 687 break;
675 688
676 case KW_sound_destroy: 689 case KW_sound_destroy:
690 if (f.has_value ())
691 {
677 sound_destroy = sound_find (f.get_str ()); 692 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 693 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 694 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
695 }
696 else
697 sound_destroy = 0;
680 break; 698 break;
681 699
682 case KW_x: f.get (x); break; 700 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 701 case KW_y: f.get (y); break;
684 702
… …
725 case KW_invisible: f.get (invisible); break; 743 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 744 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 745 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 746 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 747 case KW_material: f.get (materials); break; //TODO: nuke
730 748 case KW_materialname: f.get (material); break;
731 case KW_materialname:
732 {
733 shstr sh;
734 f.get (sh);
735 material = name_to_material (sh);
736 }
737 break;
738 749
739 /* These are the new values */ 750 /* These are the new values */
740 case KW_move_block: set_move (move_block, f.get_str ()); break; 751 case KW_move_block: set_move (move_block, f); break;
741 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 752 case KW_move_allow: set_move (move_allow, f); break;
742 case KW_move_type: set_move (move_type, f.get_str ()); break; 753 case KW_move_type: set_move (move_type , f); break;
743 case KW_move_on: set_move (move_on, f.get_str ()); break; 754 case KW_move_on: set_move (move_on , f); break;
744 case KW_move_off: set_move (move_off, f.get_str ()); break; 755 case KW_move_off: set_move (move_off , f); break;
745 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 756 case KW_move_slow: set_move (move_slow , f); break;
746
747 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_no_pass:
749 {
750 if (f.get_sint32 ())
751 move_block = MOVE_ALL;
752 else
753 move_block = 0;
754 }
755
756 break;
757
758 /* These are all legacy - any new objects should use the move_ .. values */
759 case KW_walk_on:
760 {
761 if (f.get_sint32 ())
762 move_on |= MOVE_WALK;
763 else
764 move_on &= ~MOVE_WALK;
765 }
766
767 break;
768
769 /* These are all legacy - any new objects should use the move_ .. values */
770 case KW_walk_off:
771 {
772 if (f.get_sint32 ())
773 move_off |= MOVE_WALK;
774 else
775 move_off &= ~MOVE_WALK;
776 }
777 break;
778
779 /* These are all legacy - any new objects should use the move_ .. values */
780 case KW_fly_on:
781 {
782 if (f.get_sint32 ())
783 move_on |= MOVE_FLY_LOW;
784 else
785 move_on &= ~MOVE_FLY_LOW;
786 }
787 break;
788
789 /* These are all legacy - any new objects should use the move_ .. values */
790 case KW_fly_off:
791 {
792 if (f.get_sint32 ())
793 move_off |= MOVE_FLY_LOW;
794 else
795 move_off &= ~MOVE_FLY_LOW;
796 }
797 break;
798 757
799 //TODO: remove these after converting archetypes 758 //TODO: remove these after converting archetypes
800 case KW_can_use_wand: 759 case KW_can_use_wand:
801 GET_FLAG (this, FLAG_USE_RANGE); 760 GET_FLAG (this, FLAG_USE_RANGE);
802 break; 761 break;
803 762
804 /* These are all legacy - any new objects should use the move_ .. values */
805 case KW_flying:
806 {
807 if (f.get_sint32 ())
808 move_type |= MOVE_FLY_LOW;
809 else
810 move_type &= ~MOVE_FLY_LOW;
811 }
812 break;
813
814
815 case KW_identified: 763 case KW_identified:
816 GET_FLAG (this, FLAG_IDENTIFIED); 764 GET_FLAG (this, FLAG_IDENTIFIED);
817 //TODO: move to check_object or so 765 //TODO: move to check_object or so
818 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 766 if (this->flag [FLAG_IDENTIFIED])
819 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 767 this->clr_flag (FLAG_KNOWN_MAGICAL);
820 768
821 break; 769 break;
822 770
823 case KW_friendly: 771 case KW_friendly:
824 if (f.get_bool ()) 772 if (f.get_bool ())
… …
851 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 799 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
852 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 800 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
853 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 801 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
854 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 802 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
855 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 803 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
804 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
856 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 805 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
857 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 806 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
858 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 807 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
859 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
860 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
912 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 861 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
913 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 862 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
914 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 863 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
915 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 864 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
916 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 865 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
866 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
867 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
917 868
918 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 869 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
919 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 870 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
920 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 871 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
921 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 872 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
996 add_link (map, connected); 947 add_link (map, connected);
997 } 948 }
998 break; 949 break;
999 950
1000 case KW_randomitems: 951 case KW_randomitems:
1001 if (f.get_str ()) 952 if (f.has_value ())
1002 { 953 {
1003 randomitems = 954 randomitems =
1004 loading_arch 955 loading_arch
1005 ? treasurelist::get (f.get_str ()) 956 ? treasurelist::get (f.get_str ())
1006 : treasurelist::find (f.get_str ()); 957 : treasurelist::find (f.get_str ());
… …
1033 984
1034 f.next (); 985 f.next ();
1035 return true; 986 return true;
1036 987
1037 case KW_ERROR: 988 case KW_ERROR:
1038 // append as key value pair (do not use kv_set as it prepends)
1039 // we also do not even try to find old values, duplicate keys stay duplicate 989 // we do not even try to find old values, duplicate keys stay duplicate
1040 { 990 // the list gets reversed after loading
1041 key_value *kv = new key_value; 991 kv.add (shstr (f.kw_str), shstr (f.value));
1042
1043 kv->next = 0;
1044 kv->key = shstr (f.kw_str);
1045 kv->value = shstr (f.value);
1046
1047 if (!last_kv)
1048 key_values = last_kv = kv;
1049 else
1050 {
1051 while (last_kv->next)
1052 last_kv = last_kv->next;
1053
1054 last_kv->next = kv;
1055 last_kv = kv;
1056 }
1057 }
1058 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1059 break; 992 break;
1060 993
1061 default: 994 default:
1062 if (!f.parse_error ("object", name)) 995 if (!f.parse_error ("object", name))
1063 return false; 996 return false;
… …
1075 1008
1076 archetype *arch = archetype::find (f.get_str ()); 1009 archetype *arch = archetype::find (f.get_str ());
1077 1010
1078 if (!arch) 1011 if (!arch)
1079 { 1012 {
1080 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1013 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1081 arch = archetype::find (shstr_earthwall); 1014 arch = archetype::find (shstr_earthwall);
1082 } 1015 }
1083 1016
1084 assert (arch); //D maybe use exception handling of sorts? 1017 assert (arch); //D maybe use exception handling of sorts?
1085 1018
… …
1093 if (!op->parse_kv (f)) 1026 if (!op->parse_kv (f))
1094 { 1027 {
1095 op->destroy (); 1028 op->destroy ();
1096 return 0; 1029 return 0;
1097 } 1030 }
1031
1032 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1033 // that greatly simplifies the loading code.
1034 op->kv.reverse ();
1098 1035
1099 op->post_load_check (); 1036 op->post_load_check ();
1100 return op; 1037 return op;
1101} 1038}
1102 1039
… …
1107 * override values and in c_wiz to mutate values. 1044 * override values and in c_wiz to mutate values.
1108 */ 1045 */
1109int 1046int
1110set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1111{ 1048{
1112 object_thawer f (buf, (AV *)0); 1049 object_thawer f (format ("%s\nend", buf), (AV *)0);
1113 1050
1114 return op->parse_kv (f); 1051 return op->parse_kv (f);
1115} 1052}
1116 1053
1117// compare *op against *arch and output differences 1054// compare *op against *arch and output differences
… …
1137 KW_NULL, 1074 KW_NULL,
1138 KW_applied, 1075 KW_applied,
1139 KW_unpaid, 1076 KW_unpaid,
1140 KW_can_use_shield, 1077 KW_can_use_shield,
1141 KW_no_pick, 1078 KW_no_pick,
1142 KW_NULL, // walk_on 1079 KW_is_transparent_floor,
1143 /* 10 */ 1080 /* 10 */
1144 KW_NULL, // no_pass 1081 KW_NULL, // no_pass
1145 KW_is_animated, 1082 KW_is_animated,
1146 KW_NULL, // slow_move 1083 KW_NULL, // slow_move
1147 KW_NULL, // flying 1084 KW_NULL, // flying
… …
1242 /* 100 */ 1179 /* 100 */
1243 KW_neutral, 1180 KW_neutral,
1244 KW_no_attack, 1181 KW_no_attack,
1245 KW_no_damage, 1182 KW_no_damage,
1246 KW_obj_original, 1183 KW_obj_original,
1247 KW_NULL, 1184 KW_random_speed,
1248 KW_activate_on_push, 1185 KW_activate_on_push,
1249 KW_activate_on_release, 1186 KW_activate_on_release,
1250 KW_is_water, 1187 KW_is_water,
1251 KW_use_content_on_gen, 1188 KW_use_content_on_gen,
1252 KW_NULL, 1189 KW_NULL,
… …
1269 } flagmask; 1206 } flagmask;
1270 1207
1271 /* This saves the key/value lists. We do it first so that any 1208 /* This saves the key/value lists. We do it first so that any
1272 * keys that match field names will be overwritten by the loader. 1209 * keys that match field names will be overwritten by the loader.
1273 */ 1210 */
1274 for (key_value *kv = op->key_values; kv; kv = kv->next) 1211 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1275 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1212 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1276 f.put (kv->key, kv->value); 1213 f.put (kv->key, kv->value);
1277 1214
1278 if (op->uuid) 1215 if (op->uuid)
1279 { 1216 {
1280 // highly optimised - this is often 25% of all data written 1217 // highly optimised - this is often 25% of all data written
… …
1287 *ptr++ = '\n'; 1224 *ptr++ = '\n';
1288 1225
1289 f.alloc (ptr - cur); 1226 f.alloc (ptr - cur);
1290 } 1227 }
1291 1228
1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v) 1229#define CMP_OUT(v) if (ecb_expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) 1230#define CMP_OUT2(k,v) if (ecb_expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1294 1231
1295 CMP_OUT (x); 1232 CMP_OUT (x);
1296 CMP_OUT (y); 1233 CMP_OUT (y);
1297 1234
1298 CMP_OUT (type); 1235 CMP_OUT (type);
1299 CMP_OUT (subtype); 1236 CMP_OUT (subtype);
1300 CMP_OUT (direction); 1237 CMP_OUT (direction);
1301 1238
1302 CMP_OUT (name); 1239 CMP_OUT (name);
1303 CMP_OUT (name_pl); 1240 CMP_OUT (name_pl);
1304
1305 CMP_OUT (speed); 1241 CMP_OUT (speed);
1306 CMP_OUT (speed_left); 1242
1243 // speed_left is a major time-burner, and has good locality, so
1244 // we use a simple lookup-cache to avoid the very slow printf.
1245 if (op->speed_left != arch->speed_left)
1246 {
1247 static double last_speed_left = 0.;
1248 static char last_speed_left_str [256] = "sl 0\n";
1249 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1250
1251 if (last_speed_left != op->speed_left)
1252 {
1253 last_speed_left = op->speed_left;
1254 // .7g loses precision even for float, but gives nice round numbers and smaller files
1255 // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
1256 // (printf is typically very slow)
1257 last_speed_left_len = sizeof ("sl ") - 1
1258 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1259 }
1260
1261 f.add (last_speed_left_str, last_speed_left_len);
1262 }
1307 1263
1308 CMP_OUT (title); 1264 CMP_OUT (title);
1309 CMP_OUT (race); 1265 CMP_OUT (race);
1310 CMP_OUT (slaying); 1266 CMP_OUT (slaying);
1311 CMP_OUT (skill); 1267 CMP_OUT (skill);
1312 1268
1313 CMP_OUT (tag); 1269 CMP_OUT (tag);
1314 CMP_OUT (custom_name); 1270 CMP_OUT (custom_name);
1315 1271
1316 if (object *owner = op->owner) 1272 if (object *owner = op->owner)
1317 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1273 if (const char *ref = owner->ref ())
1274 f.put (KW(owner), ref);
1318 1275
1319 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1276 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1320 1277
1321 CMP_OUT (other_arch); 1278 CMP_OUT (other_arch);
1322 1279
1323 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1280 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1324 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1281 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1325 1282
1326 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1283 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1327 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1284 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1328 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1285 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1329 1286
1330 if (op->animation_id != arch->animation_id) 1287 if (op->animation_id != arch->animation_id)
1331 if (op->has_anim ()) 1288 if (op->has_anim ())
1332 f.put (KW_animation, op->anim ().name); 1289 f.put (KW(animation), op->anim ().name);
1333 else 1290 else
1334 { 1291 {
1335 f.put (KW_animation, (const char *)0); 1292 f.put (KW(animation));
1336 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1293 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1337 } 1294 }
1338 1295
1339 CMP_OUT2 (str, stats.Str); 1296 CMP_OUT2 (str, stats.Str);
1340 CMP_OUT2 (dex, stats.Dex); 1297 CMP_OUT2 (dex, stats.Dex);
… …
1367 CMP_OUT (level); 1324 CMP_OUT (level);
1368 CMP_OUT (attacktype); 1325 CMP_OUT (attacktype);
1369 1326
1370 // using memcmp here seems to be a loss - is gcc vectorising? 1327 // using memcmp here seems to be a loss - is gcc vectorising?
1371 for (int i = 0; i < NROFATTACKS; i++) 1328 for (int i = 0; i < NROFATTACKS; i++)
1372 if (expect_false (op->resist[i] != arch->resist[i])) 1329 if (ecb_expect_false (op->resist[i] != arch->resist[i]))
1373 f.put (resist_save[i], op->resist[i]); 1330 f.put (resist_save[i], op->resist[i]);
1374 1331
1375 CMP_OUT (path_attuned); 1332 CMP_OUT (path_attuned);
1376 CMP_OUT (path_repelled); 1333 CMP_OUT (path_repelled);
1377 CMP_OUT (path_denied); 1334 CMP_OUT (path_denied);
1378 1335
1379 CMP_OUT2 (material, materials);//TODO: nuke 1336 CMP_OUT2 (material, materials);//TODO: nuke
1380 if (op->material != arch->material) 1337 if (op->material != arch->material)
1381 f.put (KW_materialname, op->material->name); 1338 f.put (KW(materialname), op->material->name);
1382 1339
1383 CMP_OUT (value); 1340 CMP_OUT (value);
1384 CMP_OUT (carrying); 1341 CMP_OUT (carrying);
1385 CMP_OUT (weight); 1342 CMP_OUT (weight);
1386 CMP_OUT (invisible); 1343 CMP_OUT (invisible);
… …
1391 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1392 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1393 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1394 1351
1395 if (op->flag [FLAG_IS_LINKED]) 1352 if (op->flag [FLAG_IS_LINKED])
1396 if (auto (ol, op->find_link ())) 1353 if (auto ol = op->find_link ())
1397 f.put (KW_connected, ol->id); 1354 f.put (KW(connected), ol->id);
1398 1355
1399 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1357
1400 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
1401 1359
1402 CMP_OUT (run_away); 1360 CMP_OUT (run_away);
1403 CMP_OUT (pick_up); 1361 CMP_OUT (pick_up);
1404 CMP_OUT (will_apply); 1362 CMP_OUT (will_apply);
… …
1421 CMP_OUT (move_slow); 1379 CMP_OUT (move_slow);
1422 CMP_OUT (move_slow_penalty); 1380 CMP_OUT (move_slow_penalty);
1423 1381
1424 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1382 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1425 1383
1384#if stdcpp // we need gcc, sorry
1426 if (diff [FLAG_OBJ_ORIGINAL]) 1385 if (diff [FLAG_OBJ_ORIGINAL])
1427 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1386 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1428 1387
1429 diff.reset (FLAG_OBJ_ORIGINAL); 1388 diff.reset (FLAG_OBJ_ORIGINAL);
1430 1389
1431 // quickly test whether any other flags differ 1390 // quickly test whether any other flags differ
1432 if (expect_true (diff.any ())) 1391 if (ecb_expect_true (diff.any ()))
1433 for (int i = 0; i < NUM_FLAGS; i++) 1392 for (int i = 0; i < NUM_FLAGS; i++)
1434 if (expect_false (diff [i])) 1393 if (ecb_expect_false (diff [i]))
1435 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1394 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1395#else
1396 // use sgi extensions
1397 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1398 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1399#endif
1436 1400
1437 // save body locations. gcc's memcmp does an abysmal job when used 1401 // save body locations. gcc's memcmp does an abysmal job when used
1438 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
1439 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1403 if (ecb_expect_false (op->slot[i].info != arch->slot[i].info))
1440 f.put (body_locations[i].save_name, op->slot[i].info); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1441} 1405}
1442 1406
1443/* 1407/*
1444 * Dumps all variables in an object to a file. 1408 * Dumps all variables in an object to a file.
1445 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1409 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1446 * the only place this is not set is when saving the player. 1410 * the only place this is not set is when saving the player.
1447 */ 1411 */
1448bool 1412bool
1449object::write (object_freezer &f) 1413object::write (object_freezer &f)
1450{ 1414{
1451 if (is_arch ()) 1415 if (ecb_expect_false (is_arch ()))
1452 { 1416 {
1453 f.put (KW_object, arch->archname); 1417 f.put (KW(object), arch->archname);
1454 write_diff (f, this, archetype::empty); 1418 write_diff (f, this, archetype::empty);
1455 } 1419 }
1456 else 1420 else
1457 { 1421 {
1458 f.put (KW_arch, arch->archname); 1422 f.put (KW(arch), arch->archname);
1459 write_diff (f, this, arch); 1423 write_diff (f, this, arch);
1460 } 1424 }
1461 1425
1462 for (object *tmp = inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
1463 tmp->write (f); 1427 tmp->write (f);
1464 1428
1465 f.put (this); 1429 f.put (this);
1466 f.put (KW_end); 1430 f.put (KW(end));
1467 1431
1468 return true; 1432 return true;
1469} 1433}
1470 1434
1471///////////////////////////////////////////////////////////////////////////// 1435/////////////////////////////////////////////////////////////////////////////
… …
1477{ 1441{
1478 object_thawer f (filename); 1442 object_thawer f (filename);
1479 1443
1480 for (;;) 1444 for (;;)
1481 { 1445 {
1446 coroapi::cede_to_tick ();
1447
1482 switch (f.kw) 1448 switch (f.kw)
1483 { 1449 {
1484 case KW_region: 1450 case KW_region:
1485 if (!region::read (f)) 1451 if (!region::read (f))
1486 return false; 1452 return false;

Diff Legend

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