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.154 by root, Sun Apr 11 01:35:51 2010 UTC vs.
Revision 1.186 by root, Sun Jan 27 11:04:33 2019 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,2010 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 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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 <sproto.h> 27#include <sproto.h>
… …
250 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
251 NULL 252 NULL
252}; 253};
253 254
254/* 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
255 * 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
256 * 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
257 * 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.
258 */ 259 */
259void 260void
260object::post_load_check () 261object::post_load_check ()
… …
265 type = 0; 266 type = 0;
266 } 267 }
267 268
268 switch (type) 269 switch (type)
269 { 270 {
271 case RANGED:
270 case BOW: 272 case BOW:
271 case WAND: 273 case WAND:
272 case ROD: 274 case ROD:
273 case HORN: 275 case HORN:
274 if (slot [body_range].info != -1) 276 if (slot [body_range].info != -1)
… …
292 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);
293 slot [body_shield].info = -1; 295 slot [body_shield].info = -1;
294 } 296 }
295 break; 297 break;
296 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
297 case PLAYER: 307 case PLAYER:
298 if (slot [body_shield].info != 1) 308 if (slot [body_shield].info != 1)
299 { 309 {
300 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);
301 slot [body_shield].info = 1; 311 slot [body_shield].info = 1;
… …
320 * 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
321 * 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
322 * 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
323 * 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.
324 * Otherwise, what happens is that the the plural name will lose 334 * Otherwise, what happens is that the the plural name will lose
325 * information (appear as just 'hearts' and not 'goblins heart') 335 * information (appear as just 'hearts' and not 'goblins heart')
326 */ 336 */
327 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)
328 name_pl = 0; 338 name_pl = 0;
329 339
330 if (!name_pl) 340 if (!name_pl)
… …
394 if (ip > 2 * item_power && ip > (item_power + 3)) 404 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); 405 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
396#endif 406#endif
397 } 407 }
398 408
399 /* 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 */
400 /* (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 */
401 if ((type == ROD 411 if ((type == ROD
402 || type == WAND 412 || type == WAND
403 || type == SCROLL 413 || type == SCROLL
404 || type == HORN 414 || type == HORN
… …
413 // TODO: fix firewall object on map 423 // TODO: fix firewall object on map
414 /* 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'
415 * in that spell was stored in sp. 425 * in that spell was stored in sp.
416 */ 426 */
417 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 427 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
418 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]);
419 insert_ob_in_ob (tmp, this); 429 insert_ob_in_ob (tmp, this);
420 randomitems = 0; 430 randomitems = 0;
421 } 431 }
422 432
423 /* 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 */
… …
474 } 484 }
475 485
476 // 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
477 if (has_anim ()) 487 if (has_anim ())
478 { 488 {
479 const animation &anim_ob = anim ();
480
481 if (anim_speed) 489 if (anim_speed)
482 // if this item is time-animated, force the last frame 490 // if this item is time-animated, force the last frame
483 animate_object (this, 0); 491 animate_object (this, 0);
484 else if (flag [FLAG_MONSTER]) 492 else if (flag [FLAG_MONSTER])
485 // if it is a monster, set appropriate facing 493 // if it is a monster, set appropriate facing
… …
522 { 530 {
523 negate = 1; 531 negate = 1;
524 str++; 532 str++;
525 } 533 }
526 534
527 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)
528 { 536 {
529 if (!strcmp (f->name, str)) 537 if (!strcmp (f->name, str))
530 { 538 {
531 if (negate) 539 if (negate)
532 mt &= ~f->flags; 540 mt &= ~f->flags;
… …
549 557
550bool 558bool
551object::parse_kv (object_thawer &f) 559object::parse_kv (object_thawer &f)
552{ 560{
553 object *op_inv = inv; 561 object *op_inv = inv;
554 key_value *last_kv = key_values;
555 562
556 for (;;) 563 for (;;)
557 { 564 {
558 switch (f.kw) 565 switch (f.kw)
559 { 566 {
… …
632 f.delayed_deref (this, owner, f.get_str ()); 639 f.delayed_deref (this, owner, f.get_str ());
633 break; 640 break;
634 641
635 case KW_animation: 642 case KW_animation:
636 { 643 {
637 this->clr_flag (FLAG_ANIMATE); 644 clr_flag (FLAG_ANIMATE);
638 animation_id = 0; 645 animation_id = 0;
639 646
640 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 647 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 648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 649 }
643 break; 650 break;
644 651
645 case KW_last_heal: f.get (last_heal); break; 652 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 653 case KW_last_sp: f.get (last_sp); break;
… …
736 case KW_invisible: f.get (invisible); break; 743 case KW_invisible: f.get (invisible); break;
737 case KW_magic: f.get (magic); break; 744 case KW_magic: f.get (magic); break;
738 case KW_state: f.get (state); break; 745 case KW_state: f.get (state); break;
739 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 746 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
740 case KW_material: f.get (materials); break; //TODO: nuke 747 case KW_material: f.get (materials); break; //TODO: nuke
741 748 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 749
750 /* These are the new values */ 750 /* These are the new values */
751 case KW_move_block: set_move (move_block, f); break; 751 case KW_move_block: set_move (move_block, f); break;
752 case KW_move_allow: set_move (move_allow, f); break; 752 case KW_move_allow: set_move (move_allow, f); break;
753 case KW_move_type: set_move (move_type , f); break; 753 case KW_move_type: set_move (move_type , f); break;
754 case KW_move_on: set_move (move_on , f); break; 754 case KW_move_on: set_move (move_on , f); break;
755 case KW_move_off: set_move (move_off , f); break; 755 case KW_move_off: set_move (move_off , f); break;
756 case KW_move_slow: set_move (move_slow , f); break; 756 case KW_move_slow: set_move (move_slow , f); break;
757 757
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 758 //TODO: remove these after converting archetypes
811 case KW_can_use_wand: 759 case KW_can_use_wand:
812 GET_FLAG (this, FLAG_USE_RANGE); 760 GET_FLAG (this, FLAG_USE_RANGE);
813 break; 761 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 762
826 case KW_identified: 763 case KW_identified:
827 GET_FLAG (this, FLAG_IDENTIFIED); 764 GET_FLAG (this, FLAG_IDENTIFIED);
828 //TODO: move to check_object or so 765 //TODO: move to check_object or so
829 if (this->flag [FLAG_IDENTIFIED]) 766 if (this->flag [FLAG_IDENTIFIED])
… …
862 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 799 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
863 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 800 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
864 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 801 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
865 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 802 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
866 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;
867 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 805 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
868 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 806 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
869 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 807 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
870 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
871 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 862 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; 863 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; 864 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 865 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); 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;
929 868
930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 869 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 870 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 871 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 872 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1045 984
1046 f.next (); 985 f.next ();
1047 return true; 986 return true;
1048 987
1049 case KW_ERROR: 988 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 989 // we do not even try to find old values, duplicate keys stay duplicate
1052 { 990 // the list gets reversed after loading
1053 key_value *kv = new key_value; 991 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; 992 break;
1072 993
1073 default: 994 default:
1074 if (!f.parse_error ("object", name)) 995 if (!f.parse_error ("object", name))
1075 return false; 996 return false;
… …
1087 1008
1088 archetype *arch = archetype::find (f.get_str ()); 1009 archetype *arch = archetype::find (f.get_str ());
1089 1010
1090 if (!arch) 1011 if (!arch)
1091 { 1012 {
1092 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 ());
1093 arch = archetype::find (shstr_earthwall); 1014 arch = archetype::find (shstr_earthwall);
1094 } 1015 }
1095 1016
1096 assert (arch); //D maybe use exception handling of sorts? 1017 assert (arch); //D maybe use exception handling of sorts?
1097 1018
… …
1105 if (!op->parse_kv (f)) 1026 if (!op->parse_kv (f))
1106 { 1027 {
1107 op->destroy (); 1028 op->destroy ();
1108 return 0; 1029 return 0;
1109 } 1030 }
1031
1032 // The loader reverses the ordering of kv-pairs, so we reverse it again after loading.
1033 // This greatly simplifies the loading code.
1034 op->kv.reverse ();
1110 1035
1111 op->post_load_check (); 1036 op->post_load_check ();
1112 return op; 1037 return op;
1113} 1038}
1114 1039
… …
1119 * override values and in c_wiz to mutate values. 1044 * override values and in c_wiz to mutate values.
1120 */ 1045 */
1121int 1046int
1122set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1123{ 1048{
1124 object_thawer f (buf, (AV *)0); 1049 object_thawer f (format ("%s\nend", buf), (AV *)0);
1125 1050
1126 return op->parse_kv (f); 1051 return op->parse_kv (f);
1127} 1052}
1128 1053
1129// compare *op against *arch and output differences 1054// compare *op against *arch and output differences
… …
1149 KW_NULL, 1074 KW_NULL,
1150 KW_applied, 1075 KW_applied,
1151 KW_unpaid, 1076 KW_unpaid,
1152 KW_can_use_shield, 1077 KW_can_use_shield,
1153 KW_no_pick, 1078 KW_no_pick,
1154 KW_NULL, // walk_on 1079 KW_is_transparent_floor,
1155 /* 10 */ 1080 /* 10 */
1156 KW_NULL, // no_pass 1081 KW_NULL, // no_pass
1157 KW_is_animated, 1082 KW_is_animated,
1158 KW_NULL, // slow_move 1083 KW_NULL, // slow_move
1159 KW_NULL, // flying 1084 KW_NULL, // flying
… …
1281 } flagmask; 1206 } flagmask;
1282 1207
1283 /* 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
1284 * keys that match field names will be overwritten by the loader. 1209 * keys that match field names will be overwritten by the loader.
1285 */ 1210 */
1286 for (key_value *kv = op->key_values; kv; kv = kv->next) 1211 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1287 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1212 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1288 f.put (kv->key, kv->value); 1213 f.put (kv->key, kv->value);
1289 1214
1290 if (op->uuid) 1215 if (op->uuid)
1291 { 1216 {
1292 // highly optimised - this is often 25% of all data written 1217 // highly optimised - this is often 25% of all data written
… …
1299 *ptr++ = '\n'; 1224 *ptr++ = '\n';
1300 1225
1301 f.alloc (ptr - cur); 1226 f.alloc (ptr - cur);
1302 } 1227 }
1303 1228
1304#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)
1305#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)
1306 1231
1307 CMP_OUT (x); 1232 CMP_OUT (x);
1308 CMP_OUT (y); 1233 CMP_OUT (y);
1309 1234
1310 CMP_OUT (type); 1235 CMP_OUT (type);
… …
1324 static int last_speed_left_len = sizeof ("sl 0\n") - 1; 1249 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1325 1250
1326 if (last_speed_left != op->speed_left) 1251 if (last_speed_left != op->speed_left)
1327 { 1252 {
1328 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)
1329 last_speed_left_len = sizeof ("sl ") - 1 1257 last_speed_left_len = sizeof ("sl ") - 1
1330 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); 1258 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1331 } 1259 }
1332 1260
1333 f.add (last_speed_left_str, last_speed_left_len); 1261 f.add (last_speed_left_str, last_speed_left_len);
… …
1396 CMP_OUT (level); 1324 CMP_OUT (level);
1397 CMP_OUT (attacktype); 1325 CMP_OUT (attacktype);
1398 1326
1399 // using memcmp here seems to be a loss - is gcc vectorising? 1327 // using memcmp here seems to be a loss - is gcc vectorising?
1400 for (int i = 0; i < NROFATTACKS; i++) 1328 for (int i = 0; i < NROFATTACKS; i++)
1401 if (expect_false (op->resist[i] != arch->resist[i])) 1329 if (ecb_expect_false (op->resist[i] != arch->resist[i]))
1402 f.put (resist_save[i], op->resist[i]); 1330 f.put (resist_save[i], op->resist[i]);
1403 1331
1404 CMP_OUT (path_attuned); 1332 CMP_OUT (path_attuned);
1405 CMP_OUT (path_repelled); 1333 CMP_OUT (path_repelled);
1406 CMP_OUT (path_denied); 1334 CMP_OUT (path_denied);
… …
1420 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1421 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1422 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1423 1351
1424 if (op->flag [FLAG_IS_LINKED]) 1352 if (op->flag [FLAG_IS_LINKED])
1425 if (auto (ol, op->find_link ())) 1353 if (auto ol = op->find_link ())
1426 f.put (KW(connected), ol->id); 1354 f.put (KW(connected), ol->id);
1427 1355
1428 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1429 1357
1430 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
… …
1451 CMP_OUT (move_slow); 1379 CMP_OUT (move_slow);
1452 CMP_OUT (move_slow_penalty); 1380 CMP_OUT (move_slow_penalty);
1453 1381
1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1382 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455 1383
1384#if stdcpp // we need gcc, sorry
1456 if (diff [FLAG_OBJ_ORIGINAL]) 1385 if (diff [FLAG_OBJ_ORIGINAL])
1457 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));
1458 1387
1459 diff.reset (FLAG_OBJ_ORIGINAL); 1388 diff.reset (FLAG_OBJ_ORIGINAL);
1460 1389
1461 // quickly test whether any other flags differ 1390 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ())) 1391 if (ecb_expect_true (diff.any ()))
1463 for (int i = 0; i < NUM_FLAGS; i++) 1392 for (int i = 0; i < NUM_FLAGS; i++)
1464 if (expect_false (diff [i])) 1393 if (ecb_expect_false (diff [i]))
1465 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
1466 1400
1467 // 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
1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
1469 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1403 if (ecb_expect_false (op->slot[i].info != arch->slot[i].info))
1470 f.put (body_locations[i].save_name, op->slot[i].info); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1471} 1405}
1472 1406
1473/* 1407/*
1474 * Dumps all variables in an object to a file. 1408 * 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, 1409 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1476 * 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.
1477 */ 1411 */
1478bool 1412bool
1479object::write (object_freezer &f) 1413object::write (object_freezer &f)
1480{ 1414{
1481 if (expect_false (is_arch ())) 1415 if (ecb_expect_false (is_arch ()))
1482 { 1416 {
1483 f.put (KW(object), arch->archname); 1417 f.put (KW(object), arch->archname);
1484 write_diff (f, this, archetype::empty); 1418 write_diff (f, this, archetype::empty);
1485 } 1419 }
1486 else 1420 else
… …
1507{ 1441{
1508 object_thawer f (filename); 1442 object_thawer f (filename);
1509 1443
1510 for (;;) 1444 for (;;)
1511 { 1445 {
1446 coroapi::cede_to_tick ();
1447
1512 switch (f.kw) 1448 switch (f.kw)
1513 { 1449 {
1514 case KW_region: 1450 case KW_region:
1515 if (!region::read (f)) 1451 if (!region::read (f))
1516 return false; 1452 return false;

Diff Legend

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