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.153 by root, Sun Apr 11 00:34:05 2010 UTC vs.
Revision 1.179 by root, Sun Jul 29 05:47:00 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,2010 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 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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 <sproto.h> 26#include <sproto.h>
… …
250 "spell_glyph", /* 205 */ 250 "spell_glyph", /* 205 */
251 NULL 251 NULL
252}; 252};
253 253
254/* 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
255 * 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
256 * 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
257 * 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.
258 */ 258 */
259void 259void
260object::post_load_check () 260object::post_load_check ()
… …
265 type = 0; 265 type = 0;
266 } 266 }
267 267
268 switch (type) 268 switch (type)
269 { 269 {
270 case RANGED:
270 case BOW: 271 case BOW:
271 case WAND: 272 case WAND:
272 case ROD: 273 case ROD:
273 case HORN: 274 case HORN:
274 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
… …
320 * this isn't perfect (things won't be properly pluralised), but works to 321 * this isn't perfect (things won't be properly pluralised), but works to
321 * that degree (5 heart is still quite understandable). But the case we 322 * that degree (5 heart is still quite understandable). But the case we
322 * also have to catch is if this object is not using the normal name for 323 * also have to catch is if this object is not using the normal name for
323 * the object. In that case, we also want to use the loaded name. 324 * the object. In that case, we also want to use the loaded name.
324 * Otherwise, what happens is that the the plural name will lose 325 * Otherwise, what happens is that the the plural name will lose
325 * information (appear as just 'hearts' and not 'goblins heart') 326 * information (appear as just 'hearts' and not 'goblins heart')
326 */ 327 */
327 if (arch && name != arch->object::name && name_pl == arch->object::name_pl) 328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
328 name_pl = 0; 329 name_pl = 0;
329 330
330 if (!name_pl) 331 if (!name_pl)
… …
394 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
395 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);
396#endif 397#endif
397 } 398 }
398 399
399 /* 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 */
400 /* (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 */
401 if ((type == ROD 402 if ((type == ROD
402 || type == WAND 403 || type == WAND
403 || type == SCROLL 404 || type == SCROLL
404 || type == HORN 405 || type == HORN
… …
413 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
414 /* 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'
415 * in that spell was stored in sp. 416 * in that spell was stored in sp.
416 */ 417 */
417 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
418 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]);
419 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
420 randomitems = 0; 421 randomitems = 0;
421 } 422 }
422 423
423 /* 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 */
… …
474 } 475 }
475 476
476 // if the object has an animation, try to provide a default face 477 // if the object has an animation, try to provide a default face
477 if (has_anim ()) 478 if (has_anim ())
478 { 479 {
479 const animation &anim_ob = anim ();
480
481 if (anim_speed) 480 if (anim_speed)
482 // if this item is time-animated, force the last frame 481 // if this item is time-animated, force the last frame
483 animate_object (this, 0); 482 animate_object (this, 0);
484 else if (flag [FLAG_MONSTER]) 483 else if (flag [FLAG_MONSTER])
485 // if it is a monster, set appropriate facing 484 // if it is a monster, set appropriate facing
… …
522 { 521 {
523 negate = 1; 522 negate = 1;
524 str++; 523 str++;
525 } 524 }
526 525
527 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 526 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
528 { 527 {
529 if (!strcmp (f->name, str)) 528 if (!strcmp (f->name, str))
530 { 529 {
531 if (negate) 530 if (negate)
532 mt &= ~f->flags; 531 mt &= ~f->flags;
… …
549 548
550bool 549bool
551object::parse_kv (object_thawer &f) 550object::parse_kv (object_thawer &f)
552{ 551{
553 object *op_inv = inv; 552 object *op_inv = inv;
554 key_value *last_kv = key_values;
555 553
556 for (;;) 554 for (;;)
557 { 555 {
558 switch (f.kw) 556 switch (f.kw)
559 { 557 {
… …
632 f.delayed_deref (this, owner, f.get_str ()); 630 f.delayed_deref (this, owner, f.get_str ());
633 break; 631 break;
634 632
635 case KW_animation: 633 case KW_animation:
636 { 634 {
637 this->clr_flag (FLAG_ANIMATE); 635 clr_flag (FLAG_ANIMATE);
638 animation_id = 0; 636 animation_id = 0;
639 637
640 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 638 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
641 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here 639 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 640 }
643 break; 641 break;
644 642
645 case KW_last_heal: f.get (last_heal); break; 643 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 644 case KW_last_sp: f.get (last_sp); break;
… …
736 case KW_invisible: f.get (invisible); break; 734 case KW_invisible: f.get (invisible); break;
737 case KW_magic: f.get (magic); break; 735 case KW_magic: f.get (magic); break;
738 case KW_state: f.get (state); break; 736 case KW_state: f.get (state); break;
739 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 737 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
740 case KW_material: f.get (materials); break; //TODO: nuke 738 case KW_material: f.get (materials); break; //TODO: nuke
741 739 case KW_materialname: f.get (material); break;
742 case KW_materialname:
743 {
744 shstr sh;
745 f.get (sh);
746 material = name_to_material (sh);
747 }
748 break;
749 740
750 /* These are the new values */ 741 /* These are the new values */
751 case KW_move_block: set_move (move_block, f); break; 742 case KW_move_block: set_move (move_block, f); break;
752 case KW_move_allow: set_move (move_allow, f); break; 743 case KW_move_allow: set_move (move_allow, f); break;
753 case KW_move_type: set_move (move_type , f); break; 744 case KW_move_type: set_move (move_type , f); break;
754 case KW_move_on: set_move (move_on , f); break; 745 case KW_move_on: set_move (move_on , f); break;
755 case KW_move_off: set_move (move_off , f); break; 746 case KW_move_off: set_move (move_off , f); break;
756 case KW_move_slow: set_move (move_slow , f); break; 747 case KW_move_slow: set_move (move_slow , f); break;
757 748
758 /* These are all legacy - any new objects should use the move_ .. values */
759 case KW_no_pass:
760 {
761 if (f.get_sint32 ())
762 move_block = MOVE_ALL;
763 else
764 move_block = 0;
765 }
766
767 break;
768
769 /* These are all legacy - any new objects should use the move_ .. values */
770 case KW_walk_on:
771 {
772 if (f.get_sint32 ())
773 move_on |= MOVE_WALK;
774 else
775 move_on &= ~MOVE_WALK;
776 }
777
778 break;
779
780 /* These are all legacy - any new objects should use the move_ .. values */
781 case KW_walk_off:
782 {
783 if (f.get_sint32 ())
784 move_off |= MOVE_WALK;
785 else
786 move_off &= ~MOVE_WALK;
787 }
788 break;
789
790 /* These are all legacy - any new objects should use the move_ .. values */
791 case KW_fly_on:
792 {
793 if (f.get_sint32 ())
794 move_on |= MOVE_FLY_LOW;
795 else
796 move_on &= ~MOVE_FLY_LOW;
797 }
798 break;
799
800 /* These are all legacy - any new objects should use the move_ .. values */
801 case KW_fly_off:
802 {
803 if (f.get_sint32 ())
804 move_off |= MOVE_FLY_LOW;
805 else
806 move_off &= ~MOVE_FLY_LOW;
807 }
808 break;
809
810 //TODO: remove these after converting archetypes 749 //TODO: remove these after converting archetypes
811 case KW_can_use_wand: 750 case KW_can_use_wand:
812 GET_FLAG (this, FLAG_USE_RANGE); 751 GET_FLAG (this, FLAG_USE_RANGE);
813 break; 752 break;
814
815 /* These are all legacy - any new objects should use the move_ .. values */
816 case KW_flying:
817 {
818 if (f.get_sint32 ())
819 move_type |= MOVE_FLY_LOW;
820 else
821 move_type &= ~MOVE_FLY_LOW;
822 }
823 break;
824
825 753
826 case KW_identified: 754 case KW_identified:
827 GET_FLAG (this, FLAG_IDENTIFIED); 755 GET_FLAG (this, FLAG_IDENTIFIED);
828 //TODO: move to check_object or so 756 //TODO: move to check_object or so
829 if (this->flag [FLAG_IDENTIFIED]) 757 if (this->flag [FLAG_IDENTIFIED])
… …
862 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 790 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
863 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 791 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
864 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 792 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
865 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 793 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
866 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 794 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
795 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
867 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 796 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
868 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 797 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
869 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 798 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
870 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 799 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
871 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 800 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 853 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
925 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 854 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 855 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 856 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; 857 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
858 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
929 859
930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 860 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 861 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 862 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 863 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1045 975
1046 f.next (); 976 f.next ();
1047 return true; 977 return true;
1048 978
1049 case KW_ERROR: 979 case KW_ERROR:
1050 // append as key value pair (do not use kv_set as it prepends)
1051 // we also do not even try to find old values, duplicate keys stay duplicate 980 // we do not even try to find old values, duplicate keys stay duplicate
1052 { 981 // the list gets reversed after loading
1053 key_value *kv = new key_value; 982 kv.add (shstr (f.kw_str), shstr (f.value));
1054
1055 kv->next = 0;
1056 kv->key = shstr (f.kw_str);
1057 kv->value = shstr (f.value);
1058
1059 if (!last_kv)
1060 key_values = last_kv = kv;
1061 else
1062 {
1063 while (last_kv->next)
1064 last_kv = last_kv->next;
1065
1066 last_kv->next = kv;
1067 last_kv = kv;
1068 }
1069 }
1070 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1071 break; 983 break;
1072 984
1073 default: 985 default:
1074 if (!f.parse_error ("object", name)) 986 if (!f.parse_error ("object", name))
1075 return false; 987 return false;
… …
1087 999
1088 archetype *arch = archetype::find (f.get_str ()); 1000 archetype *arch = archetype::find (f.get_str ());
1089 1001
1090 if (!arch) 1002 if (!arch)
1091 { 1003 {
1092 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1004 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1093 arch = archetype::find (shstr_earthwall); 1005 arch = archetype::find (shstr_earthwall);
1094 } 1006 }
1095 1007
1096 assert (arch); //D maybe use exception handling of sorts? 1008 assert (arch); //D maybe use exception handling of sorts?
1097 1009
… …
1105 if (!op->parse_kv (f)) 1017 if (!op->parse_kv (f))
1106 { 1018 {
1107 op->destroy (); 1019 op->destroy ();
1108 return 0; 1020 return 0;
1109 } 1021 }
1022
1023 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1024 // that greatly simplifies the loading code.
1025 op->kv.reverse ();
1110 1026
1111 op->post_load_check (); 1027 op->post_load_check ();
1112 return op; 1028 return op;
1113} 1029}
1114 1030
… …
1119 * override values and in c_wiz to mutate values. 1035 * override values and in c_wiz to mutate values.
1120 */ 1036 */
1121int 1037int
1122set_variable (object *op, char *buf) 1038set_variable (object *op, char *buf)
1123{ 1039{
1124 object_thawer f (buf, (AV *)0); 1040 object_thawer f (format ("%s\nend", buf), (AV *)0);
1125 1041
1126 return op->parse_kv (f); 1042 return op->parse_kv (f);
1127} 1043}
1128 1044
1129// compare *op against *arch and output differences 1045// compare *op against *arch and output differences
… …
1149 KW_NULL, 1065 KW_NULL,
1150 KW_applied, 1066 KW_applied,
1151 KW_unpaid, 1067 KW_unpaid,
1152 KW_can_use_shield, 1068 KW_can_use_shield,
1153 KW_no_pick, 1069 KW_no_pick,
1154 KW_NULL, // walk_on 1070 KW_is_transparent_floor,
1155 /* 10 */ 1071 /* 10 */
1156 KW_NULL, // no_pass 1072 KW_NULL, // no_pass
1157 KW_is_animated, 1073 KW_is_animated,
1158 KW_NULL, // slow_move 1074 KW_NULL, // slow_move
1159 KW_NULL, // flying 1075 KW_NULL, // flying
… …
1281 } flagmask; 1197 } flagmask;
1282 1198
1283 /* This saves the key/value lists. We do it first so that any 1199 /* This saves the key/value lists. We do it first so that any
1284 * keys that match field names will be overwritten by the loader. 1200 * keys that match field names will be overwritten by the loader.
1285 */ 1201 */
1286 for (key_value *kv = op->key_values; kv; kv = kv->next) 1202 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1287 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1203 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1288 f.put (kv->key, kv->value); 1204 f.put (kv->key, kv->value);
1289 1205
1290 if (op->uuid) 1206 if (op->uuid)
1291 { 1207 {
1292 // highly optimised - this is often 25% of all data written 1208 // highly optimised - this is often 25% of all data written
… …
1324 static int last_speed_left_len = sizeof ("sl 0\n") - 1; 1240 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1325 1241
1326 if (last_speed_left != op->speed_left) 1242 if (last_speed_left != op->speed_left)
1327 { 1243 {
1328 last_speed_left = op->speed_left; 1244 last_speed_left = op->speed_left;
1245 // .7g loses precision even for float, but gives nice round numbers and smaller files
1246 // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
1247 // (printf is typically very slow)
1329 last_speed_left_len = sizeof ("sl ") - 1 1248 last_speed_left_len = sizeof ("sl ") - 1
1330 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); 1249 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1331 } 1250 }
1332 1251
1333 f.add (last_speed_left_str, last_speed_left_len); 1252 f.add (last_speed_left_str, last_speed_left_len);
… …
1340 1259
1341 CMP_OUT (tag); 1260 CMP_OUT (tag);
1342 CMP_OUT (custom_name); 1261 CMP_OUT (custom_name);
1343 1262
1344 if (object *owner = op->owner) 1263 if (object *owner = op->owner)
1345 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1264 if (const char *ref = owner->ref ())
1265 f.put (KW(owner), ref);
1346 1266
1347 // 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
1348 1268
1349 CMP_OUT (other_arch); 1269 CMP_OUT (other_arch);
1350 1270
… …
1450 CMP_OUT (move_slow); 1370 CMP_OUT (move_slow);
1451 CMP_OUT (move_slow_penalty); 1371 CMP_OUT (move_slow_penalty);
1452 1372
1453 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1373 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1454 1374
1375#if stdcpp // we need gcc, sorry
1455 if (diff [FLAG_OBJ_ORIGINAL]) 1376 if (diff [FLAG_OBJ_ORIGINAL])
1456 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));
1457 1378
1458 diff.reset (FLAG_OBJ_ORIGINAL); 1379 diff.reset (FLAG_OBJ_ORIGINAL);
1459 1380
1460 // quickly test whether any other flags differ 1381 // quickly test whether any other flags differ
1461 if (expect_true (diff.any ())) 1382 if (expect_true (diff.any ()))
1462 for (int i = 0; i < NUM_FLAGS; i++) 1383 for (int i = 0; i < NUM_FLAGS; i++)
1463 if (expect_false (diff [i])) 1384 if (expect_false (diff [i]))
1464 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
1465 1391
1466 // 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
1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1468 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1394 if (expect_false (op->slot[i].info != arch->slot[i].info))
1469 f.put (body_locations[i].save_name, op->slot[i].info); 1395 f.put (body_locations[i].kw, op->slot[i].info);
1470} 1396}
1471 1397
1472/* 1398/*
1473 * Dumps all variables in an object to a file. 1399 * Dumps all variables in an object to a file.
1474 * 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,
… …
1506{ 1432{
1507 object_thawer f (filename); 1433 object_thawer f (filename);
1508 1434
1509 for (;;) 1435 for (;;)
1510 { 1436 {
1437 coroapi::cede_to_tick ();
1438
1511 switch (f.kw) 1439 switch (f.kw)
1512 { 1440 {
1513 case KW_region: 1441 case KW_region:
1514 if (!region::read (f)) 1442 if (!region::read (f))
1515 return false; 1443 return false;

Diff Legend

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