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.149 by root, Mon Nov 16 22:31:13 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
… …
516 { 529 {
517 negate = 1; 530 negate = 1;
518 str++; 531 str++;
519 } 532 }
520 533
521 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)
522 { 535 {
523 if (!strcmp (f->name, str)) 536 if (!strcmp (f->name, str))
524 { 537 {
525 if (negate) 538 if (negate)
526 mt &= ~f->flags; 539 mt &= ~f->flags;
… …
543 556
544bool 557bool
545object::parse_kv (object_thawer &f) 558object::parse_kv (object_thawer &f)
546{ 559{
547 object *op_inv = inv; 560 object *op_inv = inv;
548 key_value *last_kv = key_values;
549 561
550 for (;;) 562 for (;;)
551 { 563 {
552 switch (f.kw) 564 switch (f.kw)
553 { 565 {
… …
582 // was: insert_ob_in_ob (tmp, op); 594 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot 595 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the 596 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves. 597 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects 598 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 599 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED); 600 tmp->clr_flag (FLAG_REMOVED);
589 601
590 if (!op_inv) 602 if (!op_inv)
591 { 603 {
592 inv = tmp; 604 inv = tmp;
593 tmp->above = 0; 605 tmp->above = 0;
… …
626 f.delayed_deref (this, owner, f.get_str ()); 638 f.delayed_deref (this, owner, f.get_str ());
627 break; 639 break;
628 640
629 case KW_animation: 641 case KW_animation:
630 { 642 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 643 clr_flag (FLAG_ANIMATE);
632 animation_id = 0; 644 animation_id = 0;
633 645
634 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 646 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
635 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
636 } 648 }
637 break; 649 break;
638 650
639 case KW_last_heal: f.get (last_heal); break; 651 case KW_last_heal: f.get (last_heal); break;
640 case KW_last_sp: f.get (last_sp); break; 652 case KW_last_sp: f.get (last_sp); break;
641 case KW_last_grace: f.get (last_grace); break; 653 case KW_last_grace: f.get (last_grace); break;
642 case KW_last_eat: f.get (last_eat); break; 654 case KW_last_eat: f.get (last_eat); break;
655 case KW_sl:
643 case KW_speed_left: f.get (speed_left); break; 656 case KW_speed_left: f.get (speed_left); break;
644 657
645 case KW_speed: 658 case KW_speed:
646 f.get (speed); 659 f.get (speed);
647 660
… …
729 case KW_invisible: f.get (invisible); break; 742 case KW_invisible: f.get (invisible); break;
730 case KW_magic: f.get (magic); break; 743 case KW_magic: f.get (magic); break;
731 case KW_state: f.get (state); break; 744 case KW_state: f.get (state); break;
732 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 745 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
733 case KW_material: f.get (materials); break; //TODO: nuke 746 case KW_material: f.get (materials); break; //TODO: nuke
734 747 case KW_materialname: f.get (material); break;
735 case KW_materialname:
736 {
737 shstr sh;
738 f.get (sh);
739 material = name_to_material (sh);
740 }
741 break;
742 748
743 /* These are the new values */ 749 /* These are the new values */
744 case KW_move_block: set_move (move_block, f); break; 750 case KW_move_block: set_move (move_block, f); break;
745 case KW_move_allow: set_move (move_allow, f); break; 751 case KW_move_allow: set_move (move_allow, f); break;
746 case KW_move_type: set_move (move_type , f); break; 752 case KW_move_type: set_move (move_type , f); break;
747 case KW_move_on: set_move (move_on , f); break; 753 case KW_move_on: set_move (move_on , f); break;
748 case KW_move_off: set_move (move_off , f); break; 754 case KW_move_off: set_move (move_off , f); break;
749 case KW_move_slow: set_move (move_slow , f); break; 755 case KW_move_slow: set_move (move_slow , f); break;
750 756
751 /* These are all legacy - any new objects should use the move_ .. values */
752 case KW_no_pass:
753 {
754 if (f.get_sint32 ())
755 move_block = MOVE_ALL;
756 else
757 move_block = 0;
758 }
759
760 break;
761
762 /* These are all legacy - any new objects should use the move_ .. values */
763 case KW_walk_on:
764 {
765 if (f.get_sint32 ())
766 move_on |= MOVE_WALK;
767 else
768 move_on &= ~MOVE_WALK;
769 }
770
771 break;
772
773 /* These are all legacy - any new objects should use the move_ .. values */
774 case KW_walk_off:
775 {
776 if (f.get_sint32 ())
777 move_off |= MOVE_WALK;
778 else
779 move_off &= ~MOVE_WALK;
780 }
781 break;
782
783 /* These are all legacy - any new objects should use the move_ .. values */
784 case KW_fly_on:
785 {
786 if (f.get_sint32 ())
787 move_on |= MOVE_FLY_LOW;
788 else
789 move_on &= ~MOVE_FLY_LOW;
790 }
791 break;
792
793 /* These are all legacy - any new objects should use the move_ .. values */
794 case KW_fly_off:
795 {
796 if (f.get_sint32 ())
797 move_off |= MOVE_FLY_LOW;
798 else
799 move_off &= ~MOVE_FLY_LOW;
800 }
801 break;
802
803 //TODO: remove these after converting archetypes 757 //TODO: remove these after converting archetypes
804 case KW_can_use_wand: 758 case KW_can_use_wand:
805 GET_FLAG (this, FLAG_USE_RANGE); 759 GET_FLAG (this, FLAG_USE_RANGE);
806 break; 760 break;
807 761
808 /* These are all legacy - any new objects should use the move_ .. values */
809 case KW_flying:
810 {
811 if (f.get_sint32 ())
812 move_type |= MOVE_FLY_LOW;
813 else
814 move_type &= ~MOVE_FLY_LOW;
815 }
816 break;
817
818
819 case KW_identified: 762 case KW_identified:
820 GET_FLAG (this, FLAG_IDENTIFIED); 763 GET_FLAG (this, FLAG_IDENTIFIED);
821 //TODO: move to check_object or so 764 //TODO: move to check_object or so
822 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 765 if (this->flag [FLAG_IDENTIFIED])
823 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 766 this->clr_flag (FLAG_KNOWN_MAGICAL);
824 767
825 break; 768 break;
826 769
827 case KW_friendly: 770 case KW_friendly:
828 if (f.get_bool ()) 771 if (f.get_bool ())
… …
855 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 798 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
856 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 799 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
857 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 800 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
858 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 801 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
859 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;
860 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 804 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
861 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 805 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
862 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 806 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 807 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 808 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 860 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 861 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
918 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;
919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 863 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 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;
921 867
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 868 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 869 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 870 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 871 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1037 983
1038 f.next (); 984 f.next ();
1039 return true; 985 return true;
1040 986
1041 case KW_ERROR: 987 case KW_ERROR:
1042 // append as key value pair (do not use kv_set as it prepends)
1043 // 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
1044 { 989 // the list gets reversed after loading
1045 key_value *kv = new key_value; 990 kv.add (shstr (f.kw_str), shstr (f.value));
1046
1047 kv->next = 0;
1048 kv->key = shstr (f.kw_str);
1049 kv->value = shstr (f.value);
1050
1051 if (!last_kv)
1052 key_values = last_kv = kv;
1053 else
1054 {
1055 while (last_kv->next)
1056 last_kv = last_kv->next;
1057
1058 last_kv->next = kv;
1059 last_kv = kv;
1060 }
1061 }
1062 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1063 break; 991 break;
1064 992
1065 default: 993 default:
1066 if (!f.parse_error ("object", name)) 994 if (!f.parse_error ("object", name))
1067 return false; 995 return false;
… …
1079 1007
1080 archetype *arch = archetype::find (f.get_str ()); 1008 archetype *arch = archetype::find (f.get_str ());
1081 1009
1082 if (!arch) 1010 if (!arch)
1083 { 1011 {
1084 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 ());
1085 arch = archetype::find (shstr_earthwall); 1013 arch = archetype::find (shstr_earthwall);
1086 } 1014 }
1087 1015
1088 assert (arch); //D maybe use exception handling of sorts? 1016 assert (arch); //D maybe use exception handling of sorts?
1089 1017
… …
1097 if (!op->parse_kv (f)) 1025 if (!op->parse_kv (f))
1098 { 1026 {
1099 op->destroy (); 1027 op->destroy ();
1100 return 0; 1028 return 0;
1101 } 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 ();
1102 1034
1103 op->post_load_check (); 1035 op->post_load_check ();
1104 return op; 1036 return op;
1105} 1037}
1106 1038
… …
1111 * override values and in c_wiz to mutate values. 1043 * override values and in c_wiz to mutate values.
1112 */ 1044 */
1113int 1045int
1114set_variable (object *op, char *buf) 1046set_variable (object *op, char *buf)
1115{ 1047{
1116 object_thawer f (buf, (AV *)0); 1048 object_thawer f (format ("%s\nend", buf), (AV *)0);
1117 1049
1118 return op->parse_kv (f); 1050 return op->parse_kv (f);
1119} 1051}
1120 1052
1121// compare *op against *arch and output differences 1053// compare *op against *arch and output differences
… …
1141 KW_NULL, 1073 KW_NULL,
1142 KW_applied, 1074 KW_applied,
1143 KW_unpaid, 1075 KW_unpaid,
1144 KW_can_use_shield, 1076 KW_can_use_shield,
1145 KW_no_pick, 1077 KW_no_pick,
1146 KW_NULL, // walk_on 1078 KW_is_transparent_floor,
1147 /* 10 */ 1079 /* 10 */
1148 KW_NULL, // no_pass 1080 KW_NULL, // no_pass
1149 KW_is_animated, 1081 KW_is_animated,
1150 KW_NULL, // slow_move 1082 KW_NULL, // slow_move
1151 KW_NULL, // flying 1083 KW_NULL, // flying
… …
1246 /* 100 */ 1178 /* 100 */
1247 KW_neutral, 1179 KW_neutral,
1248 KW_no_attack, 1180 KW_no_attack,
1249 KW_no_damage, 1181 KW_no_damage,
1250 KW_obj_original, 1182 KW_obj_original,
1251 KW_NULL, 1183 KW_random_speed,
1252 KW_activate_on_push, 1184 KW_activate_on_push,
1253 KW_activate_on_release, 1185 KW_activate_on_release,
1254 KW_is_water, 1186 KW_is_water,
1255 KW_use_content_on_gen, 1187 KW_use_content_on_gen,
1256 KW_NULL, 1188 KW_NULL,
… …
1273 } flagmask; 1205 } flagmask;
1274 1206
1275 /* 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
1276 * keys that match field names will be overwritten by the loader. 1208 * keys that match field names will be overwritten by the loader.
1277 */ 1209 */
1278 for (key_value *kv = op->key_values; kv; kv = kv->next) 1210 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1279 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1211 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1280 f.put (kv->key, kv->value); 1212 f.put (kv->key, kv->value);
1281 1213
1282 if (op->uuid) 1214 if (op->uuid)
1283 { 1215 {
1284 // highly optimised - this is often 25% of all data written 1216 // highly optimised - this is often 25% of all data written
… …
1303 CMP_OUT (subtype); 1235 CMP_OUT (subtype);
1304 CMP_OUT (direction); 1236 CMP_OUT (direction);
1305 1237
1306 CMP_OUT (name); 1238 CMP_OUT (name);
1307 CMP_OUT (name_pl); 1239 CMP_OUT (name_pl);
1308
1309 CMP_OUT (speed); 1240 CMP_OUT (speed);
1310 1241
1311 // speed_left is a major time-burner, and has good locality, so 1242 // 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. 1243 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left) 1244 if (op->speed_left != arch->speed_left)
1314 { 1245 {
1315 static double last_speed_left = 0.; 1246 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n"; 1247 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1248 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318 1249
1319 if (last_speed_left != op->speed_left) 1250 if (last_speed_left != op->speed_left)
1320 { 1251 {
1321 last_speed_left = op->speed_left; 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)
1322 last_speed_left_len = sizeof ("speed_left ") - 1 1256 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1257 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 } 1258 }
1325 1259
1326 f.add (last_speed_left_str, last_speed_left_len); 1260 f.add (last_speed_left_str, last_speed_left_len);
1327 } 1261 }
1328 1262
… …
1333 1267
1334 CMP_OUT (tag); 1268 CMP_OUT (tag);
1335 CMP_OUT (custom_name); 1269 CMP_OUT (custom_name);
1336 1270
1337 if (object *owner = op->owner) 1271 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1272 if (const char *ref = owner->ref ())
1273 f.put (KW(owner), ref);
1339 1274
1340 // 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
1341 1276
1342 CMP_OUT (other_arch); 1277 CMP_OUT (other_arch);
1343 1278
… …
1416 if (op->flag [FLAG_IS_LINKED]) 1351 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ())) 1352 if (auto (ol, op->find_link ()))
1418 f.put (KW(connected), ol->id); 1353 f.put (KW(connected), ol->id);
1419 1354
1420 CMP_OUT (randomitems); 1355 CMP_OUT (randomitems);
1356
1421 CMP_OUT2 (container, weight_limit); 1357 CMP_OUT2 (container, weight_limit);
1422 1358
1423 CMP_OUT (run_away); 1359 CMP_OUT (run_away);
1424 CMP_OUT (pick_up); 1360 CMP_OUT (pick_up);
1425 CMP_OUT (will_apply); 1361 CMP_OUT (will_apply);
… …
1442 CMP_OUT (move_slow); 1378 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1379 CMP_OUT (move_slow_penalty);
1444 1380
1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1381 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446 1382
1383#if stdcpp // we need gcc, sorry
1447 if (diff [FLAG_OBJ_ORIGINAL]) 1384 if (diff [FLAG_OBJ_ORIGINAL])
1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1385 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1449 1386
1450 diff.reset (FLAG_OBJ_ORIGINAL); 1387 diff.reset (FLAG_OBJ_ORIGINAL);
1451 1388
1452 // quickly test whether any other flags differ 1389 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ())) 1390 if (expect_true (diff.any ()))
1454 for (int i = 0; i < NUM_FLAGS; i++) 1391 for (int i = 0; i < NUM_FLAGS; i++)
1455 if (expect_false (diff [i])) 1392 if (expect_false (diff [i]))
1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(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
1457 1399
1458 // 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
1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1401 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1460 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1402 if (expect_false (op->slot[i].info != arch->slot[i].info))
1461 f.put (body_locations[i].save_name, op->slot[i].info); 1403 f.put (body_locations[i].kw, op->slot[i].info);
1462} 1404}
1463 1405
1464/* 1406/*
1465 * Dumps all variables in an object to a file. 1407 * Dumps all variables in an object to a file.
1466 * 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,
… …
1498{ 1440{
1499 object_thawer f (filename); 1441 object_thawer f (filename);
1500 1442
1501 for (;;) 1443 for (;;)
1502 { 1444 {
1445 coroapi::cede_to_tick ();
1446
1503 switch (f.kw) 1447 switch (f.kw)
1504 { 1448 {
1505 case KW_region: 1449 case KW_region:
1506 if (!region::read (f)) 1450 if (!region::read (f))
1507 return false; 1451 return false;

Diff Legend

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