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.171 by root, Sat May 7 20:03:27 2011 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 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)
… …
333 333
334 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 336 select_material (this, map ? map->difficulty : 5);
337 337
338 if (speed < 0.)
339 {
340 flag [FLAG_RANDOM_SPEED] = true;
341 speed = -speed;
342 // speed_left will be randomised in instantiate () and copy_to ()
343 }
344
338 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 348 * not in the ideal fashion.
342 */ 349 */
… …
388 if (ip > 2 * item_power && ip > (item_power + 3)) 395 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); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
390#endif 397#endif
391 } 398 }
392 399
393 /* 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 */
394 /* (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 */
395 if ((type == ROD 402 if ((type == ROD
396 || type == WAND 403 || type == WAND
397 || type == SCROLL 404 || type == SCROLL
398 || type == HORN 405 || type == HORN
… …
407 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
408 /* 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'
409 * in that spell was stored in sp. 416 * in that spell was stored in sp.
410 */ 417 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
412 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]);
413 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
414 randomitems = 0; 421 randomitems = 0;
415 } 422 }
416 423
417 /* 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 */
… …
423 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
424 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
425 value = arch->value * inv->value; 432 value = arch->value * inv->value;
426 } 433 }
427 434
428 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
429 { 436 {
430 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
431 { 438 {
432 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);
433 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
… …
436 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
437 if (move_type == 0) 444 if (move_type == 0)
438 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
439 } 446 }
440 447
441 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)
442 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
443 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
444 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
445 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
446 */ 453 */
… …
516 { 523 {
517 negate = 1; 524 negate = 1;
518 str++; 525 str++;
519 } 526 }
520 527
521 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)
522 { 529 {
523 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
524 { 531 {
525 if (negate) 532 if (negate)
526 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
543 550
544bool 551bool
545object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
546{ 553{
547 object *op_inv = inv; 554 object *op_inv = inv;
548 key_value *last_kv = key_values; 555 key_value *last_kv = kv.first;
549 556
550 for (;;) 557 for (;;)
551 { 558 {
552 switch (f.kw) 559 switch (f.kw)
553 { 560 {
… …
582 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
589 596
590 if (!op_inv) 597 if (!op_inv)
591 { 598 {
592 inv = tmp; 599 inv = tmp;
593 tmp->above = 0; 600 tmp->above = 0;
… …
626 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
627 break; 634 break;
628 635
629 case KW_animation: 636 case KW_animation:
630 { 637 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
632 animation_id = 0; 639 animation_id = 0;
633 640
634 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
635 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
636 } 643 }
637 break; 644 break;
638 645
639 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
640 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
641 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
642 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
643 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
644 652
645 case KW_speed: 653 case KW_speed:
646 f.get (speed); 654 f.get (speed);
647 655
… …
729 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
730 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
731 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
732 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
733 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
734 742 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 743
743 /* These are the new values */ 744 /* These are the new values */
744 case KW_move_block: set_move (move_block, f); break; 745 case KW_move_block: set_move (move_block, f); break;
745 case KW_move_allow: set_move (move_allow, f); break; 746 case KW_move_allow: set_move (move_allow, f); break;
746 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
747 case KW_move_on: set_move (move_on , f); break; 748 case KW_move_on: set_move (move_on , f); break;
748 case KW_move_off: set_move (move_off , f); break; 749 case KW_move_off: set_move (move_off , f); break;
749 case KW_move_slow: set_move (move_slow , f); break; 750 case KW_move_slow: set_move (move_slow , f); break;
750 751
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 752 //TODO: remove these after converting archetypes
804 case KW_can_use_wand: 753 case KW_can_use_wand:
805 GET_FLAG (this, FLAG_USE_RANGE); 754 GET_FLAG (this, FLAG_USE_RANGE);
806 break; 755 break;
807 756
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: 757 case KW_identified:
820 GET_FLAG (this, FLAG_IDENTIFIED); 758 GET_FLAG (this, FLAG_IDENTIFIED);
821 //TODO: move to check_object or so 759 //TODO: move to check_object or so
822 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 760 if (this->flag [FLAG_IDENTIFIED])
823 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 761 this->clr_flag (FLAG_KNOWN_MAGICAL);
824 762
825 break; 763 break;
826 764
827 case KW_friendly: 765 case KW_friendly:
828 if (f.get_bool ()) 766 if (f.get_bool ())
… …
855 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 793 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
856 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 794 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
857 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 795 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
858 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 796 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
859 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;
860 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 799 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
861 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 800 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
862 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 801 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 802 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 803 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 855 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 856 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; 857 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; 858 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 859 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); 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;
921 862
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 863 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 864 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 865 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 866 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1037 978
1038 f.next (); 979 f.next ();
1039 return true; 980 return true;
1040 981
1041 case KW_ERROR: 982 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 983 // we do not even try to find old values, duplicate keys stay duplicate
1044 { 984 // the list gets reversed after loading
1045 key_value *kv = new key_value; 985 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; 986 break;
1064 987
1065 default: 988 default:
1066 if (!f.parse_error ("object", name)) 989 if (!f.parse_error ("object", name))
1067 return false; 990 return false;
… …
1079 1002
1080 archetype *arch = archetype::find (f.get_str ()); 1003 archetype *arch = archetype::find (f.get_str ());
1081 1004
1082 if (!arch) 1005 if (!arch)
1083 { 1006 {
1084 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 ());
1085 arch = archetype::find (shstr_earthwall); 1008 arch = archetype::find (shstr_earthwall);
1086 } 1009 }
1087 1010
1088 assert (arch); //D maybe use exception handling of sorts? 1011 assert (arch); //D maybe use exception handling of sorts?
1089 1012
… …
1097 if (!op->parse_kv (f)) 1020 if (!op->parse_kv (f))
1098 { 1021 {
1099 op->destroy (); 1022 op->destroy ();
1100 return 0; 1023 return 0;
1101 } 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 ();
1102 1029
1103 op->post_load_check (); 1030 op->post_load_check ();
1104 return op; 1031 return op;
1105} 1032}
1106 1033
… …
1111 * override values and in c_wiz to mutate values. 1038 * override values and in c_wiz to mutate values.
1112 */ 1039 */
1113int 1040int
1114set_variable (object *op, char *buf) 1041set_variable (object *op, char *buf)
1115{ 1042{
1116 object_thawer f (buf, (AV *)0); 1043 object_thawer f (format ("%s\nend", buf), (AV *)0);
1117 1044
1118 return op->parse_kv (f); 1045 return op->parse_kv (f);
1119} 1046}
1120 1047
1121// compare *op against *arch and output differences 1048// compare *op against *arch and output differences
… …
1141 KW_NULL, 1068 KW_NULL,
1142 KW_applied, 1069 KW_applied,
1143 KW_unpaid, 1070 KW_unpaid,
1144 KW_can_use_shield, 1071 KW_can_use_shield,
1145 KW_no_pick, 1072 KW_no_pick,
1146 KW_NULL, // walk_on 1073 KW_is_transparent_floor,
1147 /* 10 */ 1074 /* 10 */
1148 KW_NULL, // no_pass 1075 KW_NULL, // no_pass
1149 KW_is_animated, 1076 KW_is_animated,
1150 KW_NULL, // slow_move 1077 KW_NULL, // slow_move
1151 KW_NULL, // flying 1078 KW_NULL, // flying
… …
1246 /* 100 */ 1173 /* 100 */
1247 KW_neutral, 1174 KW_neutral,
1248 KW_no_attack, 1175 KW_no_attack,
1249 KW_no_damage, 1176 KW_no_damage,
1250 KW_obj_original, 1177 KW_obj_original,
1251 KW_NULL, 1178 KW_random_speed,
1252 KW_activate_on_push, 1179 KW_activate_on_push,
1253 KW_activate_on_release, 1180 KW_activate_on_release,
1254 KW_is_water, 1181 KW_is_water,
1255 KW_use_content_on_gen, 1182 KW_use_content_on_gen,
1256 KW_NULL, 1183 KW_NULL,
… …
1273 } flagmask; 1200 } flagmask;
1274 1201
1275 /* 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
1276 * keys that match field names will be overwritten by the loader. 1203 * keys that match field names will be overwritten by the loader.
1277 */ 1204 */
1278 for (key_value *kv = op->key_values; kv; kv = kv->next) 1205 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1279 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1206 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1280 f.put (kv->key, kv->value); 1207 f.put (kv->key, kv->value);
1281 1208
1282 if (op->uuid) 1209 if (op->uuid)
1283 { 1210 {
1284 // highly optimised - this is often 25% of all data written 1211 // highly optimised - this is often 25% of all data written
… …
1303 CMP_OUT (subtype); 1230 CMP_OUT (subtype);
1304 CMP_OUT (direction); 1231 CMP_OUT (direction);
1305 1232
1306 CMP_OUT (name); 1233 CMP_OUT (name);
1307 CMP_OUT (name_pl); 1234 CMP_OUT (name_pl);
1308
1309 CMP_OUT (speed); 1235 CMP_OUT (speed);
1310 1236
1311 // speed_left is a major time-burner, and has good locality, so 1237 // 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. 1238 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left) 1239 if (op->speed_left != arch->speed_left)
1314 { 1240 {
1315 static double last_speed_left = 0.; 1241 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n"; 1242 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1243 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318 1244
1319 if (last_speed_left != op->speed_left) 1245 if (last_speed_left != op->speed_left)
1320 { 1246 {
1321 last_speed_left = op->speed_left; 1247 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("speed_left ") - 1 1248 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1249 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 } 1250 }
1325 1251
1326 f.add (last_speed_left_str, last_speed_left_len); 1252 f.add (last_speed_left_str, last_speed_left_len);
1327 } 1253 }
1328 1254
… …
1333 1259
1334 CMP_OUT (tag); 1260 CMP_OUT (tag);
1335 CMP_OUT (custom_name); 1261 CMP_OUT (custom_name);
1336 1262
1337 if (object *owner = op->owner) 1263 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1264 if (const char *ref = owner->ref ())
1265 f.put (KW(owner), ref);
1339 1266
1340 // 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
1341 1268
1342 CMP_OUT (other_arch); 1269 CMP_OUT (other_arch);
1343 1270
… …
1416 if (op->flag [FLAG_IS_LINKED]) 1343 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ())) 1344 if (auto (ol, op->find_link ()))
1418 f.put (KW(connected), ol->id); 1345 f.put (KW(connected), ol->id);
1419 1346
1420 CMP_OUT (randomitems); 1347 CMP_OUT (randomitems);
1348
1421 CMP_OUT2 (container, weight_limit); 1349 CMP_OUT2 (container, weight_limit);
1422 1350
1423 CMP_OUT (run_away); 1351 CMP_OUT (run_away);
1424 CMP_OUT (pick_up); 1352 CMP_OUT (pick_up);
1425 CMP_OUT (will_apply); 1353 CMP_OUT (will_apply);
… …
1442 CMP_OUT (move_slow); 1370 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1371 CMP_OUT (move_slow_penalty);
1444 1372
1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1373 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446 1374
1375#if stdcpp // we need gcc, sorry
1447 if (diff [FLAG_OBJ_ORIGINAL]) 1376 if (diff [FLAG_OBJ_ORIGINAL])
1448 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));
1449 1378
1450 diff.reset (FLAG_OBJ_ORIGINAL); 1379 diff.reset (FLAG_OBJ_ORIGINAL);
1451 1380
1452 // quickly test whether any other flags differ 1381 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ())) 1382 if (expect_true (diff.any ()))
1454 for (int i = 0; i < NUM_FLAGS; i++) 1383 for (int i = 0; i < NUM_FLAGS; i++)
1455 if (expect_false (diff [i])) 1384 if (expect_false (diff [i]))
1456 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
1457 1391
1458 // 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
1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1460 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1394 if (expect_false (op->slot[i].info != arch->slot[i].info))
1461 f.put (body_locations[i].save_name, op->slot[i].info); 1395 f.put (body_locations[i].kw, op->slot[i].info);
1462} 1396}
1463 1397
1464/* 1398/*
1465 * Dumps all variables in an object to a file. 1399 * 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, 1400 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1498{ 1432{
1499 object_thawer f (filename); 1433 object_thawer f (filename);
1500 1434
1501 for (;;) 1435 for (;;)
1502 { 1436 {
1437 coroapi::cede_to_tick ();
1438
1503 switch (f.kw) 1439 switch (f.kw)
1504 { 1440 {
1505 case KW_region: 1441 case KW_region:
1506 if (!region::read (f)) 1442 if (!region::read (f))
1507 return false; 1443 return false;

Diff Legend

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