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.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
… …
516 { 530 {
517 negate = 1; 531 negate = 1;
518 str++; 532 str++;
519 } 533 }
520 534
521 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)
522 { 536 {
523 if (!strcmp (f->name, str)) 537 if (!strcmp (f->name, str))
524 { 538 {
525 if (negate) 539 if (negate)
526 mt &= ~f->flags; 540 mt &= ~f->flags;
… …
543 557
544bool 558bool
545object::parse_kv (object_thawer &f) 559object::parse_kv (object_thawer &f)
546{ 560{
547 object *op_inv = inv; 561 object *op_inv = inv;
548 key_value *last_kv = key_values;
549 562
550 for (;;) 563 for (;;)
551 { 564 {
552 switch (f.kw) 565 switch (f.kw)
553 { 566 {
… …
582 // was: insert_ob_in_ob (tmp, op); 595 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot 596 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the 597 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves. 598 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects 599 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 600 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED); 601 tmp->clr_flag (FLAG_REMOVED);
589 602
590 if (!op_inv) 603 if (!op_inv)
591 { 604 {
592 inv = tmp; 605 inv = tmp;
593 tmp->above = 0; 606 tmp->above = 0;
… …
626 f.delayed_deref (this, owner, f.get_str ()); 639 f.delayed_deref (this, owner, f.get_str ());
627 break; 640 break;
628 641
629 case KW_animation: 642 case KW_animation:
630 { 643 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 644 clr_flag (FLAG_ANIMATE);
632 animation_id = 0; 645 animation_id = 0;
633 646
634 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 647 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 648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
636 } 649 }
637 break; 650 break;
638 651
639 case KW_last_heal: f.get (last_heal); break; 652 case KW_last_heal: f.get (last_heal); break;
640 case KW_last_sp: f.get (last_sp); break; 653 case KW_last_sp: f.get (last_sp); break;
641 case KW_last_grace: f.get (last_grace); break; 654 case KW_last_grace: f.get (last_grace); break;
642 case KW_last_eat: f.get (last_eat); break; 655 case KW_last_eat: f.get (last_eat); break;
656 case KW_sl:
643 case KW_speed_left: f.get (speed_left); break; 657 case KW_speed_left: f.get (speed_left); break;
644 658
645 case KW_speed: 659 case KW_speed:
646 f.get (speed); 660 f.get (speed);
647 661
… …
729 case KW_invisible: f.get (invisible); break; 743 case KW_invisible: f.get (invisible); break;
730 case KW_magic: f.get (magic); break; 744 case KW_magic: f.get (magic); break;
731 case KW_state: f.get (state); break; 745 case KW_state: f.get (state); break;
732 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 746 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
733 case KW_material: f.get (materials); break; //TODO: nuke 747 case KW_material: f.get (materials); break; //TODO: nuke
734 748 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 749
743 /* These are the new values */ 750 /* These are the new values */
744 case KW_move_block: set_move (move_block, f); break; 751 case KW_move_block: set_move (move_block, f); break;
745 case KW_move_allow: set_move (move_allow, f); break; 752 case KW_move_allow: set_move (move_allow, f); break;
746 case KW_move_type: set_move (move_type , f); break; 753 case KW_move_type: set_move (move_type , f); break;
747 case KW_move_on: set_move (move_on , f); break; 754 case KW_move_on: set_move (move_on , f); break;
748 case KW_move_off: set_move (move_off , f); break; 755 case KW_move_off: set_move (move_off , f); break;
749 case KW_move_slow: set_move (move_slow , f); break; 756 case KW_move_slow: set_move (move_slow , f); break;
750 757
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 758 //TODO: remove these after converting archetypes
804 case KW_can_use_wand: 759 case KW_can_use_wand:
805 GET_FLAG (this, FLAG_USE_RANGE); 760 GET_FLAG (this, FLAG_USE_RANGE);
806 break; 761 break;
807 762
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: 763 case KW_identified:
820 GET_FLAG (this, FLAG_IDENTIFIED); 764 GET_FLAG (this, FLAG_IDENTIFIED);
821 //TODO: move to check_object or so 765 //TODO: move to check_object or so
822 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 766 if (this->flag [FLAG_IDENTIFIED])
823 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 767 this->clr_flag (FLAG_KNOWN_MAGICAL);
824 768
825 break; 769 break;
826 770
827 case KW_friendly: 771 case KW_friendly:
828 if (f.get_bool ()) 772 if (f.get_bool ())
… …
855 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 799 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
856 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 800 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
857 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 801 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
858 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 802 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
859 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;
860 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 805 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
861 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 806 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
862 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 807 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 861 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 862 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; 863 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; 864 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 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;
921 868
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 869 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 870 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 871 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 872 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1037 984
1038 f.next (); 985 f.next ();
1039 return true; 986 return true;
1040 987
1041 case KW_ERROR: 988 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 989 // we do not even try to find old values, duplicate keys stay duplicate
1044 { 990 // the list gets reversed after loading
1045 key_value *kv = new key_value; 991 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; 992 break;
1064 993
1065 default: 994 default:
1066 if (!f.parse_error ("object", name)) 995 if (!f.parse_error ("object", name))
1067 return false; 996 return false;
… …
1079 1008
1080 archetype *arch = archetype::find (f.get_str ()); 1009 archetype *arch = archetype::find (f.get_str ());
1081 1010
1082 if (!arch) 1011 if (!arch)
1083 { 1012 {
1084 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 ());
1085 arch = archetype::find (shstr_earthwall); 1014 arch = archetype::find (shstr_earthwall);
1086 } 1015 }
1087 1016
1088 assert (arch); //D maybe use exception handling of sorts? 1017 assert (arch); //D maybe use exception handling of sorts?
1089 1018
… …
1097 if (!op->parse_kv (f)) 1026 if (!op->parse_kv (f))
1098 { 1027 {
1099 op->destroy (); 1028 op->destroy ();
1100 return 0; 1029 return 0;
1101 } 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 ();
1102 1035
1103 op->post_load_check (); 1036 op->post_load_check ();
1104 return op; 1037 return op;
1105} 1038}
1106 1039
… …
1111 * override values and in c_wiz to mutate values. 1044 * override values and in c_wiz to mutate values.
1112 */ 1045 */
1113int 1046int
1114set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1115{ 1048{
1116 object_thawer f (buf, (AV *)0); 1049 object_thawer f (format ("%s\nend", buf), (AV *)0);
1117 1050
1118 return op->parse_kv (f); 1051 return op->parse_kv (f);
1119} 1052}
1120 1053
1121// compare *op against *arch and output differences 1054// compare *op against *arch and output differences
… …
1141 KW_NULL, 1074 KW_NULL,
1142 KW_applied, 1075 KW_applied,
1143 KW_unpaid, 1076 KW_unpaid,
1144 KW_can_use_shield, 1077 KW_can_use_shield,
1145 KW_no_pick, 1078 KW_no_pick,
1146 KW_NULL, // walk_on 1079 KW_is_transparent_floor,
1147 /* 10 */ 1080 /* 10 */
1148 KW_NULL, // no_pass 1081 KW_NULL, // no_pass
1149 KW_is_animated, 1082 KW_is_animated,
1150 KW_NULL, // slow_move 1083 KW_NULL, // slow_move
1151 KW_NULL, // flying 1084 KW_NULL, // flying
… …
1246 /* 100 */ 1179 /* 100 */
1247 KW_neutral, 1180 KW_neutral,
1248 KW_no_attack, 1181 KW_no_attack,
1249 KW_no_damage, 1182 KW_no_damage,
1250 KW_obj_original, 1183 KW_obj_original,
1251 KW_NULL, 1184 KW_random_speed,
1252 KW_activate_on_push, 1185 KW_activate_on_push,
1253 KW_activate_on_release, 1186 KW_activate_on_release,
1254 KW_is_water, 1187 KW_is_water,
1255 KW_use_content_on_gen, 1188 KW_use_content_on_gen,
1256 KW_NULL, 1189 KW_NULL,
… …
1273 } flagmask; 1206 } flagmask;
1274 1207
1275 /* 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
1276 * keys that match field names will be overwritten by the loader. 1209 * keys that match field names will be overwritten by the loader.
1277 */ 1210 */
1278 for (key_value *kv = op->key_values; kv; kv = kv->next) 1211 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1279 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1212 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1280 f.put (kv->key, kv->value); 1213 f.put (kv->key, kv->value);
1281 1214
1282 if (op->uuid) 1215 if (op->uuid)
1283 { 1216 {
1284 // highly optimised - this is often 25% of all data written 1217 // highly optimised - this is often 25% of all data written
… …
1291 *ptr++ = '\n'; 1224 *ptr++ = '\n';
1292 1225
1293 f.alloc (ptr - cur); 1226 f.alloc (ptr - cur);
1294 } 1227 }
1295 1228
1296#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)
1297#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)
1298 1231
1299 CMP_OUT (x); 1232 CMP_OUT (x);
1300 CMP_OUT (y); 1233 CMP_OUT (y);
1301 1234
1302 CMP_OUT (type); 1235 CMP_OUT (type);
1303 CMP_OUT (subtype); 1236 CMP_OUT (subtype);
1304 CMP_OUT (direction); 1237 CMP_OUT (direction);
1305 1238
1306 CMP_OUT (name); 1239 CMP_OUT (name);
1307 CMP_OUT (name_pl); 1240 CMP_OUT (name_pl);
1308
1309 CMP_OUT (speed); 1241 CMP_OUT (speed);
1310 1242
1311 // speed_left is a major time-burner, and has good locality, so 1243 // 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. 1244 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left) 1245 if (op->speed_left != arch->speed_left)
1314 { 1246 {
1315 static double last_speed_left = 0.; 1247 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n"; 1248 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1249 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318 1250
1319 if (last_speed_left != op->speed_left) 1251 if (last_speed_left != op->speed_left)
1320 { 1252 {
1321 last_speed_left = op->speed_left; 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)
1322 last_speed_left_len = sizeof ("speed_left ") - 1 1257 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1258 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 } 1259 }
1325 1260
1326 f.add (last_speed_left_str, last_speed_left_len); 1261 f.add (last_speed_left_str, last_speed_left_len);
1327 } 1262 }
1328 1263
… …
1333 1268
1334 CMP_OUT (tag); 1269 CMP_OUT (tag);
1335 CMP_OUT (custom_name); 1270 CMP_OUT (custom_name);
1336 1271
1337 if (object *owner = op->owner) 1272 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1273 if (const char *ref = owner->ref ())
1274 f.put (KW(owner), ref);
1339 1275
1340 // 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
1341 1277
1342 CMP_OUT (other_arch); 1278 CMP_OUT (other_arch);
1343 1279
… …
1388 CMP_OUT (level); 1324 CMP_OUT (level);
1389 CMP_OUT (attacktype); 1325 CMP_OUT (attacktype);
1390 1326
1391 // using memcmp here seems to be a loss - is gcc vectorising? 1327 // using memcmp here seems to be a loss - is gcc vectorising?
1392 for (int i = 0; i < NROFATTACKS; i++) 1328 for (int i = 0; i < NROFATTACKS; i++)
1393 if (expect_false (op->resist[i] != arch->resist[i])) 1329 if (ecb_expect_false (op->resist[i] != arch->resist[i]))
1394 f.put (resist_save[i], op->resist[i]); 1330 f.put (resist_save[i], op->resist[i]);
1395 1331
1396 CMP_OUT (path_attuned); 1332 CMP_OUT (path_attuned);
1397 CMP_OUT (path_repelled); 1333 CMP_OUT (path_repelled);
1398 CMP_OUT (path_denied); 1334 CMP_OUT (path_denied);
… …
1412 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1413 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1414 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1415 1351
1416 if (op->flag [FLAG_IS_LINKED]) 1352 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ())) 1353 if (auto ol = op->find_link ())
1418 f.put (KW(connected), ol->id); 1354 f.put (KW(connected), ol->id);
1419 1355
1420 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1357
1421 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
1422 1359
1423 CMP_OUT (run_away); 1360 CMP_OUT (run_away);
1424 CMP_OUT (pick_up); 1361 CMP_OUT (pick_up);
1425 CMP_OUT (will_apply); 1362 CMP_OUT (will_apply);
… …
1442 CMP_OUT (move_slow); 1379 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1380 CMP_OUT (move_slow_penalty);
1444 1381
1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1382 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446 1383
1384#if stdcpp // we need gcc, sorry
1447 if (diff [FLAG_OBJ_ORIGINAL]) 1385 if (diff [FLAG_OBJ_ORIGINAL])
1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1386 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1449 1387
1450 diff.reset (FLAG_OBJ_ORIGINAL); 1388 diff.reset (FLAG_OBJ_ORIGINAL);
1451 1389
1452 // quickly test whether any other flags differ 1390 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ())) 1391 if (ecb_expect_true (diff.any ()))
1454 for (int i = 0; i < NUM_FLAGS; i++) 1392 for (int i = 0; i < NUM_FLAGS; i++)
1455 if (expect_false (diff [i])) 1393 if (ecb_expect_false (diff [i]))
1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(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
1457 1400
1458 // 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
1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
1460 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1403 if (ecb_expect_false (op->slot[i].info != arch->slot[i].info))
1461 f.put (body_locations[i].save_name, op->slot[i].info); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1462} 1405}
1463 1406
1464/* 1407/*
1465 * Dumps all variables in an object to a file. 1408 * 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, 1409 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1467 * 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.
1468 */ 1411 */
1469bool 1412bool
1470object::write (object_freezer &f) 1413object::write (object_freezer &f)
1471{ 1414{
1472 if (expect_false (is_arch ())) 1415 if (ecb_expect_false (is_arch ()))
1473 { 1416 {
1474 f.put (KW(object), arch->archname); 1417 f.put (KW(object), arch->archname);
1475 write_diff (f, this, archetype::empty); 1418 write_diff (f, this, archetype::empty);
1476 } 1419 }
1477 else 1420 else
… …
1498{ 1441{
1499 object_thawer f (filename); 1442 object_thawer f (filename);
1500 1443
1501 for (;;) 1444 for (;;)
1502 { 1445 {
1446 coroapi::cede_to_tick ();
1447
1503 switch (f.kw) 1448 switch (f.kw)
1504 { 1449 {
1505 case KW_region: 1450 case KW_region:
1506 if (!region::read (f)) 1451 if (!region::read (f))
1507 return false; 1452 return false;

Diff Legend

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