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

Diff Legend

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