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.150 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.172 by root, Tue Jan 3 11:25:31 2012 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
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)
395 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
397#endif 397#endif
398 } 398 }
399 399
400 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
402 if ((type == ROD 402 if ((type == ROD
403 || type == WAND 403 || type == WAND
404 || type == SCROLL 404 || type == SCROLL
405 || type == HORN 405 || type == HORN
414 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
416 * in that spell was stored in sp. 416 * in that spell was stored in sp.
417 */ 417 */
418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
419 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
420 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
421 randomitems = 0; 421 randomitems = 0;
422 } 422 }
423 423
424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
430 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
431 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
432 value = arch->value * inv->value; 432 value = arch->value * inv->value;
433 } 433 }
434 434
435 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
436 { 436 {
437 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
438 { 438 {
439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
440 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
443 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
444 if (move_type == 0) 444 if (move_type == 0)
445 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
446 } 446 }
447 447
448 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
449 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
450 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
451 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
452 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
453 */ 453 */
523 { 523 {
524 negate = 1; 524 negate = 1;
525 str++; 525 str++;
526 } 526 }
527 527
528 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
529 { 529 {
530 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
531 { 531 {
532 if (negate) 532 if (negate)
533 mt &= ~f->flags; 533 mt &= ~f->flags;
550 550
551bool 551bool
552object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
553{ 553{
554 object *op_inv = inv; 554 object *op_inv = inv;
555 key_value *last_kv = key_values; 555 key_value *last_kv = kv.first;
556 556
557 for (;;) 557 for (;;)
558 { 558 {
559 switch (f.kw) 559 switch (f.kw)
560 { 560 {
589 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
590 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
591 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
592 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
593 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
594 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
595 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
596 596
597 if (!op_inv) 597 if (!op_inv)
598 { 598 {
599 inv = tmp; 599 inv = tmp;
600 tmp->above = 0; 600 tmp->above = 0;
633 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
634 break; 634 break;
635 635
636 case KW_animation: 636 case KW_animation:
637 { 637 {
638 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
639 animation_id = 0; 639 animation_id = 0;
640 640
641 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
642 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 642 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
643 } 643 }
644 break; 644 break;
645 645
646 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
647 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
737 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
738 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
739 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
740 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
741 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
742 742 case KW_materialname: f.get (material); break;
743 case KW_materialname:
744 {
745 shstr sh;
746 f.get (sh);
747 material = name_to_material (sh);
748 }
749 break;
750 743
751 /* These are the new values */ 744 /* These are the new values */
752 case KW_move_block: set_move (move_block, f); break; 745 case KW_move_block: set_move (move_block, f); break;
753 case KW_move_allow: set_move (move_allow, f); break; 746 case KW_move_allow: set_move (move_allow, f); break;
754 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
755 case KW_move_on: set_move (move_on , f); break; 748 case KW_move_on: set_move (move_on , f); break;
756 case KW_move_off: set_move (move_off , f); break; 749 case KW_move_off: set_move (move_off , f); break;
757 case KW_move_slow: set_move (move_slow , f); break; 750 case KW_move_slow: set_move (move_slow , f); break;
758 751
759 /* These are all legacy - any new objects should use the move_ .. values */
760 case KW_no_pass:
761 {
762 if (f.get_sint32 ())
763 move_block = MOVE_ALL;
764 else
765 move_block = 0;
766 }
767
768 break;
769
770 /* These are all legacy - any new objects should use the move_ .. values */
771 case KW_walk_on:
772 {
773 if (f.get_sint32 ())
774 move_on |= MOVE_WALK;
775 else
776 move_on &= ~MOVE_WALK;
777 }
778
779 break;
780
781 /* These are all legacy - any new objects should use the move_ .. values */
782 case KW_walk_off:
783 {
784 if (f.get_sint32 ())
785 move_off |= MOVE_WALK;
786 else
787 move_off &= ~MOVE_WALK;
788 }
789 break;
790
791 /* These are all legacy - any new objects should use the move_ .. values */
792 case KW_fly_on:
793 {
794 if (f.get_sint32 ())
795 move_on |= MOVE_FLY_LOW;
796 else
797 move_on &= ~MOVE_FLY_LOW;
798 }
799 break;
800
801 /* These are all legacy - any new objects should use the move_ .. values */
802 case KW_fly_off:
803 {
804 if (f.get_sint32 ())
805 move_off |= MOVE_FLY_LOW;
806 else
807 move_off &= ~MOVE_FLY_LOW;
808 }
809 break;
810
811 //TODO: remove these after converting archetypes 752 //TODO: remove these after converting archetypes
812 case KW_can_use_wand: 753 case KW_can_use_wand:
813 GET_FLAG (this, FLAG_USE_RANGE); 754 GET_FLAG (this, FLAG_USE_RANGE);
814 break; 755 break;
815 756
816 /* These are all legacy - any new objects should use the move_ .. values */
817 case KW_flying:
818 {
819 if (f.get_sint32 ())
820 move_type |= MOVE_FLY_LOW;
821 else
822 move_type &= ~MOVE_FLY_LOW;
823 }
824 break;
825
826
827 case KW_identified: 757 case KW_identified:
828 GET_FLAG (this, FLAG_IDENTIFIED); 758 GET_FLAG (this, FLAG_IDENTIFIED);
829 //TODO: move to check_object or so 759 //TODO: move to check_object or so
830 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 760 if (this->flag [FLAG_IDENTIFIED])
831 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 761 this->clr_flag (FLAG_KNOWN_MAGICAL);
832 762
833 break; 763 break;
834 764
835 case KW_friendly: 765 case KW_friendly:
836 if (f.get_bool ()) 766 if (f.get_bool ())
863 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 793 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
864 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 794 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
865 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 795 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
866 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 796 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
867 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 797 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
798 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
868 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 799 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
869 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 800 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
870 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 801 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
871 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 802 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
872 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 803 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
925 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 856 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
926 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 857 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
927 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 858 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
928 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 859 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
929 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; 860 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
861 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
930 862
931 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 863 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
932 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 864 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
933 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 865 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
934 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 866 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1046 978
1047 f.next (); 979 f.next ();
1048 return true; 980 return true;
1049 981
1050 case KW_ERROR: 982 case KW_ERROR:
1051 // append as key value pair (do not use kv_set as it prepends)
1052 // we also do not even try to find old values, duplicate keys stay duplicate 983 // we do not even try to find old values, duplicate keys stay duplicate
1053 { 984 // the list gets reversed after loading
1054 key_value *kv = new key_value; 985 kv.add (shstr (f.kw_str), shstr (f.value));
1055
1056 kv->next = 0;
1057 kv->key = shstr (f.kw_str);
1058 kv->value = shstr (f.value);
1059
1060 if (!last_kv)
1061 key_values = last_kv = kv;
1062 else
1063 {
1064 while (last_kv->next)
1065 last_kv = last_kv->next;
1066
1067 last_kv->next = kv;
1068 last_kv = kv;
1069 }
1070 }
1071 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1072 break; 986 break;
1073 987
1074 default: 988 default:
1075 if (!f.parse_error ("object", name)) 989 if (!f.parse_error ("object", name))
1076 return false; 990 return false;
1088 1002
1089 archetype *arch = archetype::find (f.get_str ()); 1003 archetype *arch = archetype::find (f.get_str ());
1090 1004
1091 if (!arch) 1005 if (!arch)
1092 { 1006 {
1093 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1007 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1094 arch = archetype::find (shstr_earthwall); 1008 arch = archetype::find (shstr_earthwall);
1095 } 1009 }
1096 1010
1097 assert (arch); //D maybe use exception handling of sorts? 1011 assert (arch); //D maybe use exception handling of sorts?
1098 1012
1106 if (!op->parse_kv (f)) 1020 if (!op->parse_kv (f))
1107 { 1021 {
1108 op->destroy (); 1022 op->destroy ();
1109 return 0; 1023 return 0;
1110 } 1024 }
1025
1026 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1027 // that greatly simplifies the loading code.
1028 op->kv.reverse ();
1111 1029
1112 op->post_load_check (); 1030 op->post_load_check ();
1113 return op; 1031 return op;
1114} 1032}
1115 1033
1120 * override values and in c_wiz to mutate values. 1038 * override values and in c_wiz to mutate values.
1121 */ 1039 */
1122int 1040int
1123set_variable (object *op, char *buf) 1041set_variable (object *op, char *buf)
1124{ 1042{
1125 object_thawer f (buf, (AV *)0); 1043 object_thawer f (format ("%s\nend", buf), (AV *)0);
1126 1044
1127 return op->parse_kv (f); 1045 return op->parse_kv (f);
1128} 1046}
1129 1047
1130// compare *op against *arch and output differences 1048// compare *op against *arch and output differences
1150 KW_NULL, 1068 KW_NULL,
1151 KW_applied, 1069 KW_applied,
1152 KW_unpaid, 1070 KW_unpaid,
1153 KW_can_use_shield, 1071 KW_can_use_shield,
1154 KW_no_pick, 1072 KW_no_pick,
1155 KW_NULL, // walk_on 1073 KW_is_transparent_floor,
1156 /* 10 */ 1074 /* 10 */
1157 KW_NULL, // no_pass 1075 KW_NULL, // no_pass
1158 KW_is_animated, 1076 KW_is_animated,
1159 KW_NULL, // slow_move 1077 KW_NULL, // slow_move
1160 KW_NULL, // flying 1078 KW_NULL, // flying
1282 } flagmask; 1200 } flagmask;
1283 1201
1284 /* This saves the key/value lists. We do it first so that any 1202 /* This saves the key/value lists. We do it first so that any
1285 * keys that match field names will be overwritten by the loader. 1203 * keys that match field names will be overwritten by the loader.
1286 */ 1204 */
1287 for (key_value *kv = op->key_values; kv; kv = kv->next) 1205 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1288 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1206 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1289 f.put (kv->key, kv->value); 1207 f.put (kv->key, kv->value);
1290 1208
1291 if (op->uuid) 1209 if (op->uuid)
1292 { 1210 {
1293 // highly optimised - this is often 25% of all data written 1211 // highly optimised - this is often 25% of all data written
1341 1259
1342 CMP_OUT (tag); 1260 CMP_OUT (tag);
1343 CMP_OUT (custom_name); 1261 CMP_OUT (custom_name);
1344 1262
1345 if (object *owner = op->owner) 1263 if (object *owner = op->owner)
1346 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1264 if (const char *ref = owner->ref ())
1265 f.put (KW(owner), ref);
1347 1266
1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1267 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1349 1268
1350 CMP_OUT (other_arch); 1269 CMP_OUT (other_arch);
1351 1270
1451 CMP_OUT (move_slow); 1370 CMP_OUT (move_slow);
1452 CMP_OUT (move_slow_penalty); 1371 CMP_OUT (move_slow_penalty);
1453 1372
1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1373 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455 1374
1375#if stdcpp // we need gcc, sorry
1456 if (diff [FLAG_OBJ_ORIGINAL]) 1376 if (diff [FLAG_OBJ_ORIGINAL])
1457 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1377 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1458 1378
1459 diff.reset (FLAG_OBJ_ORIGINAL); 1379 diff.reset (FLAG_OBJ_ORIGINAL);
1460 1380
1461 // quickly test whether any other flags differ 1381 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ())) 1382 if (expect_true (diff.any ()))
1463 for (int i = 0; i < NUM_FLAGS; i++) 1383 for (int i = 0; i < NUM_FLAGS; i++)
1464 if (expect_false (diff [i])) 1384 if (expect_false (diff [i]))
1465 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); 1385 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1386#else
1387 // use sgi extensions
1388 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1389 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1390#endif
1466 1391
1467 // save body locations. gcc's memcmp does an abysmal job when used 1392 // save body locations. gcc's memcmp does an abysmal job when used
1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1469 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1394 if (expect_false (op->slot[i].info != arch->slot[i].info))
1470 f.put (body_locations[i].save_name, op->slot[i].info); 1395 f.put (body_locations[i].kw, op->slot[i].info);
1471} 1396}
1472 1397
1473/* 1398/*
1474 * Dumps all variables in an object to a file. 1399 * Dumps all variables in an object to a file.
1475 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1400 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1507{ 1432{
1508 object_thawer f (filename); 1433 object_thawer f (filename);
1509 1434
1510 for (;;) 1435 for (;;)
1511 { 1436 {
1437 coroapi::cede_to_tick ();
1438
1512 switch (f.kw) 1439 switch (f.kw)
1513 { 1440 {
1514 case KW_region: 1441 case KW_region:
1515 if (!region::read (f)) 1442 if (!region::read (f))
1516 return false; 1443 return false;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines