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.143 by root, Mon Nov 9 19:17:58 2009 UTC vs.
Revision 1.161 by root, Sat May 15 23:41:05 2010 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 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)
… …
330 330
331 if (!name_pl) 331 if (!name_pl)
332 name_pl = name; 332 name_pl = name;
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 (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
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 }
337 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.
… …
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
… …
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 */
… …
480 animate_object (this, direction); 487 animate_object (this, direction);
481 } 488 }
482} 489}
483 490
484static void 491static void
485set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
486{ 493{
487 static const struct flagstr { 494 static const struct flagstr {
488 const char *name; 495 const char *name;
489 MoveType flags; 496 MoveType flags;
490 } move_flags[] = { 497 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
499 }; 506 };
500 507
501 if (!str) 508 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 509
507 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
508 { 511 {
509 mt = atoi (str); 512 mt = atoi (str);
510 return; 513 return;
511 } 514 }
512 515
513 mt = 0; 516 mt = 0;
514 517
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 519 {
517 bool negate = 0; 520 bool negate = 0;
518 521
519 if (*str == '-') 522 if (*str == '-')
520 { 523 {
521 negate = 1; 524 negate = 1;
522 str++; 525 str++;
523 } 526 }
524 527
525 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)
526 { 529 {
527 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
528 { 531 {
529 if (negate) 532 if (negate)
530 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
554 for (;;) 557 for (;;)
555 { 558 {
556 switch (f.kw) 559 switch (f.kw)
557 { 560 {
558 case KW_uuid: 561 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 562 if (!uuid.parse (f.get_str ()))
561 { 563 {
562 f.parse_warn ("unparseable uuid"); 564 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 565 uuid = UUID::gen ();
564 } 566 }
565 break; 567 break;
566 568
567 case KW_oid: 569 case KW_oid:
568 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
569 break; 571 break;
… …
587 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
588 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
589 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
590 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
593 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
594 596
595 if (!op_inv) 597 if (!op_inv)
596 { 598 {
597 inv = tmp; 599 inv = tmp;
598 tmp->above = 0; 600 tmp->above = 0;
… …
631 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
632 break; 634 break;
633 635
634 case KW_animation: 636 case KW_animation:
635 { 637 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
637 animation_id = 0; 639 animation_id = 0;
638 640
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 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
642 } 643 }
643 break; 644 break;
644 645
645 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
649 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
650 652
651 case KW_speed: 653 case KW_speed:
652 f.get (speed); 654 f.get (speed);
653 655
… …
662 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
664 break; 666 break;
665 667
666 case KW_face: 668 case KW_face:
667 face = face_find (f.get_str ()); 669 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 670 break;
669 671
670 case KW_sound: 672 case KW_sound:
673 if (f.has_value ())
674 {
671 sound = sound_find (f.get_str ()); 675 sound = sound_find (f.get_str ());
672 if (!sound) 676 if (!sound)
673 f.parse_warn ("sound not found"); 677 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
678 }
679 else
680 sound = 0;
674 break; 681 break;
675 682
676 case KW_sound_destroy: 683 case KW_sound_destroy:
684 if (f.has_value ())
685 {
677 sound_destroy = sound_find (f.get_str ()); 686 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 687 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 688 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
689 }
690 else
691 sound_destroy = 0;
680 break; 692 break;
681 693
682 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
684 696
… …
725 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
730 case KW_materialname: f.get (materialname); break; 742 case KW_materialname: f.get (material); break;
731 743
732 /* These are the new values */ 744 /* These are the new values */
733 case KW_move_block: set_move (move_block, f.get_str ()); break; 745 case KW_move_block: set_move (move_block, f); break;
734 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 746 case KW_move_allow: set_move (move_allow, f); break;
735 case KW_move_type: set_move (move_type, f.get_str ()); break; 747 case KW_move_type: set_move (move_type , f); break;
736 case KW_move_on: set_move (move_on, f.get_str ()); break; 748 case KW_move_on: set_move (move_on , f); break;
737 case KW_move_off: set_move (move_off, f.get_str ()); break; 749 case KW_move_off: set_move (move_off , f); break;
738 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 750 case KW_move_slow: set_move (move_slow , f); break;
739 751
740 /* These are all legacy - any new objects should use the move_ .. values */ 752 /* These are all legacy - any new objects should use the move_ .. values */
741 case KW_no_pass: 753 case KW_no_pass:
742 { 754 {
743 if (f.get_sint32 ()) 755 if (f.get_sint32 ())
… …
806 818
807 819
808 case KW_identified: 820 case KW_identified:
809 GET_FLAG (this, FLAG_IDENTIFIED); 821 GET_FLAG (this, FLAG_IDENTIFIED);
810 //TODO: move to check_object or so 822 //TODO: move to check_object or so
811 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 823 if (this->flag [FLAG_IDENTIFIED])
812 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 824 this->clr_flag (FLAG_KNOWN_MAGICAL);
813 825
814 break; 826 break;
815 827
816 case KW_friendly: 828 case KW_friendly:
817 if (f.get_bool ()) 829 if (f.get_bool ())
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 864 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 865 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 866 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 867 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 868 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 869 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 870 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 871 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 872 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
862 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 873 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
906 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 917 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
907 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 918 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 919 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
909 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 920 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
910 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 921 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
922 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
911 923
912 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 924 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
913 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 925 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
914 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 926 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
915 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 927 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
990 add_link (map, connected); 1002 add_link (map, connected);
991 } 1003 }
992 break; 1004 break;
993 1005
994 case KW_randomitems: 1006 case KW_randomitems:
995 if (f.get_str ()) 1007 if (f.has_value ())
996 { 1008 {
997 randomitems = 1009 randomitems =
998 loading_arch 1010 loading_arch
999 ? treasurelist::get (f.get_str ()) 1011 ? treasurelist::get (f.get_str ())
1000 : treasurelist::find (f.get_str ()); 1012 : treasurelist::find (f.get_str ());
… …
1168 KW_unaggressive, 1180 KW_unaggressive,
1169 KW_reflect_missile, 1181 KW_reflect_missile,
1170 /* 40 */ 1182 /* 40 */
1171 KW_reflect_spell, 1183 KW_reflect_spell,
1172 KW_no_magic, 1184 KW_no_magic,
1173 KW_no_fix_player, 1185 KW_NULL,
1174 KW_is_lightable, 1186 KW_is_lightable,
1175 KW_tear_down, 1187 KW_tear_down,
1176 KW_run_away, 1188 KW_run_away,
1177 KW_NULL, // pass_thru 1189 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1190 KW_NULL, // an_pass_thru
… …
1236 /* 100 */ 1248 /* 100 */
1237 KW_neutral, 1249 KW_neutral,
1238 KW_no_attack, 1250 KW_no_attack,
1239 KW_no_damage, 1251 KW_no_damage,
1240 KW_obj_original, 1252 KW_obj_original,
1241 KW_NULL, 1253 KW_random_speed,
1242 KW_activate_on_push, 1254 KW_activate_on_push,
1243 KW_activate_on_release, 1255 KW_activate_on_release,
1244 KW_is_water, 1256 KW_is_water,
1245 KW_use_content_on_gen, 1257 KW_use_content_on_gen,
1246 KW_NULL, 1258 KW_NULL,
… …
1281 *ptr++ = '\n'; 1293 *ptr++ = '\n';
1282 1294
1283 f.alloc (ptr - cur); 1295 f.alloc (ptr - cur);
1284 } 1296 }
1285 1297
1286#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v) 1298#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1287#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) 1299#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1288 1300
1289 CMP_OUT (x); 1301 CMP_OUT (x);
1290 CMP_OUT (y); 1302 CMP_OUT (y);
1291 1303
1292 CMP_OUT (type); 1304 CMP_OUT (type);
1293 CMP_OUT (subtype); 1305 CMP_OUT (subtype);
1294 CMP_OUT (direction); 1306 CMP_OUT (direction);
1295 1307
1296 CMP_OUT (name); 1308 CMP_OUT (name);
1297 CMP_OUT (name_pl); 1309 CMP_OUT (name_pl);
1298
1299 CMP_OUT (speed); 1310 CMP_OUT (speed);
1300 CMP_OUT (speed_left); 1311
1312 // speed_left is a major time-burner, and has good locality, so
1313 // we use a simple lookup-cache to avoid the very slow printf.
1314 if (op->speed_left != arch->speed_left)
1315 {
1316 static double last_speed_left = 0.;
1317 static char last_speed_left_str [256] = "sl 0\n";
1318 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1319
1320 if (last_speed_left != op->speed_left)
1321 {
1322 last_speed_left = op->speed_left;
1323 last_speed_left_len = sizeof ("sl ") - 1
1324 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1325 }
1326
1327 f.add (last_speed_left_str, last_speed_left_len);
1328 }
1301 1329
1302 CMP_OUT (title); 1330 CMP_OUT (title);
1303 CMP_OUT (race); 1331 CMP_OUT (race);
1304 CMP_OUT (slaying); 1332 CMP_OUT (slaying);
1305 CMP_OUT (skill); 1333 CMP_OUT (skill);
1306 1334
1307 CMP_OUT (tag); 1335 CMP_OUT (tag);
1308 CMP_OUT (custom_name); 1336 CMP_OUT (custom_name);
1309 1337
1310 if (object *owner = op->owner) 1338 if (object *owner = op->owner)
1311 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1339 if (const char *ref = owner->ref ())
1340 f.put (KW(owner), ref);
1312 1341
1313 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1342 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1314 1343
1315 CMP_OUT (other_arch); 1344 CMP_OUT (other_arch);
1316 1345
1317 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1346 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1318 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1347 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1319 1348
1320 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1349 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1321 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1350 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1322 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1351 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1323 1352
1324 if (op->animation_id != arch->animation_id) 1353 if (op->animation_id != arch->animation_id)
1325 if (op->has_anim ()) 1354 if (op->has_anim ())
1326 f.put (KW_animation, op->anim ().name); 1355 f.put (KW(animation), op->anim ().name);
1327 else 1356 else
1328 { 1357 {
1329 f.put (KW_animation, (const char *)0); 1358 f.put (KW(animation));
1330 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1359 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1331 } 1360 }
1332 1361
1333 CMP_OUT2 (str, stats.Str); 1362 CMP_OUT2 (str, stats.Str);
1334 CMP_OUT2 (dex, stats.Dex); 1363 CMP_OUT2 (dex, stats.Dex);
… …
1359 CMP_OUT (attack_movement); 1388 CMP_OUT (attack_movement);
1360 CMP_OUT (nrof); 1389 CMP_OUT (nrof);
1361 CMP_OUT (level); 1390 CMP_OUT (level);
1362 CMP_OUT (attacktype); 1391 CMP_OUT (attacktype);
1363 1392
1364 // using memcmp here seems to be a loss - us gcc vectorising? 1393 // using memcmp here seems to be a loss - is gcc vectorising?
1365 for (int i = 0; i < NROFATTACKS; i++) 1394 for (int i = 0; i < NROFATTACKS; i++)
1366 if (expect_false (op->resist[i] != arch->resist[i])) 1395 if (expect_false (op->resist[i] != arch->resist[i]))
1367 f.put (resist_save[i], op->resist[i]); 1396 f.put (resist_save[i], op->resist[i]);
1368 1397
1369 CMP_OUT (path_attuned); 1398 CMP_OUT (path_attuned);
1370 CMP_OUT (path_repelled); 1399 CMP_OUT (path_repelled);
1371 CMP_OUT (path_denied); 1400 CMP_OUT (path_denied);
1401
1372 CMP_OUT2 (material, materials);//TODO: nuke 1402 CMP_OUT2 (material, materials);//TODO: nuke
1373 CMP_OUT (materialname); 1403 if (op->material != arch->material)
1404 f.put (KW(materialname), op->material->name);
1405
1374 CMP_OUT (value); 1406 CMP_OUT (value);
1375 CMP_OUT (carrying); 1407 CMP_OUT (carrying);
1376 CMP_OUT (weight); 1408 CMP_OUT (weight);
1377 CMP_OUT (invisible); 1409 CMP_OUT (invisible);
1378 CMP_OUT (state); 1410 CMP_OUT (state);
… …
1383 CMP_OUT (last_eat); 1415 CMP_OUT (last_eat);
1384 CMP_OUT (glow_radius); 1416 CMP_OUT (glow_radius);
1385 1417
1386 if (op->flag [FLAG_IS_LINKED]) 1418 if (op->flag [FLAG_IS_LINKED])
1387 if (auto (ol, op->find_link ())) 1419 if (auto (ol, op->find_link ()))
1388 f.put (KW_connected, ol->id); 1420 f.put (KW(connected), ol->id);
1389 1421
1390 CMP_OUT (randomitems); 1422 CMP_OUT (randomitems);
1423
1391 CMP_OUT2 (container, weight_limit); 1424 CMP_OUT2 (container, weight_limit);
1392 1425
1393 CMP_OUT (run_away); 1426 CMP_OUT (run_away);
1394 CMP_OUT (pick_up); 1427 CMP_OUT (pick_up);
1395 CMP_OUT (will_apply); 1428 CMP_OUT (will_apply);
… …
1412 CMP_OUT (move_slow); 1445 CMP_OUT (move_slow);
1413 CMP_OUT (move_slow_penalty); 1446 CMP_OUT (move_slow_penalty);
1414 1447
1415 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1448 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1416 1449
1450#if stdcpp // we need gcc, sorry
1417 if (diff [FLAG_OBJ_ORIGINAL]) 1451 if (diff [FLAG_OBJ_ORIGINAL])
1418 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1452 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1419 1453
1420 diff.reset (FLAG_OBJ_ORIGINAL); 1454 diff.reset (FLAG_OBJ_ORIGINAL);
1421 1455
1422 // quickly test whether any other flags differ 1456 // quickly test whether any other flags differ
1423 if (expect_true (diff.any ())) 1457 if (expect_true (diff.any ()))
1424 for (int i = 0; i < NUM_FLAGS; i++) 1458 for (int i = 0; i < NUM_FLAGS; i++)
1425 if (expect_false (diff [i])) 1459 if (expect_false (diff [i]))
1426 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1460 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1461#else
1462 // use sgi extensions
1463 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1465#endif
1427 1466
1428 // save body locations. gcc's memcmp does an abysmal job when used 1467 // save body locations. gcc's memcmp does an abysmal job when used
1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1430 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1431 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1437 * the only place this is not set is when saving the player. 1476 * the only place this is not set is when saving the player.
1438 */ 1477 */
1439bool 1478bool
1440object::write (object_freezer &f) 1479object::write (object_freezer &f)
1441{ 1480{
1442 if (is_arch ()) 1481 if (expect_false (is_arch ()))
1443 { 1482 {
1444 f.put (KW_object, arch->archname); 1483 f.put (KW(object), arch->archname);
1445 write_diff (f, this, archetype::empty); 1484 write_diff (f, this, archetype::empty);
1446 } 1485 }
1447 else 1486 else
1448 { 1487 {
1449 f.put (KW_arch, arch->archname); 1488 f.put (KW(arch), arch->archname);
1450 write_diff (f, this, arch); 1489 write_diff (f, this, arch);
1451 } 1490 }
1452 1491
1453 for (object *tmp = inv; tmp; tmp = tmp->below) 1492 for (object *tmp = inv; tmp; tmp = tmp->below)
1454 tmp->write (f); 1493 tmp->write (f);
1455 1494
1456 f.put (this); 1495 f.put (this);
1457 f.put (KW_end); 1496 f.put (KW(end));
1458 1497
1459 return true; 1498 return true;
1460} 1499}
1461 1500
1462///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////
… …
1468{ 1507{
1469 object_thawer f (filename); 1508 object_thawer f (filename);
1470 1509
1471 for (;;) 1510 for (;;)
1472 { 1511 {
1512 coroapi::cede_to_tick ();
1513
1473 switch (f.kw) 1514 switch (f.kw)
1474 { 1515 {
1475 case KW_region: 1516 case KW_region:
1476 if (!region::read (f)) 1517 if (!region::read (f))
1477 return false; 1518 return false;

Diff Legend

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